|
@@ -2,7 +2,7 @@
|
|
|
# User Iain Ireland <iireland@mozilla.com>
|
|
|
# Date 1676313190 0
|
|
|
# Node ID 207a0ca14a754cccfed04e5ce55c513afb3d25a6
|
|
|
-# Parent 963b59f4f9b8ca667391f08687b8d04e820c173c
|
|
|
+# Parent c64070b34de35fb0ba2b3b73d7e0d88a5c28f0e0
|
|
|
Bug 1814899: Ensure more OsiSpace r=jandem, a=dmeehan
|
|
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D169274
|
|
@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D169274
|
|
|
diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
|
|
|
--- a/js/src/jit/CodeGenerator.cpp
|
|
|
+++ b/js/src/jit/CodeGenerator.cpp
|
|
|
-@@ -4367,16 +4367,17 @@ CodeGenerator::visitCallNative(LCallNati
|
|
|
+@@ -4368,16 +4368,17 @@ CodeGenerator::visitCallNative(LCallNati
|
|
|
masm.passABIArg(argUintNReg);
|
|
|
masm.passABIArg(argVpReg);
|
|
|
JSNative native = target->native();
|
|
@@ -28,7 +28,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
|
|
|
// Test for failure.
|
|
|
masm.branchIfFalseBool(ReturnReg, masm.failureLabel());
|
|
|
|
|
|
-@@ -4518,16 +4519,17 @@ CodeGenerator::visitCallDOMNative(LCallD
|
|
|
+@@ -4519,16 +4520,17 @@ CodeGenerator::visitCallDOMNative(LCallD
|
|
|
|
|
|
// Construct and execute call.
|
|
|
masm.setupUnalignedABICall(argJSContext);
|
|
@@ -46,7 +46,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
|
|
|
JSReturnOperand);
|
|
|
} else {
|
|
|
// Test for failure.
|
|
|
-@@ -4658,16 +4660,17 @@ CodeGenerator::visitCallGeneric(LCallGen
|
|
|
+@@ -4659,16 +4661,17 @@ CodeGenerator::visitCallGeneric(LCallGen
|
|
|
masm.bind(&thunk);
|
|
|
{
|
|
|
TrampolinePtr argumentsRectifier = gen->jitRuntime()->getArgumentsRectifier();
|
|
@@ -64,9 +64,9 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
|
|
|
"ReturnReg available as scratch after scripted calls");
|
|
|
masm.switchToRealm(gen->realm->realmPtr(), ReturnReg);
|
|
|
}
|
|
|
-@@ -4763,16 +4766,17 @@ CodeGenerator::visitCallKnown(LCallKnown
|
|
|
+@@ -4764,16 +4767,17 @@ CodeGenerator::visitCallKnown(LCallKnown
|
|
|
// Construct the IonFramePrefix.
|
|
|
- uint32_t descriptor = MakeFrameDescriptor(masm.framePushed(), JitFrame_IonJS,
|
|
|
+ uint32_t descriptor = MakeFrameDescriptor(masm.framePushed(), FrameType::IonJS,
|
|
|
JitFrameLayout::Size());
|
|
|
masm.Push(Imm32(call->numActualArgs()));
|
|
|
masm.PushCalleeToken(calleereg, call->mir()->isConstructing());
|
|
@@ -82,7 +82,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
|
|
|
"ReturnReg available as scratch after scripted calls");
|
|
|
masm.switchToRealm(gen->realm->realmPtr(), ReturnReg);
|
|
|
}
|
|
|
-@@ -5106,16 +5110,17 @@ CodeGenerator::emitApplyGeneric(T* apply
|
|
|
+@@ -5107,16 +5111,17 @@ CodeGenerator::emitApplyGeneric(T* apply
|
|
|
// Hardcode the address of the argumentsRectifier code.
|
|
|
TrampolinePtr argumentsRectifier = gen->jitRuntime()->getArgumentsRectifier();
|
|
|
masm.movePtr(argumentsRectifier, objreg);
|
|
@@ -100,7 +100,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
|
|
|
"ReturnReg available as scratch after scripted calls");
|
|
|
masm.switchToRealm(gen->realm->realmPtr(), ReturnReg);
|
|
|
}
|
|
|
-@@ -12216,16 +12221,17 @@ CodeGenerator::visitGetDOMProperty(LGetD
|
|
|
+@@ -12213,16 +12218,17 @@ CodeGenerator::visitGetDOMProperty(LGetD
|
|
|
markSafepointAt(safepointOffset, ins);
|
|
|
|
|
|
masm.setupUnalignedABICall(JSContextReg);
|
|
@@ -118,7 +118,7 @@ diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp
|
|
|
JSReturnOperand);
|
|
|
} else {
|
|
|
masm.branchIfFalseBool(ReturnReg, masm.exceptionLabel());
|
|
|
-@@ -12335,16 +12341,17 @@ CodeGenerator::visitSetDOMProperty(LSetD
|
|
|
+@@ -12332,16 +12338,17 @@ CodeGenerator::visitSetDOMProperty(LSetD
|
|
|
markSafepointAt(safepointOffset, ins);
|
|
|
|
|
|
masm.setupUnalignedABICall(JSContextReg);
|
|
@@ -182,7 +182,7 @@ new file mode 100644
|
|
|
diff --git a/js/src/jit/shared/CodeGenerator-shared.cpp b/js/src/jit/shared/CodeGenerator-shared.cpp
|
|
|
--- a/js/src/jit/shared/CodeGenerator-shared.cpp
|
|
|
+++ b/js/src/jit/shared/CodeGenerator-shared.cpp
|
|
|
-@@ -1108,28 +1108,28 @@ CodeGeneratorShared::ensureOsiSpace()
|
|
|
+@@ -1110,28 +1110,28 @@ CodeGeneratorShared::ensureOsiSpace()
|
|
|
if (masm.currentOffset() - lastOsiPointOffset_ < Assembler::PatchWrite_NearCallSize()) {
|
|
|
int32_t paddingSize = Assembler::PatchWrite_NearCallSize();
|
|
|
paddingSize -= masm.currentOffset() - lastOsiPointOffset_;
|