Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1443080) for spidermonkey build bustage at build/src/js/src/jit/BaselineCacheIRCompiler.cpp

Browse Source 
Backed out changeset 7d509bb8a35d (bug 1443080)
Backed out changeset 53bdcd5937cd (bug 1443080)

--HG--
extra : rebase_source : 59b5350d2959c0b065aedd34bfe8337216c0ea4b
This commit is contained in:
Coroiu Cristina 2018-03-14 11:13:21 +02:00
parent f524ac8d63
commit 0f6841e0d2
82 changed files with 368 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/base/nsAccessibilityService.cpp
View File

@ -1765,7 +1765,7 @@ MaybeShutdownAccService(uint32_t aFormerConsumer)
nsAccessibilityService* accService =
nsAccessibilityService::gAccessibilityService;
if (!accService || nsAccessibilityService::IsShutdown()) {
if (!accService || accService->IsShutdown()) {
return;
}
@ -1863,7 +1863,7 @@ PrefChanged(const char* aPref, void* aClosure)
if (ReadPlatformDisabledState() == ePlatformIsDisabled) {
// Force shut down accessibility.
nsAccessibilityService* accService = nsAccessibilityService::gAccessibilityService;
if (accService && !nsAccessibilityService::IsShutdown()) {
if (accService && !accService->IsShutdown()) {
accService->Shutdown();
}
}

6
accessible/xpcom/xpcAccessibilityService.cpp
View File

@ -39,7 +39,7 @@ xpcAccessibilityService::AddRef(void)
{
MOZ_ASSERT_TYPE_OK_FOR_REFCOUNTING(xpcAccessibilityService)
MOZ_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt");
if (!nsAutoRefCnt::isThreadSafe)
if (!mRefCnt.isThreadSafe)
NS_ASSERT_OWNINGTHREAD(xpcAccessibilityService);
nsrefcnt count = ++mRefCnt;
NS_LOG_ADDREF(this, count, "xpcAccessibilityService", sizeof(*this));
@ -63,7 +63,7 @@ xpcAccessibilityService::Release(void)
{
MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release");
if (!nsAutoRefCnt::isThreadSafe) {
if (!mRefCnt.isThreadSafe) {
NS_ASSERT_OWNINGTHREAD(xpcAccessibilityService);
}
@ -71,7 +71,7 @@ xpcAccessibilityService::Release(void)
NS_LOG_RELEASE(this, count, "xpcAccessibilityService");
if (count == 0) {
if (!nsAutoRefCnt::isThreadSafe) {
if (!mRefCnt.isThreadSafe) {
NS_ASSERT_OWNINGTHREAD(xpcAccessibilityService);
}

2
dom/base/Link.cpp
View File

@ -184,7 +184,7 @@ Link::TryDNSPrefetchOrPreconnectOrPrefetchOrPreloadOrPrerender()
nsCOMPtr<nsIURI> uri(GetURI());
if (uri && mElement->OwnerDoc()) {
mElement->OwnerDoc()->MaybePreconnect(uri,
Element::AttrValueToCORSMode(mElement->GetParsedAttr(nsGkAtoms::crossorigin)));
mElement->AttrValueToCORSMode(mElement->GetParsedAttr(nsGkAtoms::crossorigin)));
return;
}
}

2
dom/base/nsDOMWindowUtils.cpp
View File

@ -329,7 +329,7 @@ nsDOMWindowUtils::GetPhysicalMillimeterInCSSPixels(float* aPhysicalMillimeter)
return NS_ERROR_NOT_AVAILABLE;
}
*aPhysicalMillimeter = nsPresContext::AppUnitsToFloatCSSPixels(
*aPhysicalMillimeter = presContext->AppUnitsToFloatCSSPixels(
presContext->PhysicalMillimetersToAppUnits(1));
return NS_OK;
}

2
dom/base/nsGlobalWindowOuter.cpp
View File

@ -6156,7 +6156,7 @@ nsGlobalWindowOuter::EnterModalState()
nsContentUtils::ContentIsCrossDocDescendantOf(mDoc, activeShell->GetDocument()))) {
EventStateManager::ClearGlobalActiveContent(activeESM);
nsIPresShell::SetCapturingContent(nullptr, 0);
activeShell->SetCapturingContent(nullptr, 0);
if (activeShell) {
RefPtr<nsFrameSelection> frameSelection = activeShell->FrameSelection();

2
dom/canvas/CanvasRenderingContext2D.cpp
View File

@ -4042,7 +4042,7 @@ CanvasRenderingContext2D::SetFontInternal(const nsAString& aFont,
// pixels to CSS pixels, to adjust for the difference in expectations from
// other nsFontMetrics clients.
resizedFont.size =
(fontStyle->mSize * c->AppUnitsPerDevPixel()) / nsPresContext::AppUnitsPerCSSPixel();
(fontStyle->mSize * c->AppUnitsPerDevPixel()) / c->AppUnitsPerCSSPixel();
nsFontMetrics::Params params;
params.language = fontStyle->mLanguage;

2
dom/canvas/CanvasRenderingContext2D.h
View File

@ -1157,7 +1157,7 @@ protected:
pc = ps->GetPresContext();
if (!pc) goto FINISH;
devPixel = pc->AppUnitsPerDevPixel();
cssPixel = nsPresContext::AppUnitsPerCSSPixel();
cssPixel = pc->AppUnitsPerCSSPixel();
FINISH:
if (aPerDevPixel)

2
dom/canvas/ImageBitmapRenderingContext.cpp
View File

@ -233,7 +233,7 @@ ImageBitmapRenderingContext::GetCanvasLayer(nsDisplayListBuilder* aBuilder,
RefPtr<ImageContainer> imageContainer = imageLayer->GetContainer();
if (!imageContainer) {
imageContainer = LayerManager::CreateImageContainer();
imageContainer = aManager->CreateImageContainer();
imageLayer->SetContainer(imageContainer);
}

2
dom/canvas/WebGLRenderbuffer.cpp
View File

@ -209,7 +209,7 @@ WebGLRenderbuffer::RenderbufferStorage(const char* funcName, uint32_t samples,
const GLenum error = DoRenderbufferStorage(samples, usage, width, height);
if (error) {
const char* errorName = WebGLContext::ErrorName(error);
const char* errorName = mContext->ErrorName(error);
mContext->GenerateWarning("%s generated error %s", funcName, errorName);
return;
}

2
dom/html/input/InputType.cpp
View File

@ -451,7 +451,7 @@ bool
InputType::ParseTime(const nsAString& aValue, uint32_t* aResult) const
{
// see comment in InputType::ParseDate().
return mozilla::dom::HTMLInputElement::ParseTime(aValue, aResult);
return mInputElement->ParseTime(aValue, aResult);
}
bool

10
dom/indexedDB/ActorsParent.cpp
View File

@ -9965,7 +9965,7 @@ SerializeStructuredCloneFiles(
MOZ_ASSERT(fileId > 0);
nsCOMPtr<nsIFile> nativeFile =
mozilla::dom::indexedDB::FileManager::GetCheckedFileForId(directory, fileId);
fileManager->GetCheckedFileForId(directory, fileId);
if (NS_WARN_IF(!nativeFile)) {
IDB_REPORT_INTERNAL_ERR();
return NS_ERROR_DOM_INDEXEDDB_UNKNOWN_ERR;
@ -11507,7 +11507,7 @@ UpdateRefcountFunction::Reset()
}
}
nsCOMPtr<nsIFile> file = FileManager::GetFileForId(mDirectory, aId);
nsCOMPtr<nsIFile> file = aFileManager->GetFileForId(mDirectory, aId);
if (NS_WARN_IF(!file)) {
return NS_ERROR_FAILURE;
}
@ -11537,7 +11537,7 @@ UpdateRefcountFunction::Reset()
fileSize);
}
file = FileManager::GetFileForId(mJournalDirectory, aId);
file = aFileManager->GetFileForId(mJournalDirectory, aId);
if (NS_WARN_IF(!file)) {
return NS_ERROR_FAILURE;
}
@ -11665,7 +11665,7 @@ UpdateRefcountFunction::CreateJournals()
int64_t id = mJournalsToCreateBeforeCommit[i];
nsCOMPtr<nsIFile> file =
FileManager::GetFileForId(journalDirectory, id);
mFileManager->GetFileForId(journalDirectory, id);
if (NS_WARN_IF(!file)) {
return NS_ERROR_FAILURE;
}
@ -11698,7 +11698,7 @@ UpdateRefcountFunction::RemoveJournals(const nsTArray<int64_t>& aJournals)
for (uint32_t index = 0; index < aJournals.Length(); index++) {
nsCOMPtr<nsIFile> file =
FileManager::GetFileForId(journalDirectory, aJournals[index]);
mFileManager->GetFileForId(journalDirectory, aJournals[index]);
if (NS_WARN_IF(!file)) {
return NS_ERROR_FAILURE;
}

2
dom/indexedDB/FileInfo.cpp
View File

@ -263,7 +263,7 @@ FileInfo::GetFileForFileInfo(FileInfo* aFileInfo)
return nullptr;
}
nsCOMPtr<nsIFile> file = FileManager::GetFileForId(directory,
nsCOMPtr<nsIFile> file = fileManager->GetFileForId(directory,
aFileInfo->Id());
if (NS_WARN_IF(!file)) {
return nullptr;

2
dom/ipc/ColorPickerParent.cpp
View File

@ -31,7 +31,7 @@ NS_IMETHODIMP
ColorPickerParent::ColorPickerShownCallback::Done(const nsAString& aColor)
{
if (mColorPickerParent) {
Unused << ColorPickerParent::Send__delete__(mColorPickerParent,
Unused << mColorPickerParent->Send__delete__(mColorPickerParent,
nsString(aColor));
}
return NS_OK;

2
dom/ipc/TabChild.cpp
View File

@ -1723,7 +1723,7 @@ TabChild::HandleRealMouseButtonEvent(const WidgetMouseEvent& aEvent,
InputAPZContext context(aGuid, aInputBlockId, nsEventStatus_eIgnore);
if (pendingLayerization) {
InputAPZContext::SetPendingLayerization();
context.SetPendingLayerization();
}
WidgetMouseEvent localEvent(aEvent);

8
dom/media/systemservices/CamerasChild.h
View File

@ -74,22 +74,22 @@ public:
~CamerasSingleton();
static OffTheBooksMutex& Mutex() {
return Singleton<mozilla::camera::CamerasSingleton>::get()->mCamerasMutex;
return gTheInstance.get()->mCamerasMutex;
}
static CamerasChild*& Child() {
Mutex().AssertCurrentThreadOwns();
return Singleton<mozilla::camera::CamerasSingleton>::get()->mCameras;
return gTheInstance.get()->mCameras;
}
static nsCOMPtr<nsIThread>& Thread() {
Mutex().AssertCurrentThreadOwns();
return Singleton<mozilla::camera::CamerasSingleton>::get()->mCamerasChildThread;
return gTheInstance.get()->mCamerasChildThread;
}
static nsCOMPtr<nsIThread>& FakeDeviceChangeEventThread() {
Mutex().AssertCurrentThreadOwns();
return Singleton<mozilla::camera::CamerasSingleton>::get()->mFakeDeviceChangeEventThread;
return gTheInstance.get()->mFakeDeviceChangeEventThread;
}
static bool InShutdown() {

2
dom/media/systemservices/MediaParent.cpp
View File

@ -72,7 +72,7 @@ class OriginKeyStore : public nsISupports
OriginKey* key;
if (!mKeys.Get(principalString, &key)) {
nsCString salt; // Make a new one
nsresult rv = GenerateRandomName(salt, OriginKey::EncodedLength);
nsresult rv = GenerateRandomName(salt, key->EncodedLength);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}

5
dom/media/webaudio/blink/HRTFPanner.cpp
View File

@ -102,7 +102,10 @@ int HRTFPanner::calculateDesiredAzimuthIndexAndBlend(double azimuth, double& azi
if (azimuth < 0)
azimuth += 360.0;
int numberOfAzimuths = HRTFDatabase::numberOfAzimuths();
HRTFDatabase* database = m_databaseLoader->database();
MOZ_ASSERT(database);
int numberOfAzimuths = database->numberOfAzimuths();
const double angleBetweenAzimuths = 360.0 / numberOfAzimuths;
// Calculate the azimuth index and the blend (0 -> 1) for interpolation.

2
dom/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp
View File

@ -117,7 +117,7 @@ SpeechSynthesisRequestChild::RecvOnEnd(const bool& aIsError,
mTask->DispatchEndImpl(aElapsedTime, aCharIndex);
}
SpeechSynthesisRequestChild::Send__delete__(actor);
actor->Send__delete__(actor);
return IPC_OK();
}

4
dom/presentation/PresentationConnectionList.cpp
View File

@ -93,7 +93,7 @@ PresentationConnectionList::FindConnectionById(
}
}
return ConnectionArray::NoIndex;
return mConnections.NoIndex;
}
void
@ -106,7 +106,7 @@ PresentationConnectionList::NotifyStateChange(const nsAString& aSessionId,
}
bool connectionFound =
FindConnectionById(aSessionId) != ConnectionArray::NoIndex ? true : false;
FindConnectionById(aSessionId) != mConnections.NoIndex ? true : false;
PresentationConnectionListBinding::ClearCachedConnectionsValue(this);
switch (aConnection->State()) {

2
dom/webbrowserpersist/WebBrowserPersistRemoteDocument.cpp
View File

@ -28,7 +28,7 @@ WebBrowserPersistRemoteDocument
WebBrowserPersistRemoteDocument::~WebBrowserPersistRemoteDocument()
{
if (mActor) {
Unused << WebBrowserPersistDocumentParent::Send__delete__(mActor);
Unused << mActor->Send__delete__(mActor);
// That will call mActor->ActorDestroy, which calls this->ActorDestroy
// (whether or not the IPC send succeeds).
}

2
dom/xbl/nsBindingManager.cpp
View File

@ -335,7 +335,7 @@ nsBindingManager::RemoveFromAttachedQueue(nsXBLBinding* aBinding)
// Don't remove items here as that could mess up an executing
// ProcessAttachedQueue. Instead, null the entry in the queue.
size_t index = mAttachedStack.IndexOf(aBinding);
if (index != nsBindingList::NoIndex) {
if (index != mAttachedStack.NoIndex) {
mAttachedStack[index] = nullptr;
}
}

2
dom/xul/XULDocument.cpp
View File

@ -3351,7 +3351,7 @@ XULDocument::OverlayForwardReference::Resolve()
return eResolve_Error;
}
rv = XULDocument::InsertElement(root, mOverlay, notify);
rv = mDocument->InsertElement(root, mOverlay, notify);
if (NS_FAILED(rv)) return eResolve_Error;
target = mOverlay;

2
editor/libeditor/HTMLAnonymousNodeEditor.cpp
View File

@ -235,7 +235,7 @@ HTMLEditor::CreateAnonymousElement(nsAtom* aTag,
if (ServoStyleSet* styleSet = ps->StyleSet()->GetAsServo()) {
// Sometimes editor likes to append anonymous content to elements
// in display:none subtrees, so avoid styling in those cases.
if (ServoStyleSet::MayTraverseFrom(newContent)) {
if (styleSet->MayTraverseFrom(newContent)) {
styleSet->StyleNewSubtree(newContent);
}
}

6
editor/libeditor/HTMLEditRules.cpp
View File

@ -1739,7 +1739,7 @@ HTMLEditRules::WillInsertBreak(Selection& aSelection,
MOZ_ASSERT(atStartOfSelection.IsSetAndValid());
blockParent =
HTMLEditor::GetBlock(*atStartOfSelection.GetContainer(), host);
mHTMLEditor->GetBlock(*atStartOfSelection.GetContainer(), host);
if (NS_WARN_IF(!blockParent)) {
return NS_ERROR_UNEXPECTED;
}
@ -2673,8 +2673,8 @@ HTMLEditRules::WillDeleteSelection(Selection* aSelection,
// Figure out block parents
NS_ENSURE_STATE(mHTMLEditor);
nsCOMPtr<Element> leftParent = HTMLEditor::GetBlock(*startNode);
nsCOMPtr<Element> rightParent = HTMLEditor::GetBlock(*endNode);
nsCOMPtr<Element> leftParent = mHTMLEditor->GetBlock(*startNode);
nsCOMPtr<Element> rightParent = mHTMLEditor->GetBlock(*endNode);
// Are endpoint block parents the same? Use default deletion
if (leftParent && leftParent == rightParent) {

2
extensions/spellcheck/src/mozInlineSpellChecker.cpp
View File

@ -1497,7 +1497,7 @@ nsresult mozInlineSpellChecker::DoSpellCheck(mozInlineSpellWordUtil& aWordUtil,
// check spelling and add to selection if misspelled
bool isMisspelled;
mozInlineSpellWordUtil::NormalizeWord(wordText);
aWordUtil.NormalizeWord(wordText);
nsresult rv = mSpellCheck->CheckCurrentWordNoSuggest(wordText,
&isMisspelled);
if (NS_FAILED(rv))

2
extensions/spellcheck/src/mozSpellChecker.cpp
View File

@ -53,7 +53,7 @@ mozSpellChecker::~mozSpellChecker()
if (mEngine) {
MOZ_ASSERT(XRE_IsContentProcess());
RemoteSpellcheckEngineChild::Send__delete__(mEngine);
mEngine->Send__delete__(mEngine);
MOZ_ASSERT(!mEngine);
}
}

2
gfx/gl/GLReadTexImageHelper.cpp
View File

@ -152,7 +152,7 @@ GLReadTexImageHelper::DidGLErrorOccur(const char* str)
GLenum error = mGL->fGetError();
if (error != LOCAL_GL_NO_ERROR) {
printf_stderr("GL ERROR: %s (0x%04x) %s\n",
GLContext::GLErrorToString(error), error, str);
mGL->GLErrorToString(error), error, str);
return true;
}

2
gfx/ipc/SharedDIB.cpp
View File

@ -37,7 +37,7 @@ SharedDIB::IsValid()
if (!mShMem)
return false;
return base::SharedMemory::IsHandleValid(mShMem->handle());
return mShMem->IsHandleValid(mShMem->handle());
}
nsresult

2
gfx/src/nsFontMetrics.cpp
View File

@ -138,7 +138,7 @@ nsFontMetrics::nsFontMetrics(const nsFont& aFont, const Params& aParams,
aFont.AddFontVariationsToStyle(&style);
gfxFloat devToCssSize = gfxFloat(mP2A) /
gfxFloat(nsDeviceContext::AppUnitsPerCSSPixel());
gfxFloat(mDeviceContext->AppUnitsPerCSSPixel());
mFontGroup = gfxPlatform::GetPlatform()->
CreateFontGroup(aFont.fontlist, &style, aParams.textPerf,
aParams.userFontSet, devToCssSize);

8
ipc/glue/IPCStreamUtils.cpp
View File

@ -274,7 +274,7 @@ CleanupIPCStream(IPCStream& aValue, bool aConsumedByIPC, bool aDelayedStart)
fdSetActor->ForgetFileDescriptors(fds);
if (!aConsumedByIPC) {
Unused << FileDescriptorSetChild::Send__delete__(fdSetActor);
Unused << fdSetActor->Send__delete__(fdSetActor);
}
} else if (streamWithFds.optionalFds().type() ==
@ -292,7 +292,7 @@ CleanupIPCStream(IPCStream& aValue, bool aConsumedByIPC, bool aDelayedStart)
fdSetActor->ForgetFileDescriptors(fds);
if (!aConsumedByIPC) {
Unused << FileDescriptorSetParent::Send__delete__(fdSetActor);
Unused << fdSetActor->Send__delete__(fdSetActor);
}
}
@ -400,7 +400,7 @@ DeserializeIPCStream(const IPCStream& aValue)
fdSetActor->ForgetFileDescriptors(fds);
MOZ_ASSERT(!fds.IsEmpty());
if (!FileDescriptorSetParent::Send__delete__(fdSetActor)) {
if (!fdSetActor->Send__delete__(fdSetActor)) {
// child process is gone, warn and allow actor to clean up normally
NS_WARNING("Failed to delete fd set actor.");
}
@ -414,7 +414,7 @@ DeserializeIPCStream(const IPCStream& aValue)
fdSetActor->ForgetFileDescriptors(fds);
MOZ_ASSERT(!fds.IsEmpty());
Unused << FileDescriptorSetChild::Send__delete__(fdSetActor);
Unused << fdSetActor->Send__delete__(fdSetActor);
}
return InputStreamHelper::DeserializeInputStream(streamWithFds.stream(), fds);

48
js/src/irregexp/NativeRegExpMacroAssembler.cpp
View File

@ -181,7 +181,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
#ifndef JS_CODEGEN_X86
// The InputOutputData* is stored on the stack immediately above the frame.
Address inputOutputAddress(MacroAssembler::getStackPointer(), frameSize);
Address inputOutputAddress(masm.getStackPointer(), frameSize);
#else
// The InputOutputData* is left in its original on stack location.
Address inputOutputAddress(masm.getStackPointer(),
@ -195,10 +195,10 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
Register matchPairsRegister = input_end_pointer;
masm.loadPtr(Address(temp0, offsetof(InputOutputData, matches)), matchPairsRegister);
masm.loadPtr(Address(matchPairsRegister, MatchPairs::offsetOfPairs()), temp1);
masm.storePtr(temp1, Address(MacroAssembler::getStackPointer(), offsetof(FrameData, outputRegisters)));
masm.storePtr(temp1, Address(masm.getStackPointer(), offsetof(FrameData, outputRegisters)));
masm.load32(Address(matchPairsRegister, MatchPairs::offsetOfPairCount()), temp1);
masm.lshiftPtr(Imm32(1), temp1);
masm.store32(temp1, Address(MacroAssembler::getStackPointer(), offsetof(FrameData, numOutputRegisters)));
masm.store32(temp1, Address(masm.getStackPointer(), offsetof(FrameData, numOutputRegisters)));
#ifdef DEBUG
// Bounds check numOutputRegisters.
@ -211,7 +211,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
} else {
Register endIndexRegister = input_end_pointer;
masm.loadPtr(Address(temp0, offsetof(InputOutputData, endIndex)), endIndexRegister);
masm.storePtr(endIndexRegister, Address(MacroAssembler::getStackPointer(), offsetof(FrameData, endIndex)));
masm.storePtr(endIndexRegister, Address(masm.getStackPointer(), offsetof(FrameData, endIndex)));
}
// Load string end pointer.
@ -219,11 +219,11 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
// Load input start pointer, and copy to FrameData.
masm.loadPtr(Address(temp0, offsetof(InputOutputData, inputStart)), current_position);
masm.storePtr(current_position, Address(MacroAssembler::getStackPointer(), offsetof(FrameData, inputStart)));
masm.storePtr(current_position, Address(masm.getStackPointer(), offsetof(FrameData, inputStart)));
// Load start index, and copy to FrameData.
masm.loadPtr(Address(temp0, offsetof(InputOutputData, startIndex)), temp1);
masm.storePtr(temp1, Address(MacroAssembler::getStackPointer(), offsetof(FrameData, startIndex)));
masm.storePtr(temp1, Address(masm.getStackPointer(), offsetof(FrameData, startIndex)));
// Set up input position to be negative offset from string end.
masm.subPtr(input_end_pointer, current_position);
@ -234,7 +234,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
// Store this value on the frame, for use when clearing
// position registers.
masm.storePtr(temp0, Address(MacroAssembler::getStackPointer(), offsetof(FrameData, inputStartMinusOne)));
masm.storePtr(temp0, Address(masm.getStackPointer(), offsetof(FrameData, inputStartMinusOne)));
// Update current position based on start index.
masm.computeEffectiveAddress(BaseIndex(current_position, temp1, factor()), current_position);
@ -242,8 +242,8 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
Label load_char_start_regexp, start_regexp;
// Load newline if index is at start, previous character otherwise.
masm.branchPtr(Assembler::NotEqual,
Address(MacroAssembler::getStackPointer(), offsetof(FrameData, startIndex)), ImmWord(0),
masm.branchPtr(Assembler::NotEqual,
Address(masm.getStackPointer(), offsetof(FrameData, startIndex)), ImmWord(0),
&load_char_start_regexp);
masm.movePtr(ImmWord('\n'), current_character);
masm.jump(&start_regexp);
@ -265,7 +265,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
masm.movePtr(ImmWord(register_offset(0)), temp1);
Label init_loop;
masm.bind(&init_loop);
masm.storePtr(temp0, BaseIndex(MacroAssembler::getStackPointer(), temp1, TimesOne));
masm.storePtr(temp0, BaseIndex(masm.getStackPointer(), temp1, TimesOne));
masm.addPtr(ImmWord(sizeof(void*)), temp1);
masm.branchPtr(Assembler::LessThan, temp1,
ImmWord(register_offset(num_saved_registers_)), &init_loop);
@ -280,7 +280,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
masm.loadPtr(AbsoluteAddress(context_addr), backtrack_stack_pointer);
masm.loadPtr(Address(backtrack_stack_pointer, baseOffset), backtrack_stack_pointer);
masm.storePtr(backtrack_stack_pointer,
Address(MacroAssembler::getStackPointer(), offsetof(FrameData, backtrackStackBase)));
Address(masm.getStackPointer(), offsetof(FrameData, backtrackStackBase)));
masm.jump(&start_label_);
@ -288,7 +288,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
if (success_label_.used()) {
MOZ_ASSERT(num_saved_registers_ > 0);
Address outputRegistersAddress(MacroAssembler::getStackPointer(), offsetof(FrameData, outputRegisters));
Address outputRegistersAddress(masm.getStackPointer(), offsetof(FrameData, outputRegisters));
// Save captures when successful.
masm.bind(&success_label_);
@ -326,9 +326,9 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
// Restart matching if the regular expression is flagged as global.
if (global()) {
// Increment success counter.
masm.add32(Imm32(1), Address(MacroAssembler::getStackPointer(), offsetof(FrameData, successfulCaptures)));
masm.add32(Imm32(1), Address(masm.getStackPointer(), offsetof(FrameData, successfulCaptures)));
Address numOutputRegistersAddress(MacroAssembler::getStackPointer(), offsetof(FrameData, numOutputRegisters));
Address numOutputRegistersAddress(masm.getStackPointer(), offsetof(FrameData, numOutputRegisters));
// Capture results have been stored, so the number of remaining global
// output registers is reduced by the number of stored captures.
@ -345,7 +345,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
masm.add32(Imm32(num_saved_registers_ * sizeof(void*)), outputRegistersAddress);
// Prepare temp0 to initialize registers with its value in the next run.
masm.loadPtr(Address(MacroAssembler::getStackPointer(), offsetof(FrameData, inputStartMinusOne)), temp0);
masm.loadPtr(Address(masm.getStackPointer(), offsetof(FrameData, inputStartMinusOne)), temp0);
if (global_with_zero_length_check()) {
// Special case for zero-length matches.
@ -370,7 +370,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
Register endIndexRegister = temp1;
Register inputByteLength = backtrack_stack_pointer;
masm.loadPtr(Address(MacroAssembler::getStackPointer(), offsetof(FrameData, endIndex)), endIndexRegister);
masm.loadPtr(Address(masm.getStackPointer(), offsetof(FrameData, endIndex)), endIndexRegister);
masm.loadPtr(inputOutputAddress, temp0);
masm.loadPtr(Address(temp0, offsetof(InputOutputData, inputEnd)), inputByteLength);
@ -396,7 +396,7 @@ NativeRegExpMacroAssembler::GenerateCode(JSContext* cx, bool match_only)
if (global()) {
// Return the number of successful captures.
masm.load32(Address(MacroAssembler::getStackPointer(), offsetof(FrameData, successfulCaptures)), temp0);
masm.load32(Address(masm.getStackPointer(), offsetof(FrameData, successfulCaptures)), temp0);
}
masm.bind(&return_temp0);
@ -583,13 +583,13 @@ NativeRegExpMacroAssembler::CheckAtStart(Label* on_at_start)
Label not_at_start;
// Did we start the match at the start of the string at all?
Address startIndex(MacroAssembler::getStackPointer(), offsetof(FrameData, startIndex));
Address startIndex(masm.getStackPointer(), offsetof(FrameData, startIndex));
masm.branchPtr(Assembler::NotEqual, startIndex, ImmWord(0), &not_at_start);
// If we did, are we still at the start of the input?
masm.computeEffectiveAddress(BaseIndex(input_end_pointer, current_position, TimesOne), temp0);
Address inputStart(MacroAssembler::getStackPointer(), offsetof(FrameData, inputStart));
Address inputStart(masm.getStackPointer(), offsetof(FrameData, inputStart));
masm.branchPtr(Assembler::Equal, inputStart, temp0, BranchOrBacktrack(on_at_start));
masm.bind(&not_at_start);
@ -601,13 +601,13 @@ NativeRegExpMacroAssembler::CheckNotAtStart(Label* on_not_at_start)
JitSpew(SPEW_PREFIX "CheckNotAtStart");
// Did we start the match at the start of the string at all?
Address startIndex(MacroAssembler::getStackPointer(), offsetof(FrameData, startIndex));
Address startIndex(masm.getStackPointer(), offsetof(FrameData, startIndex));
masm.branchPtr(Assembler::NotEqual, startIndex, ImmWord(0), BranchOrBacktrack(on_not_at_start));
// If we did, are we still at the start of the input?
masm.computeEffectiveAddress(BaseIndex(input_end_pointer, current_position, TimesOne), temp0);
Address inputStart(MacroAssembler::getStackPointer(), offsetof(FrameData, inputStart));
Address inputStart(masm.getStackPointer(), offsetof(FrameData, inputStart));
masm.branchPtr(Assembler::NotEqual, inputStart, temp0, BranchOrBacktrack(on_not_at_start));
}
@ -1184,7 +1184,7 @@ NativeRegExpMacroAssembler::ReadBacktrackStackPointerFromRegister(int reg)
JitSpew(SPEW_PREFIX "ReadBacktrackStackPointerFromRegister(%d)", reg);
masm.loadPtr(register_location(reg), backtrack_stack_pointer);
masm.addPtr(Address(MacroAssembler::getStackPointer(),
masm.addPtr(Address(masm.getStackPointer(),
offsetof(FrameData, backtrackStackBase)), backtrack_stack_pointer);
}
@ -1194,7 +1194,7 @@ NativeRegExpMacroAssembler::WriteBacktrackStackPointerToRegister(int reg)
JitSpew(SPEW_PREFIX "WriteBacktrackStackPointerToRegister(%d)", reg);
masm.movePtr(backtrack_stack_pointer, temp0);
masm.subPtr(Address(MacroAssembler::getStackPointer(),
masm.subPtr(Address(masm.getStackPointer(),
offsetof(FrameData, backtrackStackBase)), temp0);
masm.storePtr(temp0, register_location(reg));
}
@ -1240,7 +1240,7 @@ NativeRegExpMacroAssembler::ClearRegisters(int reg_from, int reg_to)
JitSpew(SPEW_PREFIX "ClearRegisters(%d, %d)", reg_from, reg_to);
MOZ_ASSERT(reg_from <= reg_to);
masm.loadPtr(Address(MacroAssembler::getStackPointer(), offsetof(FrameData, inputStartMinusOne)), temp0);
masm.loadPtr(Address(masm.getStackPointer(), offsetof(FrameData, inputStartMinusOne)), temp0);
for (int reg = reg_from; reg <= reg_to; reg++)
masm.storePtr(temp0, register_location(reg));
}

2
js/src/irregexp/NativeRegExpMacroAssembler.h
View File

@ -214,7 +214,7 @@ class MOZ_STACK_CLASS NativeRegExpMacroAssembler final : public RegExpMacroAssem
// The frame_pointer-relative location of a regexp register.
jit::Address register_location(int register_index) {
checkRegister(register_index);
return jit::Address(jit::MacroAssembler::getStackPointer(), register_offset(register_index));
return jit::Address(masm.getStackPointer(), register_offset(register_index));
}
int32_t register_offset(int register_index) {

6
js/src/jit/BaselineCacheIRCompiler.cpp
View File

@ -27,7 +27,7 @@ Address
CacheRegisterAllocator::addressOf(MacroAssembler& masm, BaselineFrameSlot slot) const
{
uint32_t offset = stackPushed_ + ICStackValueOffset + slot.slot() * sizeof(JS::Value);
return Address(jit::MacroAssembler::getStackPointer(), offset);
return Address(masm.getStackPointer(), offset);
}
// BaselineCacheIRCompiler compiles CacheIR to BaselineIC native code.
@ -587,7 +587,7 @@ BaselineCacheIRCompiler::emitMegamorphicLoadSlotResult()
masm.mov(ReturnReg, scratch2);
masm.PopRegsInMask(volatileRegs);
masm.loadTypedOrValue(Address(jit::MacroAssembler::getStackPointer(), 0), output);
masm.loadTypedOrValue(Address(masm.getStackPointer(), 0), output);
masm.adjustStack(sizeof(Value));
masm.branchIfFalseBool(scratch2, failure->label());
@ -632,7 +632,7 @@ BaselineCacheIRCompiler::emitMegamorphicStoreSlot()
masm.mov(ReturnReg, scratch1);
masm.PopRegsInMask(volatileRegs);
masm.loadValue(Address(jit::MacroAssembler::getStackPointer(), 0), val);
masm.loadValue(Address(masm.getStackPointer(), 0), val);
masm.adjustStack(sizeof(Value));
masm.branchIfFalseBool(scratch1, failure->label());

4
js/src/jit/BaselineCompiler.cpp
View File

@ -931,7 +931,7 @@ BaselineCompiler::emitProfilerEnterFrame()
// Starts off initially disabled.
Label noInstrument;
CodeOffset toggleOffset = masm.toggledJump(&noInstrument);
masm.profilerEnterFrame(MacroAssembler::getStackPointer(), R0.scratchReg());
masm.profilerEnterFrame(masm.getStackPointer(), R0.scratchReg());
masm.bind(&noInstrument);
// Store the start offset in the appropriate location.
@ -4907,7 +4907,7 @@ BaselineCompiler::emit_JSOP_RESUME()
// After the generator returns, we restore the stack pointer, push the
// return value and we're done.
masm.bind(&returnTarget);
masm.computeEffectiveAddress(frame.addressOfStackValue(frame.peek(-1)), MacroAssembler::getStackPointer());
masm.computeEffectiveAddress(frame.addressOfStackValue(frame.peek(-1)), masm.getStackPointer());
frame.popn(2);
frame.push(R0);
return true;

78
js/src/jit/BaselineIC.cpp
View File

@ -189,7 +189,7 @@ ICWarmUpCounter_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
{
// Push IonOsrTempData pointer storage
masm.subFromStackPtr(Imm32(sizeof(void*)));
masm.push(MacroAssembler::getStackPointer());
masm.push(masm.getStackPointer());
// Push stub pointer.
masm.push(ICStubReg);
@ -741,12 +741,12 @@ ICGetElem_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
// We need: index, receiver, obj
masm.pushValue(R0);
masm.pushValue(R1);
masm.pushValue(Address(MacroAssembler::getStackPointer(), sizeof(Value) * 2));
masm.pushValue(Address(masm.getStackPointer(), sizeof(Value) * 2));
// Push arguments.
masm.pushValue(R0); // Index
masm.pushValue(R1); // Reciver
masm.pushValue(Address(MacroAssembler::getStackPointer(), sizeof(Value) * 5)); // Obj
masm.pushValue(Address(masm.getStackPointer(), sizeof(Value) * 5)); // Obj
masm.push(ICStubReg);
pushStubPayload(masm, R0.scratchReg());
@ -943,8 +943,8 @@ ICSetElem_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
// so we push the index, then overwrite the rhs Value with R0
// and push the rhs value.
masm.pushValue(R1);
masm.loadValue(Address(MacroAssembler::getStackPointer(), sizeof(Value)), R1);
masm.storeValue(R0, Address(MacroAssembler::getStackPointer(), sizeof(Value)));
masm.loadValue(Address(masm.getStackPointer(), sizeof(Value)), R1);
masm.storeValue(R0, Address(masm.getStackPointer(), sizeof(Value)));
masm.pushValue(R1);
// Push arguments.
@ -958,7 +958,7 @@ ICSetElem_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
// Push pointer to stack values, so that the stub can overwrite the object
// (pushed for the decompiler) with the rhs.
masm.computeEffectiveAddress(Address(MacroAssembler::getStackPointer(), 3 * sizeof(Value)), R0.scratchReg());
masm.computeEffectiveAddress(Address(masm.getStackPointer(), 3 * sizeof(Value)), R0.scratchReg());
masm.push(R0.scratchReg());
masm.push(ICStubReg);
@ -1610,7 +1610,7 @@ ICSetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
// Ensure stack is fully synced for the expression decompiler.
// Overwrite the RHS value on top of the stack with the object, then push
// the RHS in R1 on top of that.
masm.storeValue(R0, Address(MacroAssembler::getStackPointer(), 0));
masm.storeValue(R0, Address(masm.getStackPointer(), 0));
masm.pushValue(R1);
// Push arguments.
@ -1619,7 +1619,7 @@ ICSetProp_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
// Push pointer to stack values, so that the stub can overwrite the object
// (pushed for the decompiler) with the RHS.
masm.computeEffectiveAddress(Address(MacroAssembler::getStackPointer(), 2 * sizeof(Value)),
masm.computeEffectiveAddress(Address(masm.getStackPointer(), 2 * sizeof(Value)),
R0.scratchReg());
masm.push(R0.scratchReg());
@ -2520,7 +2520,7 @@ void
ICCallStubCompiler::guardSpreadCall(MacroAssembler& masm, Register argcReg, Label* failure,
bool isConstructing)
{
masm.unboxObject(Address(MacroAssembler::getStackPointer(),
masm.unboxObject(Address(masm.getStackPointer(),
isConstructing * sizeof(Value) + ICStackValueOffset), argcReg);
masm.loadPtr(Address(argcReg, NativeObject::offsetOfElements()), argcReg);
masm.load32(Address(argcReg, ObjectElements::offsetOfLength()), argcReg);
@ -2541,7 +2541,7 @@ ICCallStubCompiler::pushSpreadCallArguments(MacroAssembler& masm,
{
// Pull the array off the stack before aligning.
Register startReg = regs.takeAny();
masm.unboxObject(Address(MacroAssembler::getStackPointer(),
masm.unboxObject(Address(masm.getStackPointer(),
(isConstructing * sizeof(Value)) + STUB_FRAME_SIZE), startReg);
masm.loadPtr(Address(startReg, NativeObject::offsetOfElements()), startReg);
@ -2601,7 +2601,7 @@ ICCallStubCompiler::guardFunApply(MacroAssembler& masm, AllocatableGeneralRegist
// Stack looks like:
// [..., CalleeV, ThisV, Arg0V, Arg1V <MaybeReturnReg>]
Address secondArgSlot(MacroAssembler::getStackPointer(), ICStackValueOffset);
Address secondArgSlot(masm.getStackPointer(), ICStackValueOffset);
if (applyThing == FunApply_MagicArgs) {
// Ensure that the second arg is magic arguments.
masm.branchTestMagic(Assembler::NotEqual, secondArgSlot, failure);
@ -2674,7 +2674,7 @@ ICCallStubCompiler::guardFunApply(MacroAssembler& masm, AllocatableGeneralRegist
// Load the callee, ensure that it's fun_apply
ValueOperand val = regs.takeAnyValue();
Address calleeSlot(MacroAssembler::getStackPointer(), ICStackValueOffset + (3 * sizeof(Value)));
Address calleeSlot(masm.getStackPointer(), ICStackValueOffset + (3 * sizeof(Value)));
masm.loadValue(calleeSlot, val);
masm.branchTestObject(Assembler::NotEqual, val, failure);
@ -2688,7 +2688,7 @@ ICCallStubCompiler::guardFunApply(MacroAssembler& masm, AllocatableGeneralRegist
// Load the |thisv|, ensure that it's a scripted function with a valid baseline or ion
// script, or a native function.
Address thisSlot(MacroAssembler::getStackPointer(), ICStackValueOffset + (2 * sizeof(Value)));
Address thisSlot(masm.getStackPointer(), ICStackValueOffset + (2 * sizeof(Value)));
masm.loadValue(thisSlot, val);
masm.branchTestObject(Assembler::NotEqual, val, failure);
@ -2803,7 +2803,7 @@ ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
// callee
masm.pushValue(Address(BaselineFrameReg, valueOffset++ * sizeof(Value) + STUB_FRAME_SIZE));
masm.push(MacroAssembler::getStackPointer());
masm.push(masm.getStackPointer());
masm.push(ICStubReg);
PushStubPayload(masm, R0.scratchReg());
@ -2826,7 +2826,7 @@ ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
pushCallArguments(masm, regs, R0.scratchReg(), /* isJitCall = */ false, isConstructing_);
masm.push(MacroAssembler::getStackPointer());
masm.push(masm.getStackPointer());
masm.push(R0.scratchReg());
masm.push(ICStubReg);
@ -2847,7 +2847,7 @@ ICCall_Fallback::Compiler::generateStubCode(MacroAssembler& masm)
// Load passed-in ThisV into R1 just in case it's needed. Need to do this before
// we leave the stub frame since that info will be lost.
// Current stack: [...., ThisV, ActualArgc, CalleeToken, Descriptor ]
masm.loadValue(Address(MacroAssembler::getStackPointer(), 3 * sizeof(size_t)), R1);
masm.loadValue(Address(masm.getStackPointer(), 3 * sizeof(size_t)), R1);
leaveStubFrame(masm, true);
@ -2916,11 +2916,11 @@ ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm)
// Stack Layout: [ ..., CalleeVal, ThisVal, Arg0Val, ..., ArgNVal, [newTarget] +ICStackValueOffset+ ]
if (isSpread_) {
unsigned skipToCallee = (2 + isConstructing_) * sizeof(Value);
masm.loadValue(Address(MacroAssembler::getStackPointer(), skipToCallee + ICStackValueOffset), R1);
masm.loadValue(Address(masm.getStackPointer(), skipToCallee + ICStackValueOffset), R1);
} else {
// Account for newTarget, if necessary
unsigned nonArgsSkip = (1 + isConstructing_) * sizeof(Value);
BaseValueIndex calleeSlot(MacroAssembler::getStackPointer(), argcReg, ICStackValueOffset + nonArgsSkip);
BaseValueIndex calleeSlot(masm.getStackPointer(), argcReg, ICStackValueOffset + nonArgsSkip);
masm.loadValue(calleeSlot, R1);
}
regs.take(R1);
@ -2976,16 +2976,16 @@ ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm)
// Stack now looks like:
// [..., Callee, ThisV, Arg0V, ..., ArgNV, NewTarget, StubFrameHeader, ArgC ]
masm.loadValue(Address(MacroAssembler::getStackPointer(), STUB_FRAME_SIZE + sizeof(size_t)), R1);
masm.loadValue(Address(masm.getStackPointer(), STUB_FRAME_SIZE + sizeof(size_t)), R1);
masm.push(masm.extractObject(R1, ExtractTemp0));
if (isSpread_) {
masm.loadValue(Address(MacroAssembler::getStackPointer(),
masm.loadValue(Address(masm.getStackPointer(),
3 * sizeof(Value) + STUB_FRAME_SIZE + sizeof(size_t) +
sizeof(JSObject*)),
R1);
} else {
BaseValueIndex calleeSlot2(MacroAssembler::getStackPointer(), argcReg,
BaseValueIndex calleeSlot2(masm.getStackPointer(), argcReg,
2 * sizeof(Value) + STUB_FRAME_SIZE + sizeof(size_t) +
sizeof(JSObject*));
masm.loadValue(calleeSlot2, R1);
@ -3017,16 +3017,16 @@ ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm)
// Stack now looks like:
// [..., Callee, ThisV, Arg0V, ..., ArgNV, [NewTarget], StubFrameHeader ]
if (isSpread_) {
masm.storeValue(R0, Address(MacroAssembler::getStackPointer(),
masm.storeValue(R0, Address(masm.getStackPointer(),
(1 + isConstructing_) * sizeof(Value) + STUB_FRAME_SIZE));
} else {
BaseValueIndex thisSlot(MacroAssembler::getStackPointer(), argcReg,
BaseValueIndex thisSlot(masm.getStackPointer(), argcReg,
STUB_FRAME_SIZE + isConstructing_ * sizeof(Value));
masm.storeValue(R0, thisSlot);
}
// Restore the stub register from the baseline stub frame.
masm.loadPtr(Address(MacroAssembler::getStackPointer(), STUB_FRAME_SAVED_STUB_OFFSET), ICStubReg);
masm.loadPtr(Address(masm.getStackPointer(), STUB_FRAME_SAVED_STUB_OFFSET), ICStubReg);
// Reload callee script. Note that a GC triggered by CreateThis may
// have destroyed the callee BaselineScript and IonScript. CreateThis
@ -3036,11 +3036,11 @@ ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm)
// Just need to load the script now.
if (isSpread_) {
unsigned skipForCallee = (2 + isConstructing_) * sizeof(Value);
masm.loadValue(Address(MacroAssembler::getStackPointer(), skipForCallee + STUB_FRAME_SIZE), R0);
masm.loadValue(Address(masm.getStackPointer(), skipForCallee + STUB_FRAME_SIZE), R0);
} else {
// Account for newTarget, if necessary
unsigned nonArgsSkip = (1 + isConstructing_) * sizeof(Value);
BaseValueIndex calleeSlot3(MacroAssembler::getStackPointer(), argcReg, nonArgsSkip + STUB_FRAME_SIZE);
BaseValueIndex calleeSlot3(masm.getStackPointer(), argcReg, nonArgsSkip + STUB_FRAME_SIZE);
masm.loadValue(calleeSlot3, R0);
}
callee = masm.extractObject(R0, ExtractTemp0);
@ -3113,7 +3113,7 @@ ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm)
// + sizeof(Descriptor) + sizeof(Callee) + sizeof(ActualArgc)
// + stubFrameSize(Descriptor)
// - sizeof(ICStubReg) - sizeof(BaselineFrameReg)
Address descriptorAddr(MacroAssembler::getStackPointer(), 0);
Address descriptorAddr(masm.getStackPointer(), 0);
masm.loadPtr(descriptorAddr, BaselineFrameReg);
masm.rshiftPtr(Imm32(FRAMESIZE_SHIFT), BaselineFrameReg);
masm.addPtr(Imm32((3 - 2) * sizeof(size_t)), BaselineFrameReg);
@ -3125,7 +3125,7 @@ ICCallScriptedCompiler::generateStubCode(MacroAssembler& masm)
// Account for the Array object.
masm.move32(Imm32(1), argcReg);
} else {
Address argcAddr(MacroAssembler::getStackPointer(), 2 * sizeof(size_t));
Address argcAddr(masm.getStackPointer(), 2 * sizeof(size_t));
masm.loadPtr(argcAddr, argcReg);
}
@ -3180,7 +3180,7 @@ ICCall_ConstStringSplit::Compiler::generateStubCode(MacroAssembler& masm)
// Guard that callee is native function js::intrinsic_StringSplitString.
{
Address calleeAddr(MacroAssembler::getStackPointer(), ICStackValueOffset + CALLEE_DEPTH);
Address calleeAddr(masm.getStackPointer(), ICStackValueOffset + CALLEE_DEPTH);
ValueOperand calleeVal = regs.takeAnyValue();
// Ensure that callee is an object.
@ -3203,7 +3203,7 @@ ICCall_ConstStringSplit::Compiler::generateStubCode(MacroAssembler& masm)
// Guard sep.
{
// Ensure that sep is a string.
Address sepAddr(MacroAssembler::getStackPointer(), ICStackValueOffset + SEP_DEPTH);
Address sepAddr(masm.getStackPointer(), ICStackValueOffset + SEP_DEPTH);
ValueOperand sepVal = regs.takeAnyValue();
masm.loadValue(sepAddr, sepVal);
@ -3218,7 +3218,7 @@ ICCall_ConstStringSplit::Compiler::generateStubCode(MacroAssembler& masm)
// Guard str.
{
// Ensure that str is a string.
Address strAddr(MacroAssembler::getStackPointer(), ICStackValueOffset + STR_DEPTH);
Address strAddr(masm.getStackPointer(), ICStackValueOffset + STR_DEPTH);
ValueOperand strVal = regs.takeAnyValue();
masm.loadValue(strAddr, strVal);
@ -3267,7 +3267,7 @@ ICCall_IsSuspendedGenerator::Compiler::generateStubCode(MacroAssembler& masm)
AllocatableGeneralRegisterSet regs(availableGeneralRegs(0));
// Load the argument.
Address argAddr(MacroAssembler::getStackPointer(), ICStackValueOffset);
Address argAddr(masm.getStackPointer(), ICStackValueOffset);
ValueOperand argVal = regs.takeAnyValue();
masm.loadValue(argAddr, argVal);
@ -3318,10 +3318,10 @@ ICCall_Native::Compiler::generateStubCode(MacroAssembler& masm)
// Load the callee in R1.
if (isSpread_) {
unsigned skipToCallee = (2 + isConstructing_) * sizeof(Value);
masm.loadValue(Address(MacroAssembler::getStackPointer(), skipToCallee + ICStackValueOffset), R1);
masm.loadValue(Address(masm.getStackPointer(), skipToCallee + ICStackValueOffset), R1);
} else {
unsigned nonArgsSlots = (1 + isConstructing_) * sizeof(Value);
BaseValueIndex calleeSlot(MacroAssembler::getStackPointer(), argcReg, ICStackValueOffset + nonArgsSlots);
BaseValueIndex calleeSlot(masm.getStackPointer(), argcReg, ICStackValueOffset + nonArgsSlots);
masm.loadValue(calleeSlot, R1);
}
regs.take(R1);
@ -3395,7 +3395,7 @@ ICCall_Native::Compiler::generateStubCode(MacroAssembler& masm)
masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
// Load the return value into R0.
masm.loadValue(Address(MacroAssembler::getStackPointer(), NativeExitFrameLayout::offsetOfResult()), R0);
masm.loadValue(Address(masm.getStackPointer(), NativeExitFrameLayout::offsetOfResult()), R0);
leaveStubFrame(masm);
@ -3421,7 +3421,7 @@ ICCall_ClassHook::Compiler::generateStubCode(MacroAssembler& masm)
// Load the callee in R1.
unsigned nonArgSlots = (1 + isConstructing_) * sizeof(Value);
BaseValueIndex calleeSlot(MacroAssembler::getStackPointer(), argcReg, ICStackValueOffset + nonArgSlots);
BaseValueIndex calleeSlot(masm.getStackPointer(), argcReg, ICStackValueOffset + nonArgSlots);
masm.loadValue(calleeSlot, R1);
regs.take(R1);
@ -3482,7 +3482,7 @@ ICCall_ClassHook::Compiler::generateStubCode(MacroAssembler& masm)
masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
// Load the return value into R0.
masm.loadValue(Address(MacroAssembler::getStackPointer(), NativeExitFrameLayout::offsetOfResult()), R0);
masm.loadValue(Address(masm.getStackPointer(), NativeExitFrameLayout::offsetOfResult()), R0);
leaveStubFrame(masm);
@ -3691,7 +3691,7 @@ ICCall_ScriptedFunCall::Compiler::generateStubCode(MacroAssembler& masm)
// Load the callee in R1.
// Stack Layout: [ ..., CalleeVal, ThisVal, Arg0Val, ..., ArgNVal, +ICStackValueOffset+ ]
BaseValueIndex calleeSlot(MacroAssembler::getStackPointer(), argcReg, ICStackValueOffset + sizeof(Value));
BaseValueIndex calleeSlot(masm.getStackPointer(), argcReg, ICStackValueOffset + sizeof(Value));
masm.loadValue(calleeSlot, R1);
regs.take(R1);
@ -3705,7 +3705,7 @@ ICCall_ScriptedFunCall::Compiler::generateStubCode(MacroAssembler& masm)
masm.branchPtr(Assembler::NotEqual, callee, ImmPtr(fun_call), &failure);
// Ensure |this| is a function with a jit entry.
BaseIndex thisSlot(MacroAssembler::getStackPointer(), argcReg, TimesEight, ICStackValueOffset);
BaseIndex thisSlot(masm.getStackPointer(), argcReg, TimesEight, ICStackValueOffset);
masm.loadValue(thisSlot, R1);
masm.branchTestObject(Assembler::NotEqual, R1, &failure);

22
js/src/jit/CacheIRCompiler.cpp
View File

@ -159,13 +159,13 @@ CacheRegisterAllocator::useRegister(MacroAssembler& masm, TypedOperandId typedId
// unbox it and then remove it from the stack, else we just unbox.
Register reg = allocateRegister(masm);
if (loc.valueStack() == stackPushed_) {
masm.unboxNonDouble(Address(MacroAssembler::getStackPointer(), 0), reg, typedId.type());
masm.unboxNonDouble(Address(masm.getStackPointer(), 0), reg, typedId.type());
masm.addToStackPtr(Imm32(sizeof(js::Value)));
MOZ_ASSERT(stackPushed_ >= sizeof(js::Value));
stackPushed_ -= sizeof(js::Value);
} else {
MOZ_ASSERT(loc.valueStack() < stackPushed_);
masm.unboxNonDouble(Address(MacroAssembler::getStackPointer(), stackPushed_ - loc.valueStack()),
masm.unboxNonDouble(Address(masm.getStackPointer(), stackPushed_ - loc.valueStack()),
reg, typedId.type());
}
loc.setPayloadReg(reg, typedId.type());
@ -572,7 +572,7 @@ CacheRegisterAllocator::spillOperandToStack(MacroAssembler& masm, OperandLocatio
if (!freeValueSlots_.empty()) {
uint32_t stackPos = freeValueSlots_.popCopy();
MOZ_ASSERT(stackPos <= stackPushed_);
masm.storeValue(loc->valueReg(), Address(MacroAssembler::getStackPointer(),
masm.storeValue(loc->valueReg(), Address(masm.getStackPointer(),
stackPushed_ - stackPos));
loc->setValueStack(stackPos);
return;
@ -588,7 +588,7 @@ CacheRegisterAllocator::spillOperandToStack(MacroAssembler& masm, OperandLocatio
if (!freePayloadSlots_.empty()) {
uint32_t stackPos = freePayloadSlots_.popCopy();
MOZ_ASSERT(stackPos <= stackPushed_);
masm.storePtr(loc->payloadReg(), Address(MacroAssembler::getStackPointer(),
masm.storePtr(loc->payloadReg(), Address(masm.getStackPointer(),
stackPushed_ - stackPos));
loc->setPayloadStack(stackPos, loc->payloadType());
return;
@ -639,7 +639,7 @@ CacheRegisterAllocator::popPayload(MacroAssembler& masm, OperandLocation* loc, R
stackPushed_ -= sizeof(uintptr_t);
} else {
MOZ_ASSERT(loc->payloadStack() < stackPushed_);
masm.loadPtr(Address(MacroAssembler::getStackPointer(), stackPushed_ - loc->payloadStack()), dest);
masm.loadPtr(Address(masm.getStackPointer(), stackPushed_ - loc->payloadStack()), dest);
masm.propagateOOM(freePayloadSlots_.append(loc->payloadStack()));
}
@ -659,7 +659,7 @@ CacheRegisterAllocator::popValue(MacroAssembler& masm, OperandLocation* loc, Val
stackPushed_ -= sizeof(js::Value);
} else {
MOZ_ASSERT(loc->valueStack() < stackPushed_);
masm.loadValue(Address(MacroAssembler::getStackPointer(), stackPushed_ - loc->valueStack()), dest);
masm.loadValue(Address(masm.getStackPointer(), stackPushed_ - loc->valueStack()), dest);
masm.propagateOOM(freeValueSlots_.append(loc->valueStack()));
}
@ -756,7 +756,7 @@ CacheRegisterAllocator::restoreInputState(MacroAssembler& masm, bool shouldDisca
MOZ_ASSERT(stackPushed_ >= sizeof(js::Value));
MOZ_ASSERT(cur.valueStack() <= stackPushed_);
MOZ_ASSERT(dest.payloadType() != JSVAL_TYPE_DOUBLE);
masm.unboxNonDouble(Address(MacroAssembler::getStackPointer(), stackPushed_ - cur.valueStack()),
masm.unboxNonDouble(Address(masm.getStackPointer(), stackPushed_ - cur.valueStack()),
dest.payloadReg(), dest.payloadType());
continue;
case OperandLocation::Constant:
@ -784,7 +784,7 @@ CacheRegisterAllocator::restoreInputState(MacroAssembler& masm, bool shouldDisca
stackPushed_ -= sizeof(uintptr_t);
} else {
MOZ_ASSERT(spill.stackPushed < stackPushed_);
masm.loadPtr(Address(MacroAssembler::getStackPointer(), stackPushed_ - spill.stackPushed),
masm.loadPtr(Address(masm.getStackPointer(), stackPushed_ - spill.stackPushed),
spill.reg);
}
}
@ -2707,7 +2707,7 @@ CacheIRCompiler::emitMegamorphicLoadSlotByValueResult()
masm.bind(&ok);
masm.setFramePushed(framePushed);
masm.loadTypedOrValue(Address(MacroAssembler::getStackPointer(), 0), output);
masm.loadTypedOrValue(Address(masm.getStackPointer(), 0), output);
masm.adjustStack(sizeof(Value));
return true;
}
@ -2759,7 +2759,7 @@ CacheIRCompiler::emitMegamorphicHasPropResult()
masm.bind(&ok);
masm.setFramePushed(framePushed);
masm.loadTypedOrValue(Address(MacroAssembler::getStackPointer(), 0), output);
masm.loadTypedOrValue(Address(masm.getStackPointer(), 0), output);
masm.adjustStack(sizeof(Value));
return true;
}
@ -2805,7 +2805,7 @@ CacheIRCompiler::emitCallObjectHasSparseElementResult()
masm.bind(&ok);
masm.setFramePushed(framePushed);
masm.loadTypedOrValue(Address(MacroAssembler::getStackPointer(), 0), output);
masm.loadTypedOrValue(Address(masm.getStackPointer(), 0), output);
masm.adjustStack(sizeof(Value));
return true;
}

114
js/src/jit/CodeGenerator.cpp
View File

@ -1376,7 +1376,7 @@ RegExpPairsVectorStartOffset(size_t inputOutputDataStartOffset)
static Address
RegExpPairCountAddress(MacroAssembler& masm, size_t inputOutputDataStartOffset)
{
return Address(MacroAssembler::getStackPointer(), inputOutputDataStartOffset
return Address(masm.getStackPointer(), inputOutputDataStartOffset
+ sizeof(irregexp::InputOutputData)
+ MatchPairs::offsetOfPairCount());
}
@ -1396,24 +1396,24 @@ PrepareAndExecuteRegExp(JSContext* cx, MacroAssembler& masm, Register regexp, Re
size_t matchPairsStartOffset = inputOutputDataStartOffset + sizeof(irregexp::InputOutputData);
size_t pairsVectorStartOffset = RegExpPairsVectorStartOffset(inputOutputDataStartOffset);
Address inputStartAddress(MacroAssembler::getStackPointer(),
Address inputStartAddress(masm.getStackPointer(),
inputOutputDataStartOffset + offsetof(irregexp::InputOutputData, inputStart));
Address inputEndAddress(MacroAssembler::getStackPointer(),
Address inputEndAddress(masm.getStackPointer(),
inputOutputDataStartOffset + offsetof(irregexp::InputOutputData, inputEnd));
Address matchesPointerAddress(MacroAssembler::getStackPointer(),
Address matchesPointerAddress(masm.getStackPointer(),
inputOutputDataStartOffset + offsetof(irregexp::InputOutputData, matches));
Address startIndexAddress(MacroAssembler::getStackPointer(),
Address startIndexAddress(masm.getStackPointer(),
inputOutputDataStartOffset + offsetof(irregexp::InputOutputData, startIndex));
Address endIndexAddress(MacroAssembler::getStackPointer(),
Address endIndexAddress(masm.getStackPointer(),
inputOutputDataStartOffset + offsetof(irregexp::InputOutputData, endIndex));
Address matchResultAddress(MacroAssembler::getStackPointer(),
Address matchResultAddress(masm.getStackPointer(),
inputOutputDataStartOffset + offsetof(irregexp::InputOutputData, result));
Address pairCountAddress = RegExpPairCountAddress(masm, inputOutputDataStartOffset);
Address pairsPointerAddress(MacroAssembler::getStackPointer(),
Address pairsPointerAddress(masm.getStackPointer(),
matchPairsStartOffset + MatchPairs::offsetOfPairs());
Address pairsVectorAddress(MacroAssembler::getStackPointer(), pairsVectorStartOffset);
Address pairsVectorAddress(masm.getStackPointer(), pairsVectorStartOffset);
RegExpStatics* res = GlobalObject::getRegExpStatics(cx, cx->global());
if (!res)
@ -1525,7 +1525,7 @@ PrepareAndExecuteRegExp(JSContext* cx, MacroAssembler& masm, Register regexp, Re
// Finish filling in the InputOutputData instance on the stack.
if (mode == RegExpShared::Normal) {
masm.computeEffectiveAddress(Address(MacroAssembler::getStackPointer(), matchPairsStartOffset), temp2);
masm.computeEffectiveAddress(Address(masm.getStackPointer(), matchPairsStartOffset), temp2);
masm.storePtr(temp2, matchesPointerAddress);
} else {
// Use InputOutputData.endIndex itself for output.
@ -1554,7 +1554,7 @@ PrepareAndExecuteRegExp(JSContext* cx, MacroAssembler& masm, Register regexp, Re
#endif
// Execute the RegExp.
masm.computeEffectiveAddress(Address(MacroAssembler::getStackPointer(), inputOutputDataStartOffset), temp2);
masm.computeEffectiveAddress(Address(masm.getStackPointer(), inputOutputDataStartOffset), temp2);
masm.PushRegsInMask(volatileRegs);
masm.setupUnalignedABICall(temp3);
masm.passABIArg(temp2);
@ -1713,7 +1713,7 @@ CreateDependentString::generate(MacroAssembler& masm, const JSAtomState& names,
masm.push(base);
// Adjust the start index address for the above pushes.
MOZ_ASSERT(startIndexAddress.base == MacroAssembler::getStackPointer());
MOZ_ASSERT(startIndexAddress.base == masm.getStackPointer());
BaseIndex newStartIndexAddress = startIndexAddress;
newStartIndexAddress.offset += 2 * sizeof(void*);
@ -1966,15 +1966,15 @@ JitCompartment::generateRegExpMatcherStub(JSContext* cx)
masm.move32(Imm32(0), matchIndex);
size_t pairsVectorStartOffset = RegExpPairsVectorStartOffset(inputOutputDataStartOffset);
Address pairsVectorAddress(MacroAssembler::getStackPointer(), pairsVectorStartOffset);
Address pairsVectorAddress(masm.getStackPointer(), pairsVectorStartOffset);
Address pairCountAddress = RegExpPairCountAddress(masm, inputOutputDataStartOffset);
BaseIndex stringAddress(object, matchIndex, TimesEight, elementsOffset);
JS_STATIC_ASSERT(sizeof(MatchPair) == 8);
BaseIndex stringIndexAddress(MacroAssembler::getStackPointer(), matchIndex, TimesEight,
BaseIndex stringIndexAddress(masm.getStackPointer(), matchIndex, TimesEight,
pairsVectorStartOffset + offsetof(MatchPair, start));
BaseIndex stringLimitAddress(MacroAssembler::getStackPointer(), matchIndex, TimesEight,
BaseIndex stringLimitAddress(masm.getStackPointer(), matchIndex, TimesEight,
pairsVectorStartOffset + offsetof(MatchPair, limit));
// Loop to construct the match strings. There are two different loops,
@ -2150,7 +2150,7 @@ CodeGenerator::visitOutOfLineRegExpMatcher(OutOfLineRegExpMatcher* ool)
regs.take(regexp);
Register temp = regs.takeAny();
masm.computeEffectiveAddress(Address(MacroAssembler::getStackPointer(),
masm.computeEffectiveAddress(Address(masm.getStackPointer(),
sizeof(irregexp::InputOutputData)), temp);
pushArg(temp);
@ -2235,9 +2235,9 @@ JitCompartment::generateRegExpSearcherStub(JSContext* cx)
}
size_t pairsVectorStartOffset = RegExpPairsVectorStartOffset(inputOutputDataStartOffset);
Address stringIndexAddress(MacroAssembler::getStackPointer(),
Address stringIndexAddress(masm.getStackPointer(),
pairsVectorStartOffset + offsetof(MatchPair, start));
Address stringLimitAddress(MacroAssembler::getStackPointer(),
Address stringLimitAddress(masm.getStackPointer(),
pairsVectorStartOffset + offsetof(MatchPair, limit));
masm.load32(stringIndexAddress, result);
@ -2308,7 +2308,7 @@ CodeGenerator::visitOutOfLineRegExpSearcher(OutOfLineRegExpSearcher* ool)
regs.take(regexp);
Register temp = regs.takeAny();
masm.computeEffectiveAddress(Address(MacroAssembler::getStackPointer(),
masm.computeEffectiveAddress(Address(masm.getStackPointer(),
sizeof(irregexp::InputOutputData)), temp);
pushArg(temp);
@ -3161,7 +3161,7 @@ void
CodeGenerator::visitCallee(LCallee* lir)
{
Register callee = ToRegister(lir->output());
Address ptr(MacroAssembler::getStackPointer(), frameSize() + JitFrameLayout::offsetOfCalleeToken());
Address ptr(masm.getStackPointer(), frameSize() + JitFrameLayout::offsetOfCalleeToken());
masm.loadFunctionFromCalleeToken(ptr, callee);
}
@ -3170,7 +3170,7 @@ void
CodeGenerator::visitIsConstructing(LIsConstructing* lir)
{
Register output = ToRegister(lir->output());
Address calleeToken(MacroAssembler::getStackPointer(), frameSize() + JitFrameLayout::offsetOfCalleeToken());
Address calleeToken(masm.getStackPointer(), frameSize() + JitFrameLayout::offsetOfCalleeToken());
masm.loadPtr(calleeToken, output);
// We must be inside a function.
@ -3221,7 +3221,7 @@ CodeGenerator::visitOsrEntry(LOsrEntry* lir)
// If profiling, save the current frame pointer to a per-thread global field.
if (isProfilerInstrumentationEnabled())
masm.profilerEnterFrame(MacroAssembler::getStackPointer(), temp);
masm.profilerEnterFrame(masm.getStackPointer(), temp);
// Allocate the full frame for this function
// Note we have a new entry here. So we reset MacroAssembler::framePushed()
@ -3294,7 +3294,7 @@ CodeGenerator::visitStackArgT(LStackArgT* lir)
MOZ_ASSERT(argslot - 1u < graph.argumentSlotCount());
int32_t stack_offset = StackOffsetOfPassedArg(argslot);
Address dest(MacroAssembler::getStackPointer(), stack_offset);
Address dest(masm.getStackPointer(), stack_offset);
if (arg->isFloatReg())
masm.storeDouble(ToFloatRegister(arg), dest);
@ -3313,7 +3313,7 @@ CodeGenerator::visitStackArgV(LStackArgV* lir)
int32_t stack_offset = StackOffsetOfPassedArg(argslot);
masm.storeValue(val, Address(MacroAssembler::getStackPointer(), stack_offset));
masm.storeValue(val, Address(masm.getStackPointer(), stack_offset));
}
void
@ -4304,7 +4304,7 @@ CodeGenerator::visitCallNative(LCallNative* call)
masm.branchIfFalseBool(ReturnReg, masm.failureLabel());
// Load the outparam vp[0] into output register(s).
masm.loadValue(Address(MacroAssembler::getStackPointer(), NativeExitFrameLayout::offsetOfResult()), JSReturnOperand);
masm.loadValue(Address(masm.getStackPointer(), NativeExitFrameLayout::offsetOfResult()), JSReturnOperand);
// Until C++ code is instrumented against Spectre, prevent speculative
// execution from returning any private data.
@ -4392,7 +4392,7 @@ CodeGenerator::visitCallDOMNative(LCallDOMNative* call)
// &vp[1]
masm.adjustStack(unusedStack);
// argObj is filled with the extracted object, then returned.
Register obj = masm.extractObject(Address(MacroAssembler::getStackPointer(), 0), argObj);
Register obj = masm.extractObject(Address(masm.getStackPointer(), 0), argObj);
MOZ_ASSERT(obj == argObj);
// Push a Value containing the callee object: natives are allowed to access their callee before
@ -4405,7 +4405,7 @@ CodeGenerator::visitCallDOMNative(LCallDOMNative* call)
JS_STATIC_ASSERT(JSJitMethodCallArgsTraits::offsetOfArgv == 0);
JS_STATIC_ASSERT(JSJitMethodCallArgsTraits::offsetOfArgc ==
IonDOMMethodExitFrameLayoutTraits::offsetOfArgcFromArgv);
masm.computeEffectiveAddress(Address(MacroAssembler::getStackPointer(), 2 * sizeof(Value)), argArgs);
masm.computeEffectiveAddress(Address(masm.getStackPointer(), 2 * sizeof(Value)), argArgs);
LoadDOMPrivate(masm, obj, argPrivate, static_cast<MCallDOMNative*>(call->mir())->objectKind());
@ -4441,14 +4441,14 @@ CodeGenerator::visitCallDOMNative(LCallDOMNative* call)
CheckUnsafeCallWithABI::DontCheckHasExitFrame);
if (target->jitInfo()->isInfallible) {
masm.loadValue(Address(MacroAssembler::getStackPointer(), IonDOMMethodExitFrameLayout::offsetOfResult()),
masm.loadValue(Address(masm.getStackPointer(), IonDOMMethodExitFrameLayout::offsetOfResult()),
JSReturnOperand);
} else {
// Test for failure.
masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
// Load the outparam vp[0] into output register(s).
masm.loadValue(Address(MacroAssembler::getStackPointer(), IonDOMMethodExitFrameLayout::offsetOfResult()),
masm.loadValue(Address(masm.getStackPointer(), IonDOMMethodExitFrameLayout::offsetOfResult()),
JSReturnOperand);
}
@ -4490,7 +4490,7 @@ CodeGenerator::emitCallInvokeFunction(LInstruction* call, Register calleereg,
// Each path must account for framePushed_ separately, for callVM to be valid.
masm.freeStack(unusedStack);
pushArg(MacroAssembler::getStackPointer()); // argv.
pushArg(masm.getStackPointer()); // argv.
pushArg(Imm32(argc)); // argc.
pushArg(Imm32(ignoresReturnValue));
pushArg(Imm32(constructing)); // constructing.
@ -4587,7 +4587,7 @@ CodeGenerator::visitCallGeneric(LCallGeneric* call)
if (call->mir()->isConstructing()) {
Label notPrimitive;
masm.branchTestPrimitive(Assembler::NotEqual, JSReturnOperand, &notPrimitive);
masm.loadValue(Address(MacroAssembler::getStackPointer(), unusedStack), JSReturnOperand);
masm.loadValue(Address(masm.getStackPointer(), unusedStack), JSReturnOperand);
masm.bind(&notPrimitive);
}
}
@ -4603,7 +4603,7 @@ CodeGenerator::emitCallInvokeFunctionShuffleNewTarget(LCallKnown* call, Register
{
masm.freeStack(unusedStack);
pushArg(MacroAssembler::getStackPointer());
pushArg(masm.getStackPointer());
pushArg(Imm32(numFormals));
pushArg(Imm32(call->numActualArgs()));
pushArg(calleeReg);
@ -4691,7 +4691,7 @@ CodeGenerator::visitCallKnown(LCallKnown* call)
if (call->mir()->isConstructing()) {
Label notPrimitive;
masm.branchTestPrimitive(Assembler::NotEqual, JSReturnOperand, &notPrimitive);
masm.loadValue(Address(MacroAssembler::getStackPointer(), unusedStack), JSReturnOperand);
masm.loadValue(Address(masm.getStackPointer(), unusedStack), JSReturnOperand);
masm.bind(&notPrimitive);
}
}
@ -4753,7 +4753,7 @@ CodeGenerator::emitAllocateSpaceForApply(Register argcreg, Register extraStackSp
Label noPaddingNeeded;
// if the number of arguments is odd, then we do not need any padding.
masm.branchTestPtr(Assembler::NonZero, argcreg, Imm32(1), &noPaddingNeeded);
BaseValueIndex dstPtr(MacroAssembler::getStackPointer(), argcreg);
BaseValueIndex dstPtr(masm.getStackPointer(), argcreg);
masm.storeValue(MagicValue(JS_ARG_POISON), dstPtr);
masm.bind(&noPaddingNeeded);
}
@ -4775,14 +4775,14 @@ CodeGenerator::emitCopyValuesForApply(Register argvSrcBase, Register argvIndex,
// to loop back, we have to substract the size of the word which are
// copied.
BaseValueIndex srcPtr(argvSrcBase, argvIndex, argvSrcOffset - sizeof(void*));
BaseValueIndex dstPtr(MacroAssembler::getStackPointer(), argvIndex, argvDstOffset - sizeof(void*));
BaseValueIndex dstPtr(masm.getStackPointer(), argvIndex, argvDstOffset - sizeof(void*));
masm.loadPtr(srcPtr, copyreg);
masm.storePtr(copyreg, dstPtr);
// Handle 32 bits architectures.
if (sizeof(Value) == 2 * sizeof(void*)) {
BaseValueIndex srcPtrLow(argvSrcBase, argvIndex, argvSrcOffset - 2 * sizeof(void*));
BaseValueIndex dstPtrLow(MacroAssembler::getStackPointer(), argvIndex, argvDstOffset - 2 * sizeof(void*));
BaseValueIndex dstPtrLow(masm.getStackPointer(), argvIndex, argvDstOffset - 2 * sizeof(void*));
masm.loadPtr(srcPtrLow, copyreg);
masm.storePtr(copyreg, dstPtrLow);
}
@ -5000,7 +5000,7 @@ CodeGenerator::emitApplyGeneric(T* apply)
markSafepointAt(callOffset, apply);
// Recover the number of arguments from the frame descriptor.
masm.loadPtr(Address(MacroAssembler::getStackPointer(), 0), stackSpace);
masm.loadPtr(Address(masm.getStackPointer(), 0), stackSpace);
masm.rshiftPtr(Imm32(FRAMESIZE_SHIFT), stackSpace);
masm.subPtr(Imm32(pushed), stackSpace);
@ -5105,7 +5105,7 @@ CodeGenerator::visitGetDynamicName(LGetDynamicName* lir)
const ValueOperand out = ToOutValue(lir);
masm.loadValue(Address(MacroAssembler::getStackPointer(), 0), out);
masm.loadValue(Address(masm.getStackPointer(), 0), out);
masm.adjustStack(sizeof(Value));
Label undefined;
@ -5165,11 +5165,11 @@ CodeGenerator::generateArgumentsChecks(bool assert)
// ... * sizeof(Value) - Scale by value size.
// ArgToStackOffset(...) - Compute displacement within arg vector.
int32_t offset = ArgToStackOffset((i - info.startArgSlot()) * sizeof(Value));
Address argAddr(MacroAssembler::getStackPointer(), offset);
Address argAddr(masm.getStackPointer(), offset);
// guardObjectType will zero the stack pointer register on speculative
// paths.
Register spectreRegToZero = MacroAssembler::getStackPointer();
Register spectreRegToZero = masm.getStackPointer();
masm.guardTypeSet(argAddr, types, BarrierKind::TypeSet, temp1, temp2,
spectreRegToZero, &miss);
#else
@ -5197,7 +5197,7 @@ CodeGenerator::generateArgumentsChecks(bool assert)
continue;
Label skip;
Address addr(MacroAssembler::getStackPointer(), ArgToStackOffset((i - info.startArgSlot()) * sizeof(Value)));
Address addr(masm.getStackPointer(), ArgToStackOffset((i - info.startArgSlot()) * sizeof(Value)));
masm.branchTestObject(Assembler::NotEqual, addr, &skip);
Register obj = masm.extractObject(addr, temp1);
masm.guardTypeSetMightBeIncomplete(types, obj, temp1, &success);
@ -8433,7 +8433,7 @@ JitRuntime::generateInterpreterStub(MacroAssembler& masm)
// InvokeFromInterpreterStub stores the return value in argv[0], where the
// caller stored |this|.
masm.loadValue(Address(MacroAssembler::getStackPointer(), JitFrameLayout::offsetOfThis()),
masm.loadValue(Address(masm.getStackPointer(), JitFrameLayout::offsetOfThis()),
JSReturnOperand);
masm.ret();
}
@ -8655,8 +8655,8 @@ CodeGenerator::visitSinCos(LSinCos *lir)
masm.callWithABI(JS_FUNC_TO_DATA_PTR(void*, MAYBE_CACHED_(js::math_sincos)));
#undef MAYBE_CACHED_
masm.loadDouble(Address(MacroAssembler::getStackPointer(), 0), outputCos);
masm.loadDouble(Address(MacroAssembler::getStackPointer(), sizeof(double)), outputSin);
masm.loadDouble(Address(masm.getStackPointer(), 0), outputCos);
masm.loadDouble(Address(masm.getStackPointer(), sizeof(double)), outputSin);
masm.freeStack(sizeof(double) * 2);
}
@ -9704,7 +9704,7 @@ CodeGenerator::visitArgumentsLength(LArgumentsLength* lir)
{
// read number of actual arguments from the JS frame.
Register argc = ToRegister(lir->output());
Address ptr(MacroAssembler::getStackPointer(), frameSize() + JitFrameLayout::offsetOfNumActualArgs());
Address ptr(masm.getStackPointer(), frameSize() + JitFrameLayout::offsetOfNumActualArgs());
masm.loadPtr(ptr, argc);
}
@ -9718,11 +9718,11 @@ CodeGenerator::visitGetFrameArgument(LGetFrameArgument* lir)
if (index->isConstant()) {
int32_t i = index->toConstant()->toInt32();
Address argPtr(MacroAssembler::getStackPointer(), sizeof(Value) * i + argvOffset);
Address argPtr(masm.getStackPointer(), sizeof(Value) * i + argvOffset);
masm.loadValue(argPtr, result);
} else {
Register i = ToRegister(index);
BaseValueIndex argPtr(MacroAssembler::getStackPointer(), i, argvOffset);
BaseValueIndex argPtr(masm.getStackPointer(), i, argvOffset);
masm.loadValue(argPtr, result);
}
}
@ -9738,11 +9738,11 @@ CodeGenerator::visitSetFrameArgumentT(LSetFrameArgumentT* lir)
if (type == MIRType::Double) {
// Store doubles directly.
FloatRegister input = ToFloatRegister(lir->input());
masm.storeDouble(input, Address(MacroAssembler::getStackPointer(), argOffset));
masm.storeDouble(input, Address(masm.getStackPointer(), argOffset));
} else {
Register input = ToRegister(lir->input());
masm.storeValue(ValueTypeFromMIRType(type), input, Address(MacroAssembler::getStackPointer(), argOffset));
masm.storeValue(ValueTypeFromMIRType(type), input, Address(masm.getStackPointer(), argOffset));
}
}
@ -9751,7 +9751,7 @@ CodeGenerator:: visitSetFrameArgumentC(LSetFrameArgumentC* lir)
{
size_t argOffset = frameSize() + JitFrameLayout::offsetOfActualArgs() +
(sizeof(Value) * lir->mir()->argno());
masm.storeValue(lir->val(), Address(MacroAssembler::getStackPointer(), argOffset));
masm.storeValue(lir->val(), Address(masm.getStackPointer(), argOffset));
}
void
@ -9760,7 +9760,7 @@ CodeGenerator:: visitSetFrameArgumentV(LSetFrameArgumentV* lir)
const ValueOperand val = ToValue(lir, LSetFrameArgumentV::Input);
size_t argOffset = frameSize() + JitFrameLayout::offsetOfActualArgs() +
(sizeof(Value) * lir->mir()->argno());
masm.storeValue(val, Address(MacroAssembler::getStackPointer(), argOffset));
masm.storeValue(val, Address(masm.getStackPointer(), argOffset));
}
typedef bool (*RunOnceScriptPrologueFn)(JSContext*, HandleScript);
@ -12007,12 +12007,12 @@ CodeGenerator::visitGetDOMProperty(LGetDOMProperty* ins)
CheckUnsafeCallWithABI::DontCheckHasExitFrame);
if (ins->mir()->isInfallible()) {
masm.loadValue(Address(MacroAssembler::getStackPointer(), IonDOMExitFrameLayout::offsetOfResult()),
masm.loadValue(Address(masm.getStackPointer(), IonDOMExitFrameLayout::offsetOfResult()),
JSReturnOperand);
} else {
masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
masm.loadValue(Address(MacroAssembler::getStackPointer(), IonDOMExitFrameLayout::offsetOfResult()),
masm.loadValue(Address(masm.getStackPointer(), IonDOMExitFrameLayout::offsetOfResult()),
JSReturnOperand);
}
@ -12864,13 +12864,13 @@ CodeGenerator::visitNewTarget(LNewTarget *ins)
// if (isConstructing) output = argv[Max(numActualArgs, numFormalArgs)]
Label notConstructing, done;
Address calleeToken(MacroAssembler::getStackPointer(), frameSize() + JitFrameLayout::offsetOfCalleeToken());
Address calleeToken(masm.getStackPointer(), frameSize() + JitFrameLayout::offsetOfCalleeToken());
masm.branchTestPtr(Assembler::Zero, calleeToken,
Imm32(CalleeToken_FunctionConstructing), &notConstructing);
Register argvLen = output.scratchReg();
Address actualArgsPtr(MacroAssembler::getStackPointer(), frameSize() + JitFrameLayout::offsetOfNumActualArgs());
Address actualArgsPtr(masm.getStackPointer(), frameSize() + JitFrameLayout::offsetOfNumActualArgs());
masm.loadPtr(actualArgsPtr, argvLen);
Label useNFormals;
@ -12881,7 +12881,7 @@ CodeGenerator::visitNewTarget(LNewTarget *ins)
size_t argsOffset = frameSize() + JitFrameLayout::offsetOfActualArgs();
{
BaseValueIndex newTarget(MacroAssembler::getStackPointer(), argvLen, argsOffset);
BaseValueIndex newTarget(masm.getStackPointer(), argvLen, argsOffset);
masm.loadValue(newTarget, output);
masm.jump(&done);
}
@ -12889,7 +12889,7 @@ CodeGenerator::visitNewTarget(LNewTarget *ins)
masm.bind(&useNFormals);
{
Address newTarget(MacroAssembler::getStackPointer(), argsOffset + (numFormalArgs * sizeof(Value)));
Address newTarget(masm.getStackPointer(), argsOffset + (numFormalArgs * sizeof(Value)));
masm.loadValue(newTarget, output);
masm.jump(&done);
}

14
js/src/jit/IonCacheIRCompiler.cpp
View File

@ -263,13 +263,13 @@ CacheRegisterAllocator::saveIonLiveRegisters(MacroAssembler& masm, LiveRegisterS
// Push the operand below the live register space.
if (loc.kind() == OperandLocation::PayloadStack) {
masm.push(Address(MacroAssembler::getStackPointer(), stackPushed_ - operandStackPushed));
masm.push(Address(masm.getStackPointer(), stackPushed_ - operandStackPushed));
stackPushed_ += operandSize;
loc.setPayloadStack(stackPushed_, loc.payloadType());
continue;
}
MOZ_ASSERT(loc.kind() == OperandLocation::ValueStack);
masm.pushValue(Address(MacroAssembler::getStackPointer(), stackPushed_ - operandStackPushed));
masm.pushValue(Address(masm.getStackPointer(), stackPushed_ - operandStackPushed));
stackPushed_ += operandSize;
loc.setValueStack(stackPushed_);
}
@ -288,7 +288,7 @@ CacheRegisterAllocator::saveIonLiveRegisters(MacroAssembler& masm, LiveRegisterS
}
size_t stackBottom = stackPushed_ + sizeOfLiveRegsInBytes;
masm.storeRegsInMask(liveRegs, Address(MacroAssembler::getStackPointer(), stackBottom), scratch);
masm.storeRegsInMask(liveRegs, Address(masm.getStackPointer(), stackBottom), scratch);
masm.setFramePushed(masm.framePushed() + sizeOfLiveRegsInBytes);
} else {
// If no operands are on the stack, discard the unused stack space.
@ -997,7 +997,7 @@ IonCacheIRCompiler::emitMegamorphicLoadSlotResult()
masm.mov(ReturnReg, scratch2);
masm.PopRegsInMask(volatileRegs);
masm.loadTypedOrValue(Address(MacroAssembler::getStackPointer(), 0), output);
masm.loadTypedOrValue(Address(masm.getStackPointer(), 0), output);
masm.adjustStack(sizeof(Value));
masm.branchIfFalseBool(scratch2, failure->label());
@ -1042,7 +1042,7 @@ IonCacheIRCompiler::emitMegamorphicStoreSlot()
masm.mov(ReturnReg, scratch1);
masm.PopRegsInMask(volatileRegs);
masm.loadValue(Address(MacroAssembler::getStackPointer(), 0), val);
masm.loadValue(Address(masm.getStackPointer(), 0), val);
masm.adjustStack(sizeof(Value));
masm.branchIfFalseBool(scratch1, failure->label());
@ -1191,7 +1191,7 @@ IonCacheIRCompiler::emitCallNativeGetterResult()
masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
// Load the outparam vp[0] into output register(s).
Address outparam(MacroAssembler::getStackPointer(), IonOOLNativeExitFrameLayout::offsetOfResult());
Address outparam(masm.getStackPointer(), IonOOLNativeExitFrameLayout::offsetOfResult());
masm.loadValue(outparam, output.valueReg());
masm.adjustStack(IonOOLNativeExitFrameLayout::Size(0));
@ -1250,7 +1250,7 @@ IonCacheIRCompiler::emitCallProxyGetResult()
masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
// Load the outparam vp[0] into output register(s).
Address outparam(MacroAssembler::getStackPointer(), IonOOLProxyExitFrameLayout::offsetOfResult());
Address outparam(masm.getStackPointer(), IonOOLProxyExitFrameLayout::offsetOfResult());
masm.loadValue(outparam, output.valueReg());
// masm.leaveExitFrame & pop locals

4
js/src/jit/MoveResolver.cpp
View File

@ -35,10 +35,10 @@ MoveOperand::MoveOperand(MacroAssembler& masm, const ABIArg& arg)
break;
case ABIArg::Stack:
kind_ = MEMORY;
if (IsHiddenSP(MacroAssembler::getStackPointer()))
if (IsHiddenSP(masm.getStackPointer()))
MOZ_CRASH("Hidden SP cannot be represented as register code on this platform");
else
code_ = AsRegister(MacroAssembler::getStackPointer()).code();
code_ = AsRegister(masm.getStackPointer()).code();
disp_ = arg.offsetFromArgBase();
break;
case ABIArg::Uninitialized:

2
js/src/jit/shared/CodeGenerator-shared-inl.h
View File

@ -286,7 +286,7 @@ Address
CodeGeneratorShared::ToAddress(const LAllocation& a)
{
MOZ_ASSERT(a.isMemory());
return Address(MacroAssembler::getStackPointer(), ToStackOffset(&a));
return Address(masm.getStackPointer(), ToStackOffset(&a));
}
Address

2
js/src/jit/shared/CodeGenerator-shared.cpp
View File

@ -122,7 +122,7 @@ CodeGeneratorShared::generatePrologue()
// If profiling, save the current frame pointer to a per-thread global field.
if (isProfilerInstrumentationEnabled())
masm.profilerEnterFrame(MacroAssembler::getStackPointer(), CallTempReg0);
masm.profilerEnterFrame(masm.getStackPointer(), CallTempReg0);
// Ensure that the Ion frame is properly aligned.
masm.assertStackAlignment(JitStackAlignment, 0);

2
js/src/jit/x64/CodeGenerator-x64.cpp
View File

@ -43,7 +43,7 @@ CodeGeneratorX64::ToOperand64(const LInt64Allocation& a64)
MOZ_ASSERT(!a.isFloatReg());
if (a.isGeneralReg())
return Operand(a.toGeneralReg()->reg());
return Operand(MacroAssembler::getStackPointer(), ToStackOffset(a));
return Operand(masm.getStackPointer(), ToStackOffset(a));
}
FrameSizeClass

2
js/src/jit/x86-shared/CodeGenerator-x86-shared.cpp
View File

@ -1793,7 +1793,7 @@ CodeGeneratorX86Shared::ToOperand(const LAllocation& a)
return Operand(a.toGeneralReg()->reg());
if (a.isFloatReg())
return Operand(a.toFloatReg()->reg());
return Operand(MacroAssembler::getStackPointer(), ToStackOffset(&a));
return Operand(masm.getStackPointer(), ToStackOffset(&a));
}
Operand

2
js/src/jsnum.cpp
View File

@ -1303,7 +1303,7 @@ FracNumberToCString(JSContext* cx, ToCStringBuf* cbuf, double d, int base = 10)
*/
const double_conversion::DoubleToStringConverter& converter
= double_conversion::DoubleToStringConverter::EcmaScriptConverter();
double_conversion::StringBuilder builder(cbuf->sbuf, js::ToCStringBuf::sbufSize);
double_conversion::StringBuilder builder(cbuf->sbuf, cbuf->sbufSize);
converter.ToShortest(d, &builder);
numStr = builder.Finalize();
} else {

2
js/src/perf/jsperf.cpp
View File

@ -94,7 +94,7 @@ pm_canMeasureSomething(JSContext* cx, unsigned argc, Value* vp)
if (!p)
return false;
args.rval().setBoolean(PerfMeasurement::canMeasureSomething());
args.rval().setBoolean(p->canMeasureSomething());
return true;
}

4
js/src/vm/Runtime.cpp
View File

@ -594,10 +594,10 @@ JSContext::requestInterrupt(InterruptMode mode)
// not regularly polled. Wake ilooping Ion code, irregexp JIT code and
// Atomics.wait()
interruptRegExpJit_ = true;
FutexThread::lock();
fx.lock();
if (fx.isWaiting())
fx.wake(FutexThread::WakeForJSInterrupt);
FutexThread::unlock();
fx.unlock();
InterruptRunningJitCode(this);
}
}

2
js/src/vm/TypedArrayObject.h
View File

@ -156,7 +156,7 @@ class TypedArrayObject : public NativeObject
bool hasInlineElements() const;
void setInlineElements();
uint8_t* elementsRaw() const {
return *(uint8_t **)((((char *)this) + js::TypedArrayObject::dataOffset()));
return *(uint8_t **)((((char *)this) + this->dataOffset()));
}
uint8_t* elements() const {
assertZeroLengthArrayData();

18
js/src/wasm/WasmBaselineCompile.cpp
View File

@ -1133,7 +1133,7 @@ class BaseStackFrame
#endif
maxFramePushed_(0),
stackAddOffset_(0),
sp_(MacroAssembler::getStackPointer())
sp_(masm.getStackPointer())
{}
//////////////////////////////////////////////////////////////////////
@ -3175,9 +3175,9 @@ class BaseCompiler final : public BaseCompilerInterface
// Initialize funcIndex and flag fields of DebugFrame.
size_t debugFrame = masm.framePushed() - DebugFrame::offsetOfFrame();
masm.store32(Imm32(func_.index),
Address(MacroAssembler::getStackPointer(), debugFrame + DebugFrame::offsetOfFuncIndex()));
Address(masm.getStackPointer(), debugFrame + DebugFrame::offsetOfFuncIndex()));
masm.storePtr(ImmWord(0),
Address(MacroAssembler::getStackPointer(), debugFrame + DebugFrame::offsetOfFlagsWord()));
Address(masm.getStackPointer(), debugFrame + DebugFrame::offsetOfFlagsWord()));
}
fr.allocStack(ABINonArgReg0, trapOffset);
@ -3219,7 +3219,7 @@ class BaseCompiler final : public BaseCompilerInterface
void saveResult() {
MOZ_ASSERT(debugEnabled_);
size_t debugFrameOffset = masm.framePushed() - DebugFrame::offsetOfFrame();
Address resultsAddress(MacroAssembler::getStackPointer(), debugFrameOffset + DebugFrame::offsetOfResults());
Address resultsAddress(masm.getStackPointer(), debugFrameOffset + DebugFrame::offsetOfResults());
switch (sig().ret()) {
case ExprType::Void:
break;
@ -3243,7 +3243,7 @@ class BaseCompiler final : public BaseCompilerInterface
void restoreResult() {
MOZ_ASSERT(debugEnabled_);
size_t debugFrameOffset = masm.framePushed() - DebugFrame::offsetOfFrame();
Address resultsAddress(MacroAssembler::getStackPointer(), debugFrameOffset + DebugFrame::offsetOfResults());
Address resultsAddress(masm.getStackPointer(), debugFrameOffset + DebugFrame::offsetOfResults());
switch (sig().ret()) {
case ExprType::Void:
break;
@ -3437,7 +3437,7 @@ class BaseCompiler final : public BaseCompilerInterface
if (argLoc.kind() == ABIArg::Stack) {
ScratchI32 scratch(*this);
loadI32(arg, scratch);
masm.store32(scratch, Address(MacroAssembler::getStackPointer(), argLoc.offsetFromArgBase()));
masm.store32(scratch, Address(masm.getStackPointer(), argLoc.offsetFromArgBase()));
} else {
loadI32(arg, RegI32(argLoc.gpr()));
}
@ -3449,7 +3449,7 @@ class BaseCompiler final : public BaseCompilerInterface
ScratchI32 scratch(*this);
#ifdef JS_PUNBOX64
loadI64(arg, fromI32(scratch));
masm.storePtr(scratch, Address(MacroAssembler::getStackPointer(), argLoc.offsetFromArgBase()));
masm.storePtr(scratch, Address(masm.getStackPointer(), argLoc.offsetFromArgBase()));
#else
loadI64Low(arg, scratch);
masm.store32(scratch, LowWord(Address(masm.getStackPointer(), argLoc.offsetFromArgBase())));
@ -3467,7 +3467,7 @@ class BaseCompiler final : public BaseCompilerInterface
case ABIArg::Stack: {
ScratchF64 scratch(*this);
loadF64(arg, scratch);
masm.storeDouble(scratch, Address(MacroAssembler::getStackPointer(), argLoc.offsetFromArgBase()));
masm.storeDouble(scratch, Address(masm.getStackPointer(), argLoc.offsetFromArgBase()));
break;
}
#if defined(JS_CODEGEN_REGISTER_PAIR)
@ -3507,7 +3507,7 @@ class BaseCompiler final : public BaseCompilerInterface
case ABIArg::Stack: {
ScratchF32 scratch(*this);
loadF32(arg, scratch);
masm.storeFloat32(scratch, Address(MacroAssembler::getStackPointer(), argLoc.offsetFromArgBase()));
masm.storeFloat32(scratch, Address(masm.getStackPointer(), argLoc.offsetFromArgBase()));
break;
}
case ABIArg::GPR: {

65
js/src/wasm/WasmStubs.cpp
View File

@ -134,10 +134,10 @@ SetupABIArguments(MacroAssembler& masm, const FuncExport& fe, Register argv, Reg
switch (type) {
case MIRType::Int32:
masm.load32(src, scratch);
masm.storePtr(scratch, Address(MacroAssembler::getStackPointer(), iter->offsetFromArgBase()));
masm.storePtr(scratch, Address(masm.getStackPointer(), iter->offsetFromArgBase()));
break;
case MIRType::Int64: {
RegisterOrSP sp = MacroAssembler::getStackPointer();
RegisterOrSP sp = masm.getStackPointer();
#if JS_BITS_PER_WORD == 32
masm.load32(LowWord(src), scratch);
masm.store32(scratch, LowWord(Address(sp, iter->offsetFromArgBase())));
@ -153,12 +153,12 @@ SetupABIArguments(MacroAssembler& masm, const FuncExport& fe, Register argv, Reg
case MIRType::Double:
masm.loadDouble(src, ScratchDoubleReg);
masm.storeDouble(ScratchDoubleReg,
Address(MacroAssembler::getStackPointer(), iter->offsetFromArgBase()));
Address(masm.getStackPointer(), iter->offsetFromArgBase()));
break;
case MIRType::Float32:
masm.loadFloat32(src, ScratchFloat32Reg);
masm.storeFloat32(ScratchFloat32Reg,
Address(MacroAssembler::getStackPointer(), iter->offsetFromArgBase()));
Address(masm.getStackPointer(), iter->offsetFromArgBase()));
break;
case MIRType::Int8x16:
case MIRType::Int16x8:
@ -168,12 +168,12 @@ SetupABIArguments(MacroAssembler& masm, const FuncExport& fe, Register argv, Reg
case MIRType::Bool32x4:
masm.loadUnalignedSimd128Int(src, ScratchSimd128Reg);
masm.storeAlignedSimd128Int(
ScratchSimd128Reg, Address(MacroAssembler::getStackPointer(), iter->offsetFromArgBase()));
ScratchSimd128Reg, Address(masm.getStackPointer(), iter->offsetFromArgBase()));
break;
case MIRType::Float32x4:
masm.loadUnalignedSimd128Float(src, ScratchSimd128Reg);
masm.storeAlignedSimd128Float(
ScratchSimd128Reg, Address(MacroAssembler::getStackPointer(), iter->offsetFromArgBase()));
ScratchSimd128Reg, Address(masm.getStackPointer(), iter->offsetFromArgBase()));
break;
default:
MOZ_MAKE_COMPILER_ASSUME_IS_UNREACHABLE("unexpected stack arg type");
@ -363,14 +363,14 @@ GenerateInterpEntry(MacroAssembler& masm, const FuncExport& fe, const Maybe<ImmP
if (arg.kind() == ABIArg::GPR)
masm.movePtr(arg.gpr(), argv);
else
masm.loadPtr(Address(MacroAssembler::getStackPointer(), argBase + arg.offsetFromArgBase()), argv);
masm.loadPtr(Address(masm.getStackPointer(), argBase + arg.offsetFromArgBase()), argv);
// Arg 2: TlsData*
arg = abi.next(MIRType::Pointer);
if (arg.kind() == ABIArg::GPR)
masm.movePtr(arg.gpr(), WasmTlsReg);
else
masm.loadPtr(Address(MacroAssembler::getStackPointer(), argBase + arg.offsetFromArgBase()), WasmTlsReg);
masm.loadPtr(Address(masm.getStackPointer(), argBase + arg.offsetFromArgBase()), WasmTlsReg);
// Save 'argv' on the stack so that we can recover it after the call.
WasmPush(masm, argv);
@ -486,7 +486,7 @@ GenerateJitEntryLoadTls(MacroAssembler& masm, unsigned frameSize)
// ScratchIonEntry := callee => JSFunction*
unsigned offset = frameSize + JitFrameLayout::offsetOfCalleeToken();
masm.loadFunctionFromCalleeToken(Address(MacroAssembler::getStackPointer(), offset), ScratchIonEntry);
masm.loadFunctionFromCalleeToken(Address(masm.getStackPointer(), offset), ScratchIonEntry);
// ScratchValIonEntry := callee->getExtendedSlot(WASM_TLSDATA_SLOT)
// => Private(TlsData*)
@ -532,7 +532,8 @@ GenerateJitEntry(MacroAssembler& masm, size_t funcExportIndex, const FuncExport&
const Maybe<ImmPtr>& funcPtr, Offsets* offsets)
{
AssertExpectedSP(masm);
RegisterOrSP sp = MacroAssembler::getStackPointer();
RegisterOrSP sp = masm.getStackPointer();
GenerateJitEntryPrologue(masm, offsets);
@ -862,7 +863,7 @@ FillArgumentArray(MacroAssembler& masm, const ValTypeVector& args, unsigned argO
unsigned offsetToCallerStackArgs, Register scratch, ToValue toValue)
{
for (ABIArgValTypeIter i(args); !i.done(); i++) {
Address dst(MacroAssembler::getStackPointer(), argOffset + i.index() * sizeof(Value));
Address dst(masm.getStackPointer(), argOffset + i.index() * sizeof(Value));
MIRType type = i.mirType();
switch (i->kind()) {
@ -918,7 +919,7 @@ FillArgumentArray(MacroAssembler& masm, const ValTypeVector& args, unsigned argO
break;
}
case ABIArg::Stack: {
Address src(MacroAssembler::getStackPointer(), offsetToCallerStackArgs + i->offsetFromArgBase());
Address src(masm.getStackPointer(), offsetToCallerStackArgs + i->offsetFromArgBase());
if (toValue) {
if (type == MIRType::Int32) {
masm.load32(src, scratch);
@ -977,8 +978,8 @@ GenerateImportFunction(jit::MacroAssembler& masm, const FuncImport& fi, SigIdDes
if (i->kind() != ABIArg::Stack)
continue;
Address src(jit::MacroAssembler::getStackPointer(), offsetToCallerStackArgs + i->offsetFromArgBase());
Address dst(jit::MacroAssembler::getStackPointer(), i->offsetFromArgBase());
Address src(masm.getStackPointer(), offsetToCallerStackArgs + i->offsetFromArgBase());
Address dst(masm.getStackPointer(), i->offsetFromArgBase());
StackCopy(masm, i.mirType(), scratch, src, dst);
}
@ -1067,7 +1068,7 @@ GenerateImportInterpExit(MacroAssembler& masm, const FuncImport& fi, uint32_t fu
masm.loadPtr(instancePtr, i->gpr());
} else {
masm.loadPtr(instancePtr, scratch);
masm.storePtr(scratch, Address(MacroAssembler::getStackPointer(), i->offsetFromArgBase()));
masm.storePtr(scratch, Address(masm.getStackPointer(), i->offsetFromArgBase()));
}
i++;
@ -1075,7 +1076,7 @@ GenerateImportInterpExit(MacroAssembler& masm, const FuncImport& fi, uint32_t fu
if (i->kind() == ABIArg::GPR)
masm.mov(ImmWord(funcImportIndex), i->gpr());
else
masm.store32(Imm32(funcImportIndex), Address(MacroAssembler::getStackPointer(), i->offsetFromArgBase()));
masm.store32(Imm32(funcImportIndex), Address(masm.getStackPointer(), i->offsetFromArgBase()));
i++;
// argument 2: argc
@ -1083,16 +1084,16 @@ GenerateImportInterpExit(MacroAssembler& masm, const FuncImport& fi, uint32_t fu
if (i->kind() == ABIArg::GPR)
masm.mov(ImmWord(argc), i->gpr());
else
masm.store32(Imm32(argc), Address(MacroAssembler::getStackPointer(), i->offsetFromArgBase()));
masm.store32(Imm32(argc), Address(masm.getStackPointer(), i->offsetFromArgBase()));
i++;
// argument 3: argv
Address argv(MacroAssembler::getStackPointer(), argOffset);
Address argv(masm.getStackPointer(), argOffset);
if (i->kind() == ABIArg::GPR) {
masm.computeEffectiveAddress(argv, i->gpr());
} else {
masm.computeEffectiveAddress(argv, scratch);
masm.storePtr(scratch, Address(MacroAssembler::getStackPointer(), i->offsetFromArgBase()));
masm.storePtr(scratch, Address(masm.getStackPointer(), i->offsetFromArgBase()));
}
i++;
MOZ_ASSERT(i.done());
@ -1188,7 +1189,7 @@ GenerateImportJitExit(MacroAssembler& masm, const FuncImport& fi, Label* throwLa
size_t argOffset = frameAlignExtra;
uint32_t descriptor = MakeFrameDescriptor(sizeOfThisAndArgsAndPadding, JitFrame_WasmToJSJit,
WasmToJSJitFrameLayout::Size());
masm.storePtr(ImmWord(uintptr_t(descriptor)), Address(MacroAssembler::getStackPointer(), argOffset));
masm.storePtr(ImmWord(uintptr_t(descriptor)), Address(masm.getStackPointer(), argOffset));
argOffset += sizeof(size_t);
// 2. Callee
@ -1199,17 +1200,17 @@ GenerateImportJitExit(MacroAssembler& masm, const FuncImport& fi, Label* throwLa
masm.loadWasmGlobalPtr(fi.tlsDataOffset() + offsetof(FuncImportTls, obj), callee);
// 2.2. Save callee
masm.storePtr(callee, Address(MacroAssembler::getStackPointer(), argOffset));
masm.storePtr(callee, Address(masm.getStackPointer(), argOffset));
argOffset += sizeof(size_t);
// 3. Argc
unsigned argc = fi.sig().args().length();
masm.storePtr(ImmWord(uintptr_t(argc)), Address(MacroAssembler::getStackPointer(), argOffset));
masm.storePtr(ImmWord(uintptr_t(argc)), Address(masm.getStackPointer(), argOffset));
argOffset += sizeof(size_t);
MOZ_ASSERT(argOffset == sizeOfPreFrame + frameAlignExtra);
// 4. |this| value
masm.storeValue(UndefinedValue(), Address(MacroAssembler::getStackPointer(), argOffset));
masm.storeValue(UndefinedValue(), Address(masm.getStackPointer(), argOffset));
argOffset += sizeof(Value);
// 5. Fill the arguments
@ -1339,7 +1340,7 @@ GenerateImportJitExit(MacroAssembler& masm, const FuncImport& fi, Label* throwLa
AssertStackAlignment(masm, ABIStackAlignment);
// Store return value into argv[0]
masm.storeValue(JSReturnOperand, Address(MacroAssembler::getStackPointer(), offsetToCoerceArgv));
masm.storeValue(JSReturnOperand, Address(masm.getStackPointer(), offsetToCoerceArgv));
// From this point, it's safe to reuse the scratch register (which
// might be part of the JSReturnOperand).
@ -1351,12 +1352,12 @@ GenerateImportJitExit(MacroAssembler& masm, const FuncImport& fi, Label* throwLa
// argument 0: argv
ABIArgMIRTypeIter i(coerceArgTypes);
Address argv(MacroAssembler::getStackPointer(), offsetToCoerceArgv);
Address argv(masm.getStackPointer(), offsetToCoerceArgv);
if (i->kind() == ABIArg::GPR) {
masm.computeEffectiveAddress(argv, i->gpr());
} else {
masm.computeEffectiveAddress(argv, scratch);
masm.storePtr(scratch, Address(MacroAssembler::getStackPointer(), i->offsetFromArgBase()));
masm.storePtr(scratch, Address(masm.getStackPointer(), i->offsetFromArgBase()));
}
i++;
MOZ_ASSERT(i.done());
@ -1368,13 +1369,13 @@ GenerateImportJitExit(MacroAssembler& masm, const FuncImport& fi, Label* throwLa
case ExprType::I32:
masm.call(SymbolicAddress::CoerceInPlace_ToInt32);
masm.branchTest32(Assembler::Zero, ReturnReg, ReturnReg, throwLabel);
masm.unboxInt32(Address(MacroAssembler::getStackPointer(), offsetToCoerceArgv), ReturnReg);
masm.unboxInt32(Address(masm.getStackPointer(), offsetToCoerceArgv), ReturnReg);
break;
case ExprType::F64:
case ExprType::F32:
masm.call(SymbolicAddress::CoerceInPlace_ToNumber);
masm.branchTest32(Assembler::Zero, ReturnReg, ReturnReg, throwLabel);
masm.loadDouble(Address(MacroAssembler::getStackPointer(), offsetToCoerceArgv), ReturnDoubleReg);
masm.loadDouble(Address(masm.getStackPointer(), offsetToCoerceArgv), ReturnDoubleReg);
if (fi.sig().ret() == ExprType::F32)
masm.convertDoubleToFloat32(ReturnDoubleReg, ReturnFloat32Reg);
break;
@ -1454,8 +1455,8 @@ wasm::GenerateBuiltinThunk(MacroAssembler& masm, ABIFunctionType abiType, ExitRe
continue;
}
Address src(MacroAssembler::getStackPointer(), offsetToCallerStackArgs + i->offsetFromArgBase());
Address dst(MacroAssembler::getStackPointer(), i->offsetFromArgBase());
Address src(masm.getStackPointer(), offsetToCallerStackArgs + i->offsetFromArgBase());
Address dst(masm.getStackPointer(), i->offsetFromArgBase());
StackCopy(masm, i.mirType(), scratch, src, dst);
}
@ -1532,7 +1533,7 @@ GenerateOldTrapExit(MacroAssembler& masm, Trap trap, Label* throwLabel, Callable
if (i->kind() == ABIArg::GPR)
masm.move32(Imm32(int32_t(trap)), i->gpr());
else
masm.store32(Imm32(int32_t(trap)), Address(MacroAssembler::getStackPointer(), i->offsetFromArgBase()));
masm.store32(Imm32(int32_t(trap)), Address(masm.getStackPointer(), i->offsetFromArgBase()));
i++;
MOZ_ASSERT(i.done());
@ -1901,7 +1902,7 @@ GenerateDebugTrapStub(MacroAssembler& masm, Label* throwLabel, CallableOffsets*
masm.moveStackPtrTo(scratch);
masm.subFromStackPtr(Imm32(sizeof(intptr_t)));
masm.andToStackPtr(Imm32(~(ABIStackAlignment - 1)));
masm.storePtr(scratch, Address(MacroAssembler::getStackPointer(), 0));
masm.storePtr(scratch, Address(masm.getStackPointer(), 0));
#endif
if (ShadowStackSpace)

2
js/xpconnect/loader/URLPreloader.h
View File

@ -126,7 +126,7 @@ protected:
MonitorAutoLock mal(reader.mMonitor);
while (!reader.mReaderInitialized && URLPreloader::sInitialized) {
while (!reader.mReaderInitialized && reader.sInitialized) {
mal.Wait();
}
}

2
js/xpconnect/wrappers/XrayWrapper.cpp
View File

@ -958,7 +958,7 @@ JSXrayTraits::construct(JSContext* cx, HandleObject wrapper,
if (!holder)
return false;
if (xpc::JSXrayTraits::getProtoKey(holder) == JSProto_Function) {
if (self.getProtoKey(holder) == JSProto_Function) {
JSProtoKey standardConstructor = constructorFor(holder);
if (standardConstructor == JSProto_Null)
return baseInstance.construct(cx, wrapper, args);

2
js/xpconnect/wrappers/XrayWrapper.h
View File

@ -278,7 +278,7 @@ public:
{
JSXrayTraits& self = JSXrayTraits::singleton;
JS::RootedObject holder(cx, self.ensureHolder(cx, wrapper));
if (xpc::JSXrayTraits::getProtoKey(holder) == JSProto_Function)
if (self.getProtoKey(holder) == JSProto_Function)
return baseInstance.call(cx, wrapper, args);
JS::RootedValue v(cx, JS::ObjectValue(*wrapper));

30
layout/base/AccessibleCaretEventHub.cpp
View File

@ -51,10 +51,10 @@ public:
nsEventStatus rv = nsEventStatus_eIgnore;
if (NS_SUCCEEDED(aContext->mManager->PressCaret(aPoint, aEventClass))) {
aContext->SetState(AccessibleCaretEventHub::PressCaretState());
aContext->SetState(aContext->PressCaretState());
rv = nsEventStatus_eConsumeNoDefault;
} else {
aContext->SetState(AccessibleCaretEventHub::PressNoCaretState());
aContext->SetState(aContext->PressNoCaretState());
}
aContext->mPressPoint = aPoint;
@ -66,7 +66,7 @@ public:
void OnScrollStart(AccessibleCaretEventHub* aContext) override
{
aContext->mManager->OnScrollStart();
aContext->SetState(AccessibleCaretEventHub::ScrollState());
aContext->SetState(aContext->ScrollState());
}
void OnScrollPositionChanged(AccessibleCaretEventHub* aContext) override
@ -113,7 +113,7 @@ public:
{
if (aContext->MoveDistanceIsLarge(aPoint)) {
if (NS_SUCCEEDED(aContext->mManager->DragCaret(aPoint))) {
aContext->SetState(AccessibleCaretEventHub::DragCaretState());
aContext->SetState(aContext->DragCaretState());
}
}
@ -124,7 +124,7 @@ public:
{
aContext->mManager->ReleaseCaret();
aContext->mManager->TapCaret(aContext->mPressPoint);
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
return nsEventStatus_eConsumeNoDefault;
}
@ -156,7 +156,7 @@ public:
nsEventStatus OnRelease(AccessibleCaretEventHub* aContext) override
{
aContext->mManager->ReleaseCaret();
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
return nsEventStatus_eConsumeNoDefault;
}
@ -175,7 +175,7 @@ public:
const nsPoint& aPoint) override
{
if (aContext->MoveDistanceIsLarge(aPoint)) {
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
}
return nsEventStatus_eIgnore;
@ -183,7 +183,7 @@ public:
nsEventStatus OnRelease(AccessibleCaretEventHub* aContext) override
{
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
return nsEventStatus_eIgnore;
}
@ -191,7 +191,7 @@ public:
nsEventStatus OnLongTap(AccessibleCaretEventHub* aContext,
const nsPoint& aPoint) override
{
aContext->SetState(AccessibleCaretEventHub::LongTapState());
aContext->SetState(aContext->LongTapState());
return aContext->GetState()->OnLongTap(aContext, aPoint);
}
@ -199,7 +199,7 @@ public:
void OnScrollStart(AccessibleCaretEventHub* aContext) override
{
aContext->mManager->OnScrollStart();
aContext->SetState(AccessibleCaretEventHub::ScrollState());
aContext->SetState(aContext->ScrollState());
}
void OnBlur(AccessibleCaretEventHub* aContext,
@ -207,7 +207,7 @@ public:
{
aContext->mManager->OnBlur();
if (aIsLeavingDocument) {
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
}
}
@ -246,7 +246,7 @@ public:
void OnScrollEnd(AccessibleCaretEventHub* aContext) override
{
aContext->mManager->OnScrollEnd();
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
}
void OnScrollPositionChanged(AccessibleCaretEventHub* aContext) override
@ -259,7 +259,7 @@ public:
{
aContext->mManager->OnBlur();
if (aIsLeavingDocument) {
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
}
}
};
@ -286,7 +286,7 @@ public:
nsEventStatus OnRelease(AccessibleCaretEventHub* aContext) override
{
aContext->SetState(AccessibleCaretEventHub::NoActionState());
aContext->SetState(aContext->NoActionState());
// Do not consume the release since the press is not consumed in
// PressNoCaretState either.
@ -296,7 +296,7 @@ public:
void OnScrollStart(AccessibleCaretEventHub* aContext) override
{
aContext->mManager->OnScrollStart();
aContext->SetState(AccessibleCaretEventHub::ScrollState());
aContext->SetState(aContext->ScrollState());
}
void OnReflow(AccessibleCaretEventHub* aContext) override

2
layout/base/PresShell.cpp
View File

@ -8210,7 +8210,7 @@ PresShell::GetCurrentItemAndPositionForElement(nsIDOMElement *aCurrentEl,
treeBox->GetFirstVisibleRow(&firstVisibleRow);
treeBox->GetRowHeight(&rowHeight);
extraTreeY += nsPresContext::CSSPixelsToAppUnits(
extraTreeY += presContext->CSSPixelsToAppUnits(
(currentIndex - firstVisibleRow + 1) * rowHeight);
istree = true;

2
layout/base/ServoRestyleManager.cpp
View File

@ -601,7 +601,7 @@ UpdateBackdropIfNeeded(nsIFrame* aFrame,
backdropFrame->GetParent()->IsCanvasFrame());
nsTArray<nsIFrame*> wrappersToRestyle;
ServoRestyleState state(aStyleSet, aChangeList, wrappersToRestyle);
nsIFrame::UpdateStyleOfOwnedChildFrame(backdropFrame, newContext, state);
aFrame->UpdateStyleOfOwnedChildFrame(backdropFrame, newContext, state);
}
static void

4
layout/base/nsCounterManager.cpp
View File

@ -53,7 +53,7 @@ nsCounterUseNode::Calc(nsCounterList* aList)
{
NS_ASSERTION(!aList->IsDirty(),
"Why are we calculating with a dirty list?");
mValueAfter = nsCounterList::ValueBefore(this);
mValueAfter = aList->ValueBefore(this);
}
// assign the correct |mValueAfter| value to a node that has been inserted
@ -66,7 +66,7 @@ nsCounterChangeNode::Calc(nsCounterList* aList)
mValueAfter = mChangeValue;
} else {
NS_ASSERTION(mType == INCREMENT, "invalid type");
mValueAfter = nsCounterManager::IncrementCounter(nsCounterList::ValueBefore(this),
mValueAfter = nsCounterManager::IncrementCounter(aList->ValueBefore(this),
mChangeValue);
}
}

12
layout/generic/nsGfxScrollFrame.cpp
View File

@ -1089,8 +1089,8 @@ nsHTMLScrollFrame::Reflow(nsPresContext* aPresContext,
!oldScrolledAreaBounds.IsEqualEdges(newScrolledAreaBounds)) {
if (!mHelper.mSuppressScrollbarUpdate) {
mHelper.mSkippedScrollbarLayout = false;
ScrollFrameHelper::SetScrollbarVisibility(mHelper.mHScrollbarBox, state.mShowHScrollbar);
ScrollFrameHelper::SetScrollbarVisibility(mHelper.mVScrollbarBox, state.mShowVScrollbar);
mHelper.SetScrollbarVisibility(mHelper.mHScrollbarBox, state.mShowHScrollbar);
mHelper.SetScrollbarVisibility(mHelper.mVScrollbarBox, state.mShowVScrollbar);
// place and reflow scrollbars
nsRect insideBorderArea =
nsRect(nsPoint(state.mComputedBorder.left, state.mComputedBorder.top),
@ -5042,7 +5042,7 @@ nsXULScrollFrame::AddRemoveScrollbar(nsBoxLayoutState& aState,
nsSize hSize = mHelper.mHScrollbarBox->GetXULPrefSize(aState);
nsBox::AddMargin(mHelper.mHScrollbarBox, hSize);
ScrollFrameHelper::SetScrollbarVisibility(mHelper.mHScrollbarBox, aAdd);
mHelper.SetScrollbarVisibility(mHelper.mHScrollbarBox, aAdd);
// We can't directly pass mHasHorizontalScrollbar as the bool outparam for
// AddRemoveScrollbar() because it's a bool:1 bitfield. Hence this var:
@ -5053,7 +5053,7 @@ nsXULScrollFrame::AddRemoveScrollbar(nsBoxLayoutState& aState,
hSize.height, aOnRightOrBottom, aAdd);
mHelper.mHasHorizontalScrollbar = hasHorizontalScrollbar;
if (!fit) {
ScrollFrameHelper::SetScrollbarVisibility(mHelper.mHScrollbarBox, !aAdd);
mHelper.SetScrollbarVisibility(mHelper.mHScrollbarBox, !aAdd);
}
return fit;
} else {
@ -5063,7 +5063,7 @@ nsXULScrollFrame::AddRemoveScrollbar(nsBoxLayoutState& aState,
nsSize vSize = mHelper.mVScrollbarBox->GetXULPrefSize(aState);
nsBox::AddMargin(mHelper.mVScrollbarBox, vSize);
ScrollFrameHelper::SetScrollbarVisibility(mHelper.mVScrollbarBox, aAdd);
mHelper.SetScrollbarVisibility(mHelper.mVScrollbarBox, aAdd);
// We can't directly pass mHasVerticalScrollbar as the bool outparam for
// AddRemoveScrollbar() because it's a bool:1 bitfield. Hence this var:
@ -5074,7 +5074,7 @@ nsXULScrollFrame::AddRemoveScrollbar(nsBoxLayoutState& aState,
vSize.width, aOnRightOrBottom, aAdd);
mHelper.mHasVerticalScrollbar = hasVerticalScrollbar;
if (!fit) {
ScrollFrameHelper::SetScrollbarVisibility(mHelper.mVScrollbarBox, !aAdd);
mHelper.SetScrollbarVisibility(mHelper.mVScrollbarBox, !aAdd);
}
return fit;
}

2
layout/generic/nsGridContainerFrame.cpp
View File

@ -3514,7 +3514,7 @@ MeasuringReflow(nsIFrame* aChild,
const uint32_t flags = NS_FRAME_NO_MOVE_FRAME | NS_FRAME_NO_SIZE_VIEW;
parent->ReflowChild(aChild, pc, childSize, childRI, wm,
LogicalPoint(wm), nsSize(), flags, childStatus);
nsContainerFrame::FinishReflowChild(aChild, pc, childSize, &childRI, wm,
parent->FinishReflowChild(aChild, pc, childSize, &childRI, wm,
LogicalPoint(wm), nsSize(), flags);
#ifdef DEBUG
parent->DeleteProperty(nsContainerFrame::DebugReflowingWithInfiniteISize());

4
layout/generic/nsSimplePageSequenceFrame.cpp
View File

@ -196,7 +196,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext,
nsIntMargin marginTwips;
mPageData->mPrintSettings->GetMarginInTwips(marginTwips);
mMargin = nsPresContext::CSSTwipsToAppUnits(marginTwips + unwriteableTwips);
mMargin = aPresContext->CSSTwipsToAppUnits(marginTwips + unwriteableTwips);
int16_t printType;
mPageData->mPrintSettings->GetPrintRange(&printType);
@ -213,7 +213,7 @@ nsSimplePageSequenceFrame::Reflow(nsPresContext* aPresContext,
edgeTwips.right = clamped(edgeTwips.right, 0, inchInTwips);
mPageData->mEdgePaperMargin =
nsPresContext::CSSTwipsToAppUnits(edgeTwips + unwriteableTwips);
aPresContext->CSSTwipsToAppUnits(edgeTwips + unwriteableTwips);
}
// *** Special Override ***

2
layout/mathml/nsMathMLContainerFrame.cpp
View File

@ -1368,7 +1368,7 @@ AddInterFrameSpacingToSize(ReflowOutput& aDesiredSize,
parent, aFrame);
// add our own italic correction
nscoord leftCorrection = 0, italicCorrection = 0;
nsMathMLContainerFrame::GetItalicCorrection(aDesiredSize.mBoundingMetrics,
aFrame->GetItalicCorrection(aDesiredSize.mBoundingMetrics,
leftCorrection, italicCorrection);
gap += leftCorrection;
if (gap) {

2
layout/painting/ActiveLayerTracker.cpp
View File

@ -267,7 +267,7 @@ IncrementScaleRestyleCountIfNeeded(nsIFrame* aFrame, LayerActivity* aActivity)
aFrame->StyleContext(),
presContext,
dummy, refBox,
nsPresContext::AppUnitsPerCSSPixel(),
presContext->AppUnitsPerCSSPixel(),
&dummyBool);
Matrix transform2D;
if (!transform.Is2D(&transform2D)) {

2
layout/painting/FrameLayerBuilder.cpp
View File

@ -1795,7 +1795,7 @@ public:
already_AddRefed<ImageContainer> CreateImageAndImageContainer()
{
RefPtr<ImageContainer> container = LayerManager::CreateImageContainer();
RefPtr<ImageContainer> container = mLayerManager->CreateImageContainer();
RefPtr<Image> image = CreateImage();
if (!image) {

12
layout/painting/nsCSSRenderingGradients.cpp
View File

@ -873,8 +873,8 @@ nsCSSGradientRenderer::Paint(gfxContext& aContext,
// Use a pattern transform to take account of source and dest rects
matrix.PreTranslate(gfxPoint(mPresContext->CSSPixelsToDevPixels(aSrc.x),
mPresContext->CSSPixelsToDevPixels(aSrc.y)));
matrix.PreScale(gfxFloat(nsPresContext::CSSPixelsToAppUnits(aSrc.width))/aDest.width,
gfxFloat(nsPresContext::CSSPixelsToAppUnits(aSrc.height))/aDest.height);
matrix.PreScale(gfxFloat(mPresContext->CSSPixelsToAppUnits(aSrc.width))/aDest.width,
gfxFloat(mPresContext->CSSPixelsToAppUnits(aSrc.height))/aDest.height);
gradientPattern->SetMatrix(matrix);
if (stopDelta == 0.0) {
@ -1066,10 +1066,10 @@ nsCSSGradientRenderer::BuildWebRenderDisplayItems(wr::DisplayListBuilder& aBuild
wr::LayoutRect wrGradientBounds = aSc.ToRelativeLayoutRect(gradientBounds);
// srcTransform is used for scaling the gradient to match aSrc
LayoutDeviceRect srcTransform = LayoutDeviceRect(nsPresContext::CSSPixelsToAppUnits(aSrc.x),
nsPresContext::CSSPixelsToAppUnits(aSrc.y),
aDest.width / ((float)nsPresContext::CSSPixelsToAppUnits(aSrc.width)),
aDest.height / ((float)nsPresContext::CSSPixelsToAppUnits(aSrc.height)));
LayoutDeviceRect srcTransform = LayoutDeviceRect(mPresContext->CSSPixelsToAppUnits(aSrc.x),
mPresContext->CSSPixelsToAppUnits(aSrc.y),
aDest.width / ((float)mPresContext->CSSPixelsToAppUnits(aSrc.width)),
aDest.height / ((float)mPresContext->CSSPixelsToAppUnits(aSrc.height)));
lineStart.x = (lineStart.x - srcTransform.x) * srcTransform.width;
lineStart.y = (lineStart.y - srcTransform.y) * srcTransform.height;

7
layout/style/RuleProcessorCache.h
View File

@ -74,13 +74,16 @@ private:
: nsExpirationTracker<nsCSSRuleProcessor,3>(
10000, "RuleProcessorCache::ExpirationTracker",
SystemGroup::EventTargetFor(TaskCategory::Other))
{}
, mCache(aCache) {}
void RemoveObjectIfTracked(nsCSSRuleProcessor* aRuleProcessor);
virtual void NotifyExpired(nsCSSRuleProcessor* aRuleProcessor) override {
mozilla::RuleProcessorCache::RemoveRuleProcessor(aRuleProcessor);
mCache->RemoveRuleProcessor(aRuleProcessor);
}
private:
RuleProcessorCache* mCache;
};
RuleProcessorCache() : mExpirationTracker(this) {}

61
layout/svg/SVGTextFrame.cpp
View File

@ -95,10 +95,10 @@ AppUnitsToGfxUnits(const nsPoint& aPoint, const nsPresContext* aContext)
static gfxRect
AppUnitsToFloatCSSPixels(const gfxRect& aRect, const nsPresContext* aContext)
{
return gfxRect(nsPresContext::AppUnitsToFloatCSSPixels(aRect.x),
nsPresContext::AppUnitsToFloatCSSPixels(aRect.y),
nsPresContext::AppUnitsToFloatCSSPixels(aRect.width),
nsPresContext::AppUnitsToFloatCSSPixels(aRect.height));
return gfxRect(aContext->AppUnitsToFloatCSSPixels(aRect.x),
aContext->AppUnitsToFloatCSSPixels(aRect.y),
aContext->AppUnitsToFloatCSSPixels(aRect.width),
aContext->AppUnitsToFloatCSSPixels(aRect.height));
}
/**
@ -801,7 +801,8 @@ TextRenderedRun::GetTransformFromUserSpaceForPainting(
return m;
}
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = aContext->
AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
// Glyph position in user space.
m.PreTranslate(mPosition / cssPxPerDevPx);
@ -841,7 +842,8 @@ TextRenderedRun::GetTransformFromRunUserSpaceToUserSpace(
return m;
}
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = aContext->
AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
nscoord start, end;
GetClipEdges(start, end);
@ -888,7 +890,7 @@ TextRenderedRun::GetTransformFromRunUserSpaceToFrameUserSpace(
// Translate by the horizontal distance into the text frame this
// rendered run is.
gfxFloat appPerCssPx = nsPresContext::AppUnitsPerCSSPixel();
gfxFloat appPerCssPx = aContext->AppUnitsPerCSSPixel();
gfxPoint t = IsVertical() ? gfxPoint(0, start / appPerCssPx)
: gfxPoint(start / appPerCssPx, 0);
return m.PreTranslate(t);
@ -971,8 +973,8 @@ TextRenderedRun::GetRunUserSpaceRect(nsPresContext* aContext,
// it around the text's origin.
ScaleAround(fill,
textRun->IsVertical()
? gfxPoint(nsPresContext::AppUnitsToFloatCSSPixels(baseline), 0.0)
: gfxPoint(0.0, nsPresContext::AppUnitsToFloatCSSPixels(baseline)),
? gfxPoint(aContext->AppUnitsToFloatCSSPixels(baseline), 0.0)
: gfxPoint(0.0, aContext->AppUnitsToFloatCSSPixels(baseline)),
1.0 / mFontSizeScaleFactor);
// Include the fill if requested.
@ -1095,7 +1097,8 @@ TextRenderedRun::GetCharNumAtPosition(nsPresContext* aContext,
return -1;
}
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = aContext->
AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
// Convert the point from user space into run user space, and take
// into account any mFontSizeScaleFactor.
@ -2620,7 +2623,8 @@ CharIterator::GetGlyphAdvance(nsPresContext* aContext) const
gfxSkipCharsIterator it = TextFrame()->EnsureTextRun(nsTextFrame::eInflated);
Range range = ConvertOriginalToSkipped(it, offset, length);
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = aContext->
AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
gfxFloat advance = mTextRun->GetAdvanceWidth(range, nullptr);
return aContext->AppUnitsToGfxUnits(advance) *
@ -2630,7 +2634,8 @@ CharIterator::GetGlyphAdvance(nsPresContext* aContext) const
gfxFloat
CharIterator::GetAdvance(nsPresContext* aContext) const
{
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = aContext->
AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
uint32_t offset = mSkipCharsIterator.GetSkippedOffset();
gfxFloat advance = mTextRun->
@ -2652,7 +2657,8 @@ CharIterator::GetGlyphPartialAdvance(uint32_t aPartLength,
gfxSkipCharsIterator it = TextFrame()->EnsureTextRun(nsTextFrame::eInflated);
Range range = ConvertOriginalToSkipped(it, offset, length);
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = aContext->
AppUnitsToFloatCSSPixels(aContext->AppUnitsPerDevPixel());
gfxFloat advance = mTextRun->GetAdvanceWidth(range, nullptr);
return aContext->AppUnitsToGfxUnits(advance) *
@ -3625,7 +3631,7 @@ SVGTextFrame::PaintSVG(gfxContext& aContext,
// dev pixels. Here we multiply a CSS-px-to-dev-pixel factor onto aTransform
// so our non-SVG nsTextFrame children paint correctly.
auto auPerDevPx = presContext->AppUnitsPerDevPixel();
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(auPerDevPx);
float cssPxPerDevPx = presContext->AppUnitsToFloatCSSPixels(auPerDevPx);
gfxMatrix canvasTMForChildren = aTransform;
canvasTMForChildren.PreScale(cssPxPerDevPx, cssPxPerDevPx);
initialMatrix.PreScale(1 / cssPxPerDevPx, 1 / cssPxPerDevPx);
@ -3811,7 +3817,7 @@ SVGTextFrame::ReflowSVG()
mRect.SetEmpty();
} else {
mRect =
nsLayoutUtils::RoundGfxRectToAppRect(r.ToThebesRect(), nsPresContext::AppUnitsPerCSSPixel());
nsLayoutUtils::RoundGfxRectToAppRect(r.ToThebesRect(), presContext->AppUnitsPerCSSPixel());
// Due to rounding issues when we have a transform applied, we sometimes
// don't include an additional row of pixels. For now, just inflate our
@ -4177,7 +4183,8 @@ SVGTextFrame::GetSubStringLength(nsIContent* aContent,
}
nsPresContext* presContext = PresContext();
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = presContext->
AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
*aResult = presContext->AppUnitsToGfxUnits(textLength) *
cssPxPerDevPx / mFontSizeScaleFactor;
@ -4252,7 +4259,8 @@ SVGTextFrame::GetSubStringLengthSlowFallback(nsIContent* aContent,
}
nsPresContext* presContext = PresContext();
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = presContext->
AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
*aResult = presContext->AppUnitsToGfxUnits(textLength) *
cssPxPerDevPx / mFontSizeScaleFactor;
@ -4402,7 +4410,8 @@ SVGTextFrame::GetExtentOfChar(nsIContent* aContent,
nsPresContext* presContext = PresContext();
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = presContext->
AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
// We need to return the extent of the whole glyph.
uint32_t startIndex = it.GlyphStartTextElementCharIndex();
@ -5267,7 +5276,8 @@ SVGTextFrame::DoGlyphPositioning()
nsPresContext* presContext = PresContext();
bool vertical = GetWritingMode().IsVertical();
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
float cssPxPerDevPx = presContext->
AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
double factor = cssPxPerDevPx / mFontSizeScaleFactor;
// Determine how much to compress or expand glyph positions due to
@ -5567,7 +5577,7 @@ SVGTextFrame::UpdateFontSizeScaleFactor()
return mFontSizeScaleFactor != oldFontSizeScaleFactor;
}
double minSize = nsPresContext::AppUnitsToFloatCSSPixels(min);
double minSize = presContext->AppUnitsToFloatCSSPixels(min);
if (geometricPrecision) {
// We want to ensure minSize is scaled to PRECISE_SIZE.
@ -5589,14 +5599,14 @@ SVGTextFrame::UpdateFontSizeScaleFactor()
}
mLastContextScale = contextScale;
double maxSize = nsPresContext::AppUnitsToFloatCSSPixels(max);
double maxSize = presContext->AppUnitsToFloatCSSPixels(max);
// But we want to ignore any scaling required due to HiDPI displays, since
// regular CSS text frames will still create text runs using the font size
// in CSS pixels, and we want SVG text to have the same rendering as HTML
// text for regular font sizes.
float cssPxPerDevPx =
nsPresContext::AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
presContext->AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
contextScale *= cssPxPerDevPx;
double minTextRunSize = minSize * contextScale;
@ -5648,8 +5658,9 @@ SVGTextFrame::TransformFramePointToTextChild(const Point& aPoint,
// Add in the mRect offset to aPoint, as that will have been taken into
// account when transforming the point from the ancestor frame down
// to this one.
float cssPxPerDevPx = nsPresContext::AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
float factor = nsPresContext::AppUnitsPerCSSPixel();
float cssPxPerDevPx = presContext->
AppUnitsToFloatCSSPixels(presContext->AppUnitsPerDevPixel());
float factor = presContext->AppUnitsPerCSSPixel();
Point framePosition(NSAppUnitsToFloatPixels(mRect.x, factor),
NSAppUnitsToFloatPixels(mRect.y, factor));
Point pointInUserSpace = aPoint * cssPxPerDevPx + framePosition;
@ -5756,7 +5767,7 @@ SVGTextFrame::TransformFrameRectFromTextChild(const nsRect& aRect,
// Subtract the mRect offset from the result, as our user space for
// this frame is relative to the top-left of mRect.
float factor = nsPresContext::AppUnitsPerCSSPixel();
float factor = presContext->AppUnitsPerCSSPixel();
gfxPoint framePosition(NSAppUnitsToFloatPixels(mRect.x, factor),
NSAppUnitsToFloatPixels(mRect.y, factor));

5
layout/svg/nsSVGIntegrationUtils.cpp
View File

@ -214,8 +214,9 @@ nsSVGIntegrationUtils::GetSVGCoordContextForNonSVGFrame(nsIFrame* aNonSVGFrame)
nsIFrame* firstFrame =
nsLayoutUtils::FirstContinuationOrIBSplitSibling(aNonSVGFrame);
nsRect r = nsLayoutUtils::GetAllInFlowRectsUnion(firstFrame, firstFrame);
return gfx::Size(nsPresContext::AppUnitsToFloatCSSPixels(r.width),
nsPresContext::AppUnitsToFloatCSSPixels(r.height));
nsPresContext* presContext = firstFrame->PresContext();
return gfx::Size(presContext->AppUnitsToFloatCSSPixels(r.width),
presContext->AppUnitsToFloatCSSPixels(r.height));
}
gfxRect

15
layout/xul/nsMenuPopupFrame.cpp
View File

@ -1438,7 +1438,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
// If anchored to a rectangle, use that rectangle. Otherwise, determine the
// rectangle from the anchor.
if (mAnchorType == MenuPopupAnchorType_Rect) {
anchorRect = ToAppUnits(mScreenRect, nsPresContext::AppUnitsPerCSSPixel());
anchorRect = ToAppUnits(mScreenRect, presContext->AppUnitsPerCSSPixel());
}
else {
// if the frame is not specified, use the anchor node passed to OpenPopup. If
@ -1520,7 +1520,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
// mXPos and mYPos specify an additonal offset passed to OpenPopup that
// should be added to the position. We also add the offset to the anchor
// pos so a later flip/resize takes the offset into account.
nscoord anchorXOffset = nsPresContext::CSSPixelsToAppUnits(mXPos);
nscoord anchorXOffset = presContext->CSSPixelsToAppUnits(mXPos);
if (IsDirectionRTL()) {
screenPoint.x -= anchorXOffset;
anchorRect.x -= anchorXOffset;
@ -1528,7 +1528,7 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
screenPoint.x += anchorXOffset;
anchorRect.x += anchorXOffset;
}
nscoord anchorYOffset = nsPresContext::CSSPixelsToAppUnits(mYPos);
nscoord anchorYOffset = presContext->CSSPixelsToAppUnits(mYPos);
screenPoint.y += anchorYOffset;
anchorRect.y += anchorYOffset;
@ -1542,8 +1542,8 @@ nsMenuPopupFrame::SetPopupPosition(nsIFrame* aAnchorFrame, bool aIsMove, bool aS
// Account for the margin that will end up being added to the screen coordinate
// the next time SetPopupPosition is called.
mAnchorType = MenuPopupAnchorType_Point;
mScreenRect.x = nsPresContext::AppUnitsToIntCSSPixels(screenPoint.x - margin.left);
mScreenRect.y = nsPresContext::AppUnitsToIntCSSPixels(screenPoint.y - margin.top);
mScreenRect.x = presContext->AppUnitsToIntCSSPixels(screenPoint.x - margin.left);
mScreenRect.y = presContext->AppUnitsToIntCSSPixels(screenPoint.y - margin.top);
}
}
else {
@ -2411,9 +2411,10 @@ nsMenuPopupFrame::MoveTo(const CSSIntPoint& aPos, bool aUpdateAttrs)
LookAndFeel::eIntID_ContextMenuOffsetVertical));
}
nsPresContext* presContext = PresContext();
mAnchorType = MenuPopupAnchorType_Point;
mScreenRect.x = aPos.x - nsPresContext::AppUnitsToIntCSSPixels(margin.left);
mScreenRect.y = aPos.y - nsPresContext::AppUnitsToIntCSSPixels(margin.top);
mScreenRect.x = aPos.x - presContext->AppUnitsToIntCSSPixels(margin.left);
mScreenRect.y = aPos.y - presContext->AppUnitsToIntCSSPixels(margin.top);
SetPopupPosition(nullptr, true, false, true);

6
layout/xul/nsSplitterFrame.cpp
View File

@ -696,9 +696,9 @@ nsSplitterFrameInner::MouseDown(nsIDOMEvent* aMouseEvent)
nsSize maxSize = nsBox::BoundsCheckMinMax(minSize, childBox->GetXULMaxSize(state));
prefSize = nsBox::BoundsCheck(minSize, prefSize, maxSize);
nsSplitterFrame::AddMargin(childBox, minSize);
nsSplitterFrame::AddMargin(childBox, prefSize);
nsSplitterFrame::AddMargin(childBox, maxSize);
mOuter->AddMargin(childBox, minSize);
mOuter->AddMargin(childBox, prefSize);
mOuter->AddMargin(childBox, maxSize);
nscoord flex = childBox->GetXULFlex();

6
media/webrtc/signaling/gtest/rtpsources_unittests.cpp
View File

@ -112,7 +112,7 @@ public:
// storage
void TestAgeIntoLongTerm() {
RtpSourceHistory history;
constexpr int64_t jitterWindow = RtpSourceHistory::kMinJitterWindow;
constexpr int64_t jitterWindow = history.kMinJitterWindow;
constexpr int64_t jitter = jitterWindow / 2;
constexpr int64_t timeNow0 = 100000;
constexpr int64_t time0 = timeNow0;
@ -213,7 +213,7 @@ public:
void TestSinglePrune() {
RtpSourceHistory history;
constexpr int64_t timeNow = 10000;
constexpr int64_t jitter = RtpSourceHistory::kMinJitterWindow / 2;
constexpr int64_t jitter = history.kMinJitterWindow / 2;
const int64_t jitterAdjusted = timeNow + jitter;
history.Insert(timeNow, jitterAdjusted, 0, false);
@ -349,4 +349,4 @@ TEST_F(RtpSourcesTest, TestObserveTwoCsrcs) { TestObserveTwoCsrcs(); }
TEST_F(RtpSourcesTest, TestObserveCsrcWithAudioLevel) {
TestObserveCsrcWithAudioLevel();
}
}
}

8
media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
View File

@ -197,7 +197,7 @@ JsepSessionImpl::CreateOfferMsection(const JsepOfferOptions& options,
JsepTrack& recvTrack(transceiver.mRecvTrack);
SdpMediaSection::Protocol protocol(
SdpHelper::GetProtocolForMediaType(sendTrack.GetMediaType()));
mSdpHelper.GetProtocolForMediaType(sendTrack.GetMediaType()));
const Sdp* answer(GetAnswer());
const SdpMediaSection* lastAnswerMsection = nullptr;
@ -226,7 +226,7 @@ JsepSessionImpl::CreateOfferMsection(const JsepOfferOptions& options,
}
if (transceiver.IsStopped()) {
SdpHelper::DisableMsection(local, msection);
mSdpHelper.DisableMsection(local, msection);
return NS_OK;
}
@ -598,7 +598,7 @@ JsepSessionImpl::CreateAnswerMsection(const JsepAnswerOptions& options,
if (mSdpHelper.MsectionIsDisabled(remoteMsection) ||
// JS might have stopped this
transceiver.IsStopped()) {
SdpHelper::DisableMsection(sdp, &msection);
mSdpHelper.DisableMsection(sdp, &msection);
return NS_OK;
}
@ -620,7 +620,7 @@ JsepSessionImpl::CreateAnswerMsection(const JsepAnswerOptions& options,
if (msection.GetFormats().empty()) {
// Could not negotiate anything. Disable m-section.
SdpHelper::DisableMsection(sdp, &msection);
mSdpHelper.DisableMsection(sdp, &msection);
}
return NS_OK;

2
netwerk/cache/nsCacheService.cpp vendored
View File

@ -1432,7 +1432,7 @@ nsCacheService::IsStorageEnabledForPolicy(nsCacheStoragePolicy storagePolicy,
if (gService == nullptr) return NS_ERROR_NOT_AVAILABLE;
nsCacheServiceAutoLock lock(LOCK_TELEM(NSCACHESERVICE_ISSTORAGEENABLEDFORPOLICY));
*result = nsCacheService::IsStorageEnabledForPolicy_Locked(storagePolicy);
*result = gService->IsStorageEnabledForPolicy_Locked(storagePolicy);
return NS_OK;
}

8
rdf/base/nsRDFXMLSerializer.cpp
View File

@ -1018,7 +1018,7 @@ nsresult
QNameCollector::Visit(nsIRDFNode* aSubject, nsIRDFResource* aPredicate,
nsIRDFNode* aObject, bool aTruthValue)
{
if (aPredicate == nsRDFXMLSerializer::kRDF_type) {
if (aPredicate == mParent->kRDF_type) {
// try to get a type QName for aObject, should be a resource
nsCOMPtr<nsIRDFResource> resType = do_QueryInterface(aObject);
if (!resType) {
@ -1035,11 +1035,11 @@ QNameCollector::Visit(nsIRDFNode* aSubject, nsIRDFResource* aPredicate,
if (mParent->mQNames.Get(aPredicate, nullptr)) {
return NS_OK;
}
if (aPredicate == nsRDFXMLSerializer::kRDF_instanceOf ||
aPredicate == nsRDFXMLSerializer::kRDF_nextVal)
if (aPredicate == mParent->kRDF_instanceOf ||
aPredicate == mParent->kRDF_nextVal)
return NS_OK;
bool isOrdinal = false;
nsRDFXMLSerializer::gRDFC->IsOrdinalProperty(aPredicate, &isOrdinal);
mParent->gRDFC->IsOrdinalProperty(aPredicate, &isOrdinal);
if (isOrdinal)
return NS_OK;

2
security/manager/ssl/PSMContentListener.cpp
View File

@ -271,7 +271,7 @@ PSMContentDownloaderParent::RecvDivertToParentUsing(mozilla::net::PChannelDivert
MOZ_ASSERT(diverter);
auto p = static_cast<mozilla::net::ChannelDiverterParent*>(diverter);
p->DivertTo(this);
mozilla::Unused << ChannelDiverterParent::Send__delete__(p);
mozilla::Unused << p->Send__delete__(p);
return IPC_OK();
}

2
toolkit/components/extensions/MatchPattern.cpp
View File

@ -100,7 +100,7 @@ void
AtomSet::Remove(nsAtom* aAtom)
{
auto index = mElems.BinaryIndexOf(aAtom);
if (index != ArrayType::NoIndex) {
if (index != mElems.NoIndex) {
mElems.RemoveElementAt(index);
}
}

8
toolkit/components/places/nsNavHistoryResult.cpp
View File

@ -4137,7 +4137,7 @@ nsNavHistoryResult::AddHistoryObserver(nsNavHistoryQueryResultNode* aNode)
// Don't add duplicate observers. In some case we don't unregister when
// children are cleared (see ClearChildren) and the next FillChildren call
// will try to add the observer again.
if (mHistoryObservers.IndexOf(aNode) == QueryObserverList::NoIndex) {
if (mHistoryObservers.IndexOf(aNode) == mHistoryObservers.NoIndex) {
mHistoryObservers.AppendElement(aNode);
}
}
@ -4158,7 +4158,7 @@ nsNavHistoryResult::AddAllBookmarksObserver(nsNavHistoryQueryResultNode* aNode)
// Don't add duplicate observers. In some case we don't unregister when
// children are cleared (see ClearChildren) and the next FillChildren call
// will try to add the observer again.
if (mAllBookmarksObservers.IndexOf(aNode) == QueryObserverList::NoIndex) {
if (mAllBookmarksObservers.IndexOf(aNode) == mAllBookmarksObservers.NoIndex) {
mAllBookmarksObservers.AppendElement(aNode);
}
}
@ -4199,7 +4199,7 @@ nsNavHistoryResult::AddBookmarkFolderObserver(nsNavHistoryFolderResultNode* aNod
// children are cleared (see ClearChildren) and the next FillChildren call
// will try to add the observer again.
FolderObserverList* list = BookmarkFolderObserversForId(aFolder, true);
if (list->IndexOf(aNode) == FolderObserverList::NoIndex) {
if (list->IndexOf(aNode) == list->NoIndex) {
list->AppendElement(aNode);
}
}
@ -4372,7 +4372,7 @@ void
nsNavHistoryResult::requestRefresh(nsNavHistoryContainerResultNode* aContainer)
{
// Don't add twice the same container.
if (mRefreshParticipants.IndexOf(aContainer) == ContainerObserverList::NoIndex)
if (mRefreshParticipants.IndexOf(aContainer) == mRefreshParticipants.NoIndex)
mRefreshParticipants.AppendElement(aContainer);
}

4
toolkit/components/printingui/ipc/PrintingParent.cpp
View File

@ -187,9 +187,9 @@ PrintingParent::RecvShowPrintDialog(PPrintSettingsDialogParent* aDialog,
// with an async message which frees the child process from
// its nested event loop.
if (NS_FAILED(rv)) {
mozilla::Unused << PPrintingParent::PPrintSettingsDialogParent::Send__delete__(aDialog, rv);
mozilla::Unused << aDialog->Send__delete__(aDialog, rv);
} else {
mozilla::Unused << PPrintingParent::PPrintSettingsDialogParent::Send__delete__(aDialog, resultData);
mozilla::Unused << aDialog->Send__delete__(aDialog, resultData);
}
return IPC_OK();
}

2
toolkit/crashreporter/breakpad-client/linux/minidump_writer/minidump_writer.cc
View File

@ -736,7 +736,7 @@ class MinidumpWriter {
dso_count++;
}
MDRVA linkmap_rva = MinidumpFileWriter::kInvalidMDRVA;
MDRVA linkmap_rva = minidump_writer_.kInvalidMDRVA;
if (dso_count > 0) {
// If we have at least one DSO, create an array of MDRawLinkMap
// entries in the minidump file.

4
toolkit/profile/nsToolkitProfileService.cpp
View File

@ -406,10 +406,10 @@ nsToolkitProfileService::Init()
NS_ASSERTION(gDirServiceProvider, "No dirserviceprovider!");
nsresult rv;
rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(mAppData));
rv = gDirServiceProvider->GetUserAppDataDirectory(getter_AddRefs(mAppData));
NS_ENSURE_SUCCESS(rv, rv);
rv = nsXREDirProvider::GetUserLocalDataDirectory(getter_AddRefs(mTempData));
rv = gDirServiceProvider->GetUserLocalDataDirectory(getter_AddRefs(mTempData));
NS_ENSURE_SUCCESS(rv, rv);
rv = mAppData->Clone(getter_AddRefs(mListFile));

2
toolkit/xre/nsAppRunner.cpp
View File

@ -3338,7 +3338,7 @@ XREMain::XRE_mainInit(bool* aExitFlag)
NS_SUCCEEDED(
CrashReporter::SetExceptionHandler(xreBinDirectory))) {
nsCOMPtr<nsIFile> file;
rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(file));
rv = mDirProvider.GetUserAppDataDirectory(getter_AddRefs(file));
if (NS_SUCCEEDED(rv)) {
CrashReporter::SetUserAppDataDirectory(file);
}

2
toolkit/xre/nsConsoleWriter.cpp
View File

@ -34,7 +34,7 @@ WriteConsoleLog()
if (!gLogConsoleErrors)
return;
rv = nsXREDirProvider::GetUserAppDataDirectory(getter_AddRefs(lfile));
rv = gDirServiceProvider->GetUserAppDataDirectory(getter_AddRefs(lfile));
if (NS_FAILED(rv))
return;

2
uriloader/exthandler/ExternalHelperAppParent.cpp
View File

@ -196,7 +196,7 @@ ExternalHelperAppParent::RecvDivertToParentUsing(PChannelDiverterParent* diverte
#ifdef DEBUG
mDiverted = true;
#endif
Unused << ChannelDiverterParent::Send__delete__(p);
Unused << p->Send__delete__(p);
return IPC_OK();
}

2
widget/nsBaseWidget.cpp
View File

@ -1066,7 +1066,7 @@ nsBaseWidget::ProcessUntransformedAPZEvent(WidgetInputEvent* aEvent,
UniquePtr<WidgetEvent> original(aEvent->Duplicate());
DispatchEvent(aEvent, status);
if (mAPZC && !InputAPZContext::WasRoutedToChildProcess() && aInputBlockId) {
if (mAPZC && !context.WasRoutedToChildProcess() && aInputBlockId) {
// EventStateManager did not route the event into the child process.
// It's safe to communicate to APZ that the event has been processed.
// TODO: Eventually we'll be able to move the SendSetTargetAPZCNotification