[JSC] Figure out missing prepareCallOperation
https://bugs.webkit.org/show_bug.cgi?id=203285
Reviewed by Mark Lam.
Source/JavaScriptCore:
We start using __builtin_frame_address to get CallFrame* in JIT operations. For the platform which is not supporting this API (MSVC),
we put frame-pointer to vm.topCallFrame in the caller side. The problem is that all Apple platform is now using __builtin_frame_address,
and we are not testing vm.topCallFrame version at all.
To find missing prepareCallOperation call, we introduce JITOperationPrologueCallFrameTracer. When USE(BUILTIN_FRAME_ADDRESS) is enabled and
if it is debug build, we anyway put frame-pointer to vm.topCallFrame. And after that, we ensure that vm.topCallFrame is the same to the
CallFrame* gained by __builtin_frame_address. By doing this, we can find places missing this call in debug build of Apple ports.
We also found that FTL's custom getter calling is putting wrong value to vm.topCallFrame. This patch fixes it too.
* dfg/DFGOSRExit.cpp:
(JSC::DFG::OSRExit::emitRestoreArguments):
(JSC::DFG::operationCompileOSRExit):
(JSC::DFG::OSRExit::compileExit):
(JSC::DFG::operationDebugPrintSpeculationFailure):
(JSC::DFG::OSRExit::compileOSRExit): Deleted.
(JSC::DFG::OSRExit::debugOperationPrintSpeculationFailure): Deleted.
* dfg/DFGOSRExit.h:
* dfg/DFGOSRExitCompilerCommon.cpp:
(JSC::DFG::handleExitCounts):
(JSC::DFG::osrWriteBarrier):
* dfg/DFGOSRExitCompilerCommon.h:
* dfg/DFGOperations.cpp:
* dfg/DFGOperations.h:
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGThunks.cpp:
(JSC::DFG::osrExitThunkGenerator):
(JSC::DFG::osrExitGenerationThunkGenerator):
* ftl/FTLLowerDFGToB3.cpp:
(JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstructVarargsSpread):
(JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstructVarargs):
(JSC::FTL::DFG::LowerDFGToB3::compileCallEval):
(JSC::FTL::DFG::LowerDFGToB3::compileCallDOMGetter):
(JSC::FTL::DFG::LowerDFGToB3::callPreflight):
(JSC::FTL::DFG::LowerDFGToB3::callCheck):
* ftl/FTLOSRExitCompiler.cpp:
(JSC::FTL::compileStub):
(JSC::FTL::operationCompileFTLOSRExit):
(JSC::FTL::compileFTLOSRExit): Deleted.
* ftl/FTLOSRExitCompiler.h:
* ftl/FTLOperations.cpp:
(JSC::FTL::operationPopulateObjectInOSR):
(JSC::FTL::operationMaterializeObjectInOSR):
(JSC::FTL::operationCompileFTLLazySlowPath):
(JSC::FTL::compileFTLLazySlowPath): Deleted.
* ftl/FTLOperations.h:
* ftl/FTLSlowPathCall.cpp:
(JSC::FTL::SlowPathCallContext::makeCall):
* ftl/FTLThunks.cpp:
(JSC::FTL::genericGenerationThunkGenerator):
(JSC::FTL::osrExitGenerationThunkGenerator):
(JSC::FTL::lazySlowPathGenerationThunkGenerator):
(JSC::FTL::slowPathCallThunkGenerator):
* ftl/FTLThunks.h:
(JSC::FTL::generateIfNecessary):
(JSC::FTL::Thunks::getSlowPathCallThunk):
* interpreter/FrameTracers.h:
(JSC::SlowPathFrameTracer::SlowPathFrameTracer):
(JSC::JITOperationPrologueCallFrameTracer::JITOperationPrologueCallFrameTracer):
(JSC::JITOperationPrologueCallFrameTracer::~JITOperationPrologueCallFrameTracer):
* jit/AssemblyHelpers.cpp:
(JSC::AssemblyHelpers::callExceptionFuzz):
(JSC::AssemblyHelpers::debugCall):
* jit/AssemblyHelpers.h:
(JSC::AssemblyHelpers::prepareCallOperation):
* jit/CCallHelpers.cpp:
(JSC::CCallHelpers::ensureShadowChickenPacket):
* jit/CCallHelpers.h:
(JSC::CCallHelpers::prepareCallOperation): Deleted.
* jit/JITOperations.cpp:
* jit/JITOperations.h:
* jit/Repatch.cpp:
(JSC::ftlThunkAwareRepatchCall):
* jit/ThunkGenerators.cpp:
(JSC::boundThisNoArgsFunctionCallGenerator):
* llint/LLIntSlowPaths.cpp:
(JSC::LLInt::LLINT_SLOW_PATH_DECL):
(JSC::LLInt::handleHostCall):
* runtime/AtomicsObject.cpp:
(JSC::operationAtomicsAdd):
(JSC::operationAtomicsAnd):
(JSC::operationAtomicsCompareExchange):
(JSC::operationAtomicsExchange):
(JSC::operationAtomicsIsLockFree):
(JSC::operationAtomicsLoad):
(JSC::operationAtomicsOr):
(JSC::operationAtomicsStore):
(JSC::operationAtomicsSub):
(JSC::operationAtomicsXor):
* runtime/CommonSlowPaths.cpp:
(JSC::SLOW_PATH_DECL):
* runtime/StringPrototype.cpp:
(JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
(JSC::operationStringProtoFuncReplaceRegExpString):
(JSC::operationStringProtoFuncReplaceGeneric):
* tools/JSDollarVM.cpp:
(IGNORE_WARNINGS_BEGIN):
* wasm/WasmAirIRGenerator.cpp:
(JSC::Wasm::AirIRGenerator::emitLoopTierUpCheck):
* wasm/WasmB3IRGenerator.cpp:
(JSC::Wasm::B3IRGenerator::emitLoopTierUpCheck):
* wasm/WasmOperations.cpp:
(JSC::Wasm::operationWasmThrowBadI64):
(JSC::Wasm::operationWasmTriggerOSREntryNow):
(JSC::Wasm::operationWasmTriggerTierUpNow):
(JSC::Wasm::operationThrowBadI64): Deleted.
(JSC::Wasm::triggerOSREntryNow): Deleted.
(JSC::Wasm::triggerTierUpNow): Deleted.
* wasm/WasmOperations.h:
* wasm/WasmThunks.cpp:
(JSC::Wasm::triggerOMGEntryTierUpThunkGenerator):
* wasm/js/JSWebAssembly.cpp:
(JSC::instantiate):
* wasm/js/WasmToJS.cpp:
(JSC::Wasm::handleBadI64Use):
(JSC::Wasm::operationWasmToJSException):
(JSC::Wasm::emitThrowWasmToJSException):
(JSC::Wasm::wasmToJSException): Deleted.
* wasm/js/WasmToJS.h:
* wasm/js/WebAssemblyInstanceConstructor.cpp:
(JSC::constructJSWebAssemblyInstance):
Source/WebCore:
Use JITOperationPrologueCallFrameTracer instead of NativeCallFrameTracer.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateOperationDefinition):
* bindings/scripts/test/JS/JSTestDOMJIT.cpp:
(WebCore::jsTestDOMJITPrototypeFunctionGetAttributeWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionItemWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionHasAttributeWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionGetElementByIdWithoutTypeCheck):
(WebCore::jsTestDOMJITPrototypeFunctionGetElementsByNameWithoutTypeCheck):
* domjit/DOMJITHelpers.h:
(WebCore::DOMJIT::toWrapperSlow):
Source/WTF:
Enable USE(BUILTIN_FRAME_ADDRESS) regardless of platform is the compilers and architectures match.
* wtf/Platform.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251518 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 8cf80ff..dae4977 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,133 @@
+2019-10-23 Yusuke Suzuki <ysuzuki@apple.com>
+
+ [JSC] Figure out missing prepareCallOperation
+ https://bugs.webkit.org/show_bug.cgi?id=203285
+
+ Reviewed by Mark Lam.
+
+ We start using __builtin_frame_address to get CallFrame* in JIT operations. For the platform which is not supporting this API (MSVC),
+ we put frame-pointer to vm.topCallFrame in the caller side. The problem is that all Apple platform is now using __builtin_frame_address,
+ and we are not testing vm.topCallFrame version at all.
+
+ To find missing prepareCallOperation call, we introduce JITOperationPrologueCallFrameTracer. When USE(BUILTIN_FRAME_ADDRESS) is enabled and
+ if it is debug build, we anyway put frame-pointer to vm.topCallFrame. And after that, we ensure that vm.topCallFrame is the same to the
+ CallFrame* gained by __builtin_frame_address. By doing this, we can find places missing this call in debug build of Apple ports.
+
+ We also found that FTL's custom getter calling is putting wrong value to vm.topCallFrame. This patch fixes it too.
+
+ * dfg/DFGOSRExit.cpp:
+ (JSC::DFG::OSRExit::emitRestoreArguments):
+ (JSC::DFG::operationCompileOSRExit):
+ (JSC::DFG::OSRExit::compileExit):
+ (JSC::DFG::operationDebugPrintSpeculationFailure):
+ (JSC::DFG::OSRExit::compileOSRExit): Deleted.
+ (JSC::DFG::OSRExit::debugOperationPrintSpeculationFailure): Deleted.
+ * dfg/DFGOSRExit.h:
+ * dfg/DFGOSRExitCompilerCommon.cpp:
+ (JSC::DFG::handleExitCounts):
+ (JSC::DFG::osrWriteBarrier):
+ * dfg/DFGOSRExitCompilerCommon.h:
+ * dfg/DFGOperations.cpp:
+ * dfg/DFGOperations.h:
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGThunks.cpp:
+ (JSC::DFG::osrExitThunkGenerator):
+ (JSC::DFG::osrExitGenerationThunkGenerator):
+ * ftl/FTLLowerDFGToB3.cpp:
+ (JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstructVarargsSpread):
+ (JSC::FTL::DFG::LowerDFGToB3::compileCallOrConstructVarargs):
+ (JSC::FTL::DFG::LowerDFGToB3::compileCallEval):
+ (JSC::FTL::DFG::LowerDFGToB3::compileCallDOMGetter):
+ (JSC::FTL::DFG::LowerDFGToB3::callPreflight):
+ (JSC::FTL::DFG::LowerDFGToB3::callCheck):
+ * ftl/FTLOSRExitCompiler.cpp:
+ (JSC::FTL::compileStub):
+ (JSC::FTL::operationCompileFTLOSRExit):
+ (JSC::FTL::compileFTLOSRExit): Deleted.
+ * ftl/FTLOSRExitCompiler.h:
+ * ftl/FTLOperations.cpp:
+ (JSC::FTL::operationPopulateObjectInOSR):
+ (JSC::FTL::operationMaterializeObjectInOSR):
+ (JSC::FTL::operationCompileFTLLazySlowPath):
+ (JSC::FTL::compileFTLLazySlowPath): Deleted.
+ * ftl/FTLOperations.h:
+ * ftl/FTLSlowPathCall.cpp:
+ (JSC::FTL::SlowPathCallContext::makeCall):
+ * ftl/FTLThunks.cpp:
+ (JSC::FTL::genericGenerationThunkGenerator):
+ (JSC::FTL::osrExitGenerationThunkGenerator):
+ (JSC::FTL::lazySlowPathGenerationThunkGenerator):
+ (JSC::FTL::slowPathCallThunkGenerator):
+ * ftl/FTLThunks.h:
+ (JSC::FTL::generateIfNecessary):
+ (JSC::FTL::Thunks::getSlowPathCallThunk):
+ * interpreter/FrameTracers.h:
+ (JSC::SlowPathFrameTracer::SlowPathFrameTracer):
+ (JSC::JITOperationPrologueCallFrameTracer::JITOperationPrologueCallFrameTracer):
+ (JSC::JITOperationPrologueCallFrameTracer::~JITOperationPrologueCallFrameTracer):
+ * jit/AssemblyHelpers.cpp:
+ (JSC::AssemblyHelpers::callExceptionFuzz):
+ (JSC::AssemblyHelpers::debugCall):
+ * jit/AssemblyHelpers.h:
+ (JSC::AssemblyHelpers::prepareCallOperation):
+ * jit/CCallHelpers.cpp:
+ (JSC::CCallHelpers::ensureShadowChickenPacket):
+ * jit/CCallHelpers.h:
+ (JSC::CCallHelpers::prepareCallOperation): Deleted.
+ * jit/JITOperations.cpp:
+ * jit/JITOperations.h:
+ * jit/Repatch.cpp:
+ (JSC::ftlThunkAwareRepatchCall):
+ * jit/ThunkGenerators.cpp:
+ (JSC::boundThisNoArgsFunctionCallGenerator):
+ * llint/LLIntSlowPaths.cpp:
+ (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+ (JSC::LLInt::handleHostCall):
+ * runtime/AtomicsObject.cpp:
+ (JSC::operationAtomicsAdd):
+ (JSC::operationAtomicsAnd):
+ (JSC::operationAtomicsCompareExchange):
+ (JSC::operationAtomicsExchange):
+ (JSC::operationAtomicsIsLockFree):
+ (JSC::operationAtomicsLoad):
+ (JSC::operationAtomicsOr):
+ (JSC::operationAtomicsStore):
+ (JSC::operationAtomicsSub):
+ (JSC::operationAtomicsXor):
+ * runtime/CommonSlowPaths.cpp:
+ (JSC::SLOW_PATH_DECL):
+ * runtime/StringPrototype.cpp:
+ (JSC::operationStringProtoFuncReplaceRegExpEmptyStr):
+ (JSC::operationStringProtoFuncReplaceRegExpString):
+ (JSC::operationStringProtoFuncReplaceGeneric):
+ * tools/JSDollarVM.cpp:
+ (IGNORE_WARNINGS_BEGIN):
+ * wasm/WasmAirIRGenerator.cpp:
+ (JSC::Wasm::AirIRGenerator::emitLoopTierUpCheck):
+ * wasm/WasmB3IRGenerator.cpp:
+ (JSC::Wasm::B3IRGenerator::emitLoopTierUpCheck):
+ * wasm/WasmOperations.cpp:
+ (JSC::Wasm::operationWasmThrowBadI64):
+ (JSC::Wasm::operationWasmTriggerOSREntryNow):
+ (JSC::Wasm::operationWasmTriggerTierUpNow):
+ (JSC::Wasm::operationThrowBadI64): Deleted.
+ (JSC::Wasm::triggerOSREntryNow): Deleted.
+ (JSC::Wasm::triggerTierUpNow): Deleted.
+ * wasm/WasmOperations.h:
+ * wasm/WasmThunks.cpp:
+ (JSC::Wasm::triggerOMGEntryTierUpThunkGenerator):
+ * wasm/js/JSWebAssembly.cpp:
+ (JSC::instantiate):
+ * wasm/js/WasmToJS.cpp:
+ (JSC::Wasm::handleBadI64Use):
+ (JSC::Wasm::operationWasmToJSException):
+ (JSC::Wasm::emitThrowWasmToJSException):
+ (JSC::Wasm::wasmToJSException): Deleted.
+ * wasm/js/WasmToJS.h:
+ * wasm/js/WebAssemblyInstanceConstructor.cpp:
+ (JSC::constructJSWebAssemblyInstance):
+
2019-10-23 Truitt Savell <tsavell@apple.com>
Unreviewed, rolling out r251482.
diff --git a/Source/JavaScriptCore/dfg/DFGOSRExit.cpp b/Source/JavaScriptCore/dfg/DFGOSRExit.cpp
index d0e0a5f..510a7ab 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExit.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOSRExit.cpp
@@ -956,7 +956,7 @@
return CodeLocationJump<JSInternalPtrTag>(m_patchableJumpLocation);
}
-void OSRExit::emitRestoreArguments(CCallHelpers& jit, const Operands<ValueRecovery>& operands)
+void OSRExit::emitRestoreArguments(CCallHelpers& jit, VM& vm, const Operands<ValueRecovery>& operands)
{
HashMap<MinifiedID, int> alreadyAllocatedArguments; // Maps phantom arguments node ID to operand.
for (size_t index = 0; index < operands.size(); ++index) {
@@ -1007,7 +1007,8 @@
static_assert(std::is_same<decltype(operationCreateDirectArgumentsDuringExit), decltype(operationCreateClonedArgumentsDuringExit)>::value, "We assume these functions have the same signature below.");
jit.setupArguments<decltype(operationCreateDirectArgumentsDuringExit)>(
- AssemblyHelpers::TrustedImmPtr(&jit.vm()), AssemblyHelpers::TrustedImmPtr(inlineCallFrame), GPRInfo::regT0, GPRInfo::regT1);
+ AssemblyHelpers::TrustedImmPtr(&vm), AssemblyHelpers::TrustedImmPtr(inlineCallFrame), GPRInfo::regT0, GPRInfo::regT1);
+ jit.prepareCallOperation(vm);
switch (recovery.technique()) {
case DirectArgumentsThatWereNotCreated:
jit.move(AssemblyHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationCreateDirectArgumentsDuringExit)), GPRInfo::nonArgGPR0);
@@ -1026,7 +1027,7 @@
}
}
-void JIT_OPERATION OSRExit::compileOSRExit(CallFrame* callFrame)
+void JIT_OPERATION operationCompileOSRExit(CallFrame* callFrame)
{
VM& vm = callFrame->deprecatedVM();
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -1087,7 +1088,7 @@
jit.add64(CCallHelpers::TrustedImm32(1), CCallHelpers::AbsoluteAddress(profilerExit->counterAddress()));
}
- compileExit(jit, vm, exit, operands, recovery);
+ OSRExit::compileExit(jit, vm, exit, operands, recovery);
LinkBuffer patchBuffer(jit, codeBlock);
exit.m_code = FINALIZE_CODE_IF(
@@ -1115,7 +1116,7 @@
debugInfo->kind = exit.m_kind;
debugInfo->bytecodeIndex = exit.m_codeOrigin.bytecodeIndex();
- jit.debugCall(vm, debugOperationPrintSpeculationFailure, debugInfo);
+ jit.debugCall(vm, operationDebugPrintSpeculationFailure, debugInfo);
}
// Perform speculation recovery. This only comes into play when an operation
@@ -1613,7 +1614,7 @@
// Note that we also roughly assume that the arguments might still be materialized outside of its
// inline call frame scope - but for now the DFG wouldn't do that.
- emitRestoreArguments(jit, operands);
+ emitRestoreArguments(jit, vm, operands);
// Adjust the old JIT's execute counter. Since we are exiting OSR, we know
// that all new calls into this code will go to the new JIT, so the execute
@@ -1651,7 +1652,7 @@
// counter to 0; otherwise we set the counter to
// counterValueForOptimizeAfterWarmUp().
- handleExitCounts(jit, exit);
+ handleExitCounts(vm, jit, exit);
// Reify inlined call frames.
@@ -1661,7 +1662,7 @@
adjustAndJumpToTarget(vm, jit, exit);
}
-void JIT_OPERATION OSRExit::debugOperationPrintSpeculationFailure(CallFrame* callFrame, void* debugInfoRaw, void* scratch)
+void JIT_OPERATION operationDebugPrintSpeculationFailure(CallFrame* callFrame, void* debugInfoRaw, void* scratch)
{
VM& vm = callFrame->deprecatedVM();
NativeCallFrameTracer tracer(vm, callFrame);
diff --git a/Source/JavaScriptCore/dfg/DFGOSRExit.h b/Source/JavaScriptCore/dfg/DFGOSRExit.h
index d1fc5f1..a7e5878 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExit.h
+++ b/Source/JavaScriptCore/dfg/DFGOSRExit.h
@@ -138,6 +138,9 @@
Profiler::OSRExit* profilerExit { nullptr };
};
+void JIT_OPERATION operationCompileOSRExit(CallFrame*) WTF_INTERNAL;
+void JIT_OPERATION operationDebugPrintSpeculationFailure(CallFrame*, void*, void*) WTF_INTERNAL;
+
// === OSRExit ===
//
// This structure describes how to exit the speculative path by
@@ -145,7 +148,8 @@
struct OSRExit : public OSRExitBase {
OSRExit(ExitKind, JSValueSource, MethodOfGettingAValueProfile, SpeculativeJIT*, unsigned streamIndex, unsigned recoveryIndex = UINT_MAX);
- static void JIT_OPERATION compileOSRExit(CallFrame*) WTF_INTERNAL;
+ friend void JIT_OPERATION operationCompileOSRExit(CallFrame*);
+
static void executeOSRExit(Probe::Context&);
CodeLocationLabel<JSInternalPtrTag> m_patchableJumpLocation;
@@ -168,8 +172,8 @@
private:
static void compileExit(CCallHelpers&, VM&, const OSRExit&, const Operands<ValueRecovery>&, SpeculationRecovery*);
- static void emitRestoreArguments(CCallHelpers&, const Operands<ValueRecovery>&);
- static void JIT_OPERATION debugOperationPrintSpeculationFailure(CallFrame*, void*, void*) WTF_INTERNAL;
+ static void emitRestoreArguments(CCallHelpers&, VM&, const Operands<ValueRecovery>&);
+ friend void JIT_OPERATION operationDebugPrintSpeculationFailure(CallFrame*, void*, void*);
};
struct SpeculationFailureDebugInfo {
diff --git a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp
index 54877b9..01ee1b7 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.cpp
@@ -39,7 +39,7 @@
namespace JSC { namespace DFG {
-void handleExitCounts(CCallHelpers& jit, const OSRExitBase& exit)
+void handleExitCounts(VM& vm, CCallHelpers& jit, const OSRExitBase& exit)
{
if (!exitKindMayJettison(exit.m_kind)) {
// FIXME: We may want to notice that we're frequently exiting
@@ -103,8 +103,9 @@
reoptimizeNow.link(&jit);
- jit.setupArguments<decltype(triggerReoptimizationNow)>(GPRInfo::regT0, GPRInfo::regT3, AssemblyHelpers::TrustedImmPtr(&exit));
- jit.move(AssemblyHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(triggerReoptimizationNow)), GPRInfo::nonArgGPR0);
+ jit.setupArguments<decltype(operationTriggerReoptimizationNow)>(GPRInfo::regT0, GPRInfo::regT3, AssemblyHelpers::TrustedImmPtr(&exit));
+ jit.prepareCallOperation(vm);
+ jit.move(AssemblyHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationTriggerReoptimizationNow)), GPRInfo::nonArgGPR0);
jit.call(GPRInfo::nonArgGPR0, OperationPtrTag);
AssemblyHelpers::Jump doneAdjusting = jit.jump();
@@ -339,6 +340,7 @@
AssemblyHelpers::Jump ownerIsRememberedOrInEden = jit.barrierBranchWithoutFence(owner);
jit.setupArguments<decltype(operationOSRWriteBarrier)>(&vm, owner);
+ jit.prepareCallOperation(vm);
jit.move(MacroAssembler::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationOSRWriteBarrier)), scratch);
jit.call(scratch, OperationPtrTag);
diff --git a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h
index 4fc996f..c85094c 100644
--- a/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h
+++ b/Source/JavaScriptCore/dfg/DFGOSRExitCompilerCommon.h
@@ -36,7 +36,7 @@
namespace JSC { namespace DFG {
-void handleExitCounts(CCallHelpers&, const OSRExitBase&);
+void handleExitCounts(VM&, CCallHelpers&, const OSRExitBase&);
void reifyInlinedCallFrames(CCallHelpers&, const OSRExitBase&);
void adjustAndJumpToTarget(VM&, CCallHelpers&, const OSRExitBase&);
void* callerReturnPC(CodeBlock* baselineCodeBlockForCaller, BytecodeIndex callBytecodeIndex, InlineCallFrame::Kind callerKind, bool& callerIsLLInt);
diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp
index 6aee554..70efd6b 100644
--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp
@@ -293,7 +293,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(JSValue::decode(encodedOp).toThis(globalObject, NotStrictMode));
}
@@ -302,7 +302,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(JSValue::decode(encodedOp).toThis(globalObject, StrictMode));
}
@@ -311,7 +311,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* object = JSValue::decode(encodedObject).toObject(globalObject);
@@ -324,7 +324,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return ownPropertyKeys(globalObject, object, PropertyNameMode::Strings, DontEnumPropertiesMode::Exclude);
}
@@ -332,7 +332,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue prototype = JSValue::decode(encodedPrototype);
@@ -351,7 +351,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return constructEmptyObject(globalObject, prototype);
}
@@ -359,7 +359,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
if (constructor->type() == JSFunctionType && jsCast<JSFunction*>(constructor)->canUseAllocationProfile()) {
auto rareData = jsCast<JSFunction*>(constructor)->ensureRareDataAndAllocationProfile(globalObject, inlineCapacity);
@@ -388,7 +388,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Structure* structure = InternalFunction::createSubclassStructure(globalObject, globalObject->promiseConstructor(), constructor, globalObject->promiseStructure());
RETURN_IF_EXCEPTION(scope, nullptr);
@@ -399,7 +399,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Structure* structure = InternalFunction::createSubclassStructure(globalObject, globalObject->internalPromiseConstructor(), constructor, globalObject->internalPromiseStructure());
RETURN_IF_EXCEPTION(scope, nullptr);
@@ -410,7 +410,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Structure* structure = InternalFunction::createSubclassStructure(globalObject, nullptr, constructor, globalObject->generatorStructure());
RETURN_IF_EXCEPTION(scope, nullptr);
@@ -421,7 +421,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Structure* structure = InternalFunction::createSubclassStructure(globalObject, nullptr, constructor, globalObject->asyncGeneratorStructure());
RETURN_IF_EXCEPTION(scope, nullptr);
@@ -432,7 +432,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue value = JSValue::decode(encodedTarget);
ASSERT(!value.isObject());
@@ -446,7 +446,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue value = JSValue::decode(encodedTarget);
@@ -466,7 +466,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::remainder(globalObject, left, right);
@@ -483,7 +483,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -501,7 +501,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::bitwiseAnd(globalObject, left, right);
@@ -518,7 +518,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::bitwiseOr(globalObject, left, right);
@@ -535,7 +535,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::bitwiseXor(globalObject, left, right);
@@ -552,7 +552,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::leftShift(globalObject, left, right);
@@ -569,7 +569,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::signedRightShift(globalObject, left, right);
@@ -586,7 +586,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -603,7 +603,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -615,7 +615,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::divide(globalObject, left, right);
@@ -632,7 +632,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto bigIntOp = [] (JSGlobalObject* globalObject, JSBigInt* left, JSBigInt* right) -> JSBigInt* {
return JSBigInt::exponentiate(globalObject, left, right);
@@ -649,7 +649,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -662,7 +662,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -675,7 +675,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -689,7 +689,7 @@
{ \
VM& vm = globalObject->vm(); \
CallFrame* callFrame = DECLARE_CALL_FRAME(vm); \
- NativeCallFrameTracer tracer(vm, callFrame); \
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame); \
auto scope = DECLARE_THROW_SCOPE(vm); \
JSValue op1 = JSValue::decode(encodedOp1); \
double result = op1.toNumber(globalObject); \
@@ -703,7 +703,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue op1 = JSValue::decode(encodedOp1);
@@ -716,7 +716,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -729,7 +729,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -742,7 +742,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -755,7 +755,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -782,7 +782,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
@@ -824,7 +824,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue property = JSValue::decode(encodedProperty);
@@ -870,7 +870,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return getByValCellInt(globalObject, vm, base, index);
}
@@ -879,7 +879,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return getByValCellInt(globalObject, vm, base, index);
}
@@ -888,7 +888,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -902,7 +902,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto propertyName = asSymbol(symbol)->privateName();
return JSValue::encode(getByValObject(globalObject, vm, asObject(base), propertyName));
@@ -912,7 +912,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<true, false>(globalObject, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -921,7 +921,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<false, false>(globalObject, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -930,7 +930,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<true, false>(globalObject, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -939,7 +939,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<false, false>(globalObject, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -948,7 +948,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValCellStringInternal<true, false>(globalObject, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -957,7 +957,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValCellStringInternal<false, false>(globalObject, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -966,7 +966,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<true, false>(globalObject, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -976,7 +976,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<false, false>(globalObject, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -986,7 +986,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (index >= 0) {
object->putByIndexInline(globalObject, index, JSValue::decode(encodedValue), true);
@@ -1002,7 +1002,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (index >= 0) {
object->putByIndexInline(globalObject, index, JSValue::decode(encodedValue), false);
@@ -1018,7 +1018,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -1036,7 +1036,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -1054,7 +1054,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -1071,7 +1071,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue jsValue = JSValue(JSValue::EncodeAsDouble, value);
@@ -1088,7 +1088,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<true, true>(globalObject, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -1097,7 +1097,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<false, true>(globalObject, vm, encodedBase, encodedProperty, encodedValue);
}
@@ -1106,7 +1106,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<true, true>(globalObject, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -1115,7 +1115,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValInternal<false, true>(globalObject, vm, JSValue::encode(cell), encodedProperty, encodedValue);
}
@@ -1124,7 +1124,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValCellStringInternal<true, true>(globalObject, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -1133,7 +1133,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putByValCellStringInternal<false, true>(globalObject, vm, cell, asString(string), JSValue::decode(encodedValue));
}
@@ -1142,7 +1142,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<true, true>(globalObject, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -1152,7 +1152,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto propertyName = asSymbol(symbol)->privateName();
putByValCellInternal<false, true>(globalObject, vm, cell, propertyName, JSValue::decode(encodedValue));
@@ -1162,7 +1162,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (index >= 0) {
object->putDirectIndex(globalObject, index, JSValue::decode(encodedValue), 0, PutDirectIndexShouldThrow);
return;
@@ -1176,7 +1176,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (index >= 0) {
object->putDirectIndex(globalObject, index, JSValue::decode(encodedValue));
@@ -1191,7 +1191,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
array->pushInline(globalObject, JSValue::decode(encodedValue));
return JSValue::encode(jsNumber(array->length()));
@@ -1201,7 +1201,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
array->pushInline(globalObject, JSValue(JSValue::EncodeAsDouble, value));
return JSValue::encode(jsNumber(array->length()));
@@ -1211,7 +1211,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
// We assume that multiple JSArray::push calls with ArrayWithInt32/ArrayWithContiguous do not cause JS traps.
@@ -1236,7 +1236,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
// We assume that multiple JSArray::push calls with ArrayWithDouble do not cause JS traps.
@@ -1257,7 +1257,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(array->pop(globalObject));
}
@@ -1266,7 +1266,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
array->butterfly()->setPublicLength(array->butterfly()->publicLength() + 1);
@@ -1279,7 +1279,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(regExpObject->execInline(globalObject, argument));
}
@@ -1290,7 +1290,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -1308,7 +1308,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue base = JSValue::decode(encodedBase);
@@ -1331,7 +1331,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -1355,7 +1355,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (!regExpObject->regExp()->global())
return JSValue::encode(regExpObject->execInline(globalObject, argument));
@@ -1368,7 +1368,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -1397,7 +1397,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return toStringView(globalObject, JSValue::decode(value), [&] (StringView view) {
// This version is as if radix was undefined. Hence, undefined.toNumber() === 0.
@@ -1409,7 +1409,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
auto viewWithString = string->viewWithUnderlyingString(globalObject);
@@ -1423,7 +1423,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
auto viewWithString = string->viewWithUnderlyingString(globalObject);
@@ -1436,7 +1436,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return toStringView(globalObject, JSValue::decode(value), [&] (StringView view) {
return parseIntResult(parseInt(view, radix));
@@ -1449,7 +1449,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return regExpObject->testInline(globalObject, input);
}
@@ -1460,7 +1460,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue argument = JSValue::decode(encodedArgument);
@@ -1476,7 +1476,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue base = JSValue::decode(encodedBase);
@@ -1499,7 +1499,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1511,7 +1511,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* operand = jsCast<JSBigInt*>(op1);
@@ -1522,7 +1522,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1534,7 +1534,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1546,7 +1546,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1558,7 +1558,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1570,7 +1570,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1582,7 +1582,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1594,7 +1594,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1606,7 +1606,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1618,7 +1618,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1630,7 +1630,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSBigInt* leftOperand = jsCast<JSBigInt*>(op1);
JSBigInt* rightOperand = jsCast<JSBigInt*>(op2);
@@ -1642,7 +1642,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::strictEqualSlowCaseInline(globalObject, op1, op2);
}
@@ -1651,7 +1651,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return sameValue(globalObject, JSValue::decode(arg1), JSValue::decode(arg2));
}
@@ -1660,7 +1660,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(JSValue::decode(value).toPrimitive(globalObject));
}
@@ -1669,7 +1669,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsNumber(JSValue::decode(value).toNumber(globalObject)));
}
@@ -1678,7 +1678,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
@@ -1718,7 +1718,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putWithThis<true>(globalObject, encodedBase, encodedThis, encodedValue, Identifier::fromUid(vm, impl));
}
@@ -1727,7 +1727,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putWithThis<false>(globalObject, encodedBase, encodedThis, encodedValue, Identifier::fromUid(vm, impl));
}
@@ -1736,7 +1736,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(globalObject);
@@ -1749,7 +1749,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(globalObject);
@@ -1772,7 +1772,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = JSValue::decode(encodedProperty).toPropertyKey(globalObject);
@@ -1785,7 +1785,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = property->toIdentifier(globalObject);
@@ -1798,7 +1798,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
defineDataProperty(globalObject, vm, base, Identifier::fromUid(vm, property), JSValue::decode(encodedValue), attributes);
}
@@ -1806,7 +1806,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
defineDataProperty(globalObject, vm, base, Identifier::fromUid(property->privateName()), JSValue::decode(encodedValue), attributes);
}
@@ -1824,7 +1824,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = JSValue::decode(encodedProperty).toPropertyKey(globalObject);
@@ -1836,7 +1836,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier propertyName = property->toIdentifier(globalObject);
@@ -1848,7 +1848,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
defineAccessorProperty(globalObject, vm, base, Identifier::fromUid(vm, property), getter, setter, attributes);
}
@@ -1856,7 +1856,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
defineAccessorProperty(globalObject, vm, base, Identifier::fromUid(property->privateName()), getter, setter, attributes);
}
@@ -1864,7 +1864,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return bitwise_cast<char*>(constructArray(globalObject, arrayStructure, static_cast<JSValue*>(buffer), size));
}
@@ -1873,7 +1873,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return bitwise_cast<char*>(JSArray::create(vm, arrayStructure));
}
@@ -1882,7 +1882,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
if (UNLIKELY(size < 0))
@@ -1900,7 +1900,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
if (UNLIKELY(size < 0))
@@ -1920,7 +1920,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(!arrayStructure->outOfLineCapacity());
auto* immutableButterfly = jsCast<JSImmutableButterfly*>(immutableButterflyCell);
ASSERT(arrayStructure->indexingMode() == immutableButterfly->indexingMode() || hasAnyArrayStorage(arrayStructure->indexingMode()));
@@ -1935,7 +1935,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSInt8Array>(globalObject, vm, structure, length, vector);
}
@@ -1944,7 +1944,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt8Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1953,7 +1953,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSInt16Array>(globalObject, vm, structure, length, vector);
}
@@ -1962,7 +1962,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt16Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1971,7 +1971,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSInt32Array>(globalObject, vm, structure, length, vector);
}
@@ -1980,7 +1980,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSInt32Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -1989,7 +1989,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSUint8Array>(globalObject, vm, structure, length, vector);
}
@@ -1998,7 +1998,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -2007,7 +2007,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSUint8ClampedArray>(globalObject, vm, structure, length, vector);
}
@@ -2016,7 +2016,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint8ClampedArray>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -2025,7 +2025,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSUint16Array>(globalObject, vm, structure, length, vector);
}
@@ -2034,7 +2034,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint16Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -2043,7 +2043,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSUint32Array>(globalObject, vm, structure, length, vector);
}
@@ -2052,7 +2052,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSUint32Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -2061,7 +2061,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSFloat32Array>(globalObject, vm, structure, length, vector);
}
@@ -2070,7 +2070,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat32Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -2079,7 +2079,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newTypedArrayWithSize<JSFloat64Array>(globalObject, vm, structure, length, vector);
}
@@ -2088,7 +2088,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(constructGenericTypedArrayViewWithArguments<JSFloat64Array>(globalObject, structure, encodedValue, 0, WTF::nullopt));
}
@@ -2096,7 +2096,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue initialValue = JSValue::decode(initialValueEncoded);
ASSERT(initialValue == jsUndefined() || initialValue == jsTDZValue());
return JSLexicalEnvironment::create(vm, structure, scope, table, initialValue);
@@ -2106,7 +2106,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
DirectArguments* result = DirectArguments::create(
vm, structure, length, std::max(length, minCapacity));
// The caller will store to this object without barriers. Most likely, at this point, this is
@@ -2120,7 +2120,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
// We could pass the ScopedArgumentsTable* as an argument. We currently don't because I
// didn't feel like changing the max number of arguments for a slow path call from 6 to 7.
@@ -2134,7 +2134,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return ClonedArguments::createByCopyingFrom(
globalObject, structure, argumentStart, length, callee);
}
@@ -2143,7 +2143,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
DeferGCForAWhile deferGC(vm.heap);
@@ -2173,7 +2173,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
DeferGCForAWhile deferGC(vm.heap);
@@ -2202,7 +2202,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Structure* structure = globalObject->restParameterStructure();
static_assert(sizeof(Register) == sizeof(JSValue), "This is a strong assumption here.");
@@ -2214,7 +2214,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -2229,7 +2229,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -2244,7 +2244,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -2259,7 +2259,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(jsDynamicCast<JSObject*>(vm, object));
@@ -2274,7 +2274,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(
Butterfly::createUninitialized(vm, 0, 0, initialOutOfLineCapacity, false, 0));
@@ -2284,7 +2284,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(
Butterfly::createUninitialized(vm, 0, 0, newSize, false, 0));
@@ -2294,7 +2294,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(!object->structure(vm)->outOfLineCapacity());
return reinterpret_cast<char*>(
@@ -2305,7 +2305,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(
object->allocateMoreOutOfLineStorage(vm, object->structure(vm)->outOfLineCapacity(), newSize));
@@ -2315,7 +2315,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (!cell->isObject())
return 0;
@@ -2329,7 +2329,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (!cell->isObject())
return 0;
@@ -2343,7 +2343,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (!cell->isObject())
return 0;
@@ -2357,7 +2357,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (!cell->isObject())
return 0;
@@ -2371,7 +2371,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBaseValue);
@@ -2391,7 +2391,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSObject* object = baseCell->toObject(globalObject);
if (UNLIKELY(subscript < 0)) {
// Go the slowest way possible because negative indices don't use indexed storage.
@@ -2404,7 +2404,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue base = JSValue::decode(encodedBase);
@@ -2421,7 +2421,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* base = cell->toObject(globalObject);
@@ -2434,7 +2434,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsString(vm, Identifier::from(vm, index).string());
}
@@ -2442,7 +2442,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
RegExp* regexp = static_cast<RegExp*>(regexpPtr);
ASSERT(regexp->isValid());
@@ -2453,7 +2453,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return string->value(globalObject).impl();
}
@@ -2462,7 +2462,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue argument = JSValue::decode(encodedArgument);
@@ -2481,7 +2481,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsSubstring(vm, globalObject, jsCast<JSString*>(cell), from, span);
}
@@ -2490,7 +2490,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSString* string = asString(cell);
static_assert(static_cast<uint64_t>(JSString::MaxLength) <= static_cast<uint64_t>(std::numeric_limits<int32_t>::max()), "");
@@ -2501,7 +2501,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2520,7 +2520,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2536,7 +2536,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2552,7 +2552,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
@@ -2568,7 +2568,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(int32ToString(vm, value, radix));
}
@@ -2577,7 +2577,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(int52ToString(vm, value, radix));
}
@@ -2586,7 +2586,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return reinterpret_cast<char*>(numberToString(vm, value, radix));
}
@@ -2595,7 +2595,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsSingleCharacterString(vm, static_cast<UChar>(character));
}
@@ -2604,7 +2604,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return Symbol::create(vm);
}
@@ -2613,7 +2613,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
String string = description->value(globalObject);
@@ -2626,7 +2626,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return StringObject::create(vm, structure, string);
}
@@ -2635,7 +2635,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue(cell).toString(globalObject);
}
@@ -2644,7 +2644,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::decode(value).toString(globalObject);
}
@@ -2653,7 +2653,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return stringConstructor(globalObject, cell);
}
@@ -2662,7 +2662,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return stringConstructor(globalObject, JSValue::decode(value));
}
@@ -2671,7 +2671,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsString(globalObject, left, right);
}
@@ -2680,7 +2680,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsString(globalObject, a, b, c);
}
@@ -2689,7 +2689,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
ASSERT(!JSValue::decode(a).isSymbol());
@@ -2706,7 +2706,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
ASSERT(!JSValue::decode(a).isSymbol());
@@ -2726,7 +2726,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
CodeBlock* codeBlock = callFrame->codeBlock();
SimpleJumpTable& table = codeBlock->switchJumpTable(tableIndex);
JSValue value = JSValue::decode(encodedValue);
@@ -2742,7 +2742,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
StringImpl* strImpl = string->value(globalObject).impl();
@@ -2756,7 +2756,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
StringImpl* strImpl = string->value(globalObject).impl();
@@ -2790,7 +2790,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return codePointCompareLessThan(asString(a)->value(globalObject), asString(b)->value(globalObject));
}
@@ -2799,7 +2799,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return !codePointCompareLessThan(asString(b)->value(globalObject), asString(a)->value(globalObject));
}
@@ -2808,7 +2808,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return codePointCompareLessThan(asString(b)->value(globalObject), asString(a)->value(globalObject));
}
@@ -2817,7 +2817,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return !codePointCompareLessThan(asString(a)->value(globalObject), asString(b)->value(globalObject));
}
@@ -2826,7 +2826,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
set->touch(vm, "Executed NotifyWrite");
}
@@ -2835,7 +2835,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
throwStackOverflowError(globalObject, scope);
}
@@ -2844,7 +2844,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue arguments = JSValue::decode(encodedArguments);
return sizeOfVarargs(globalObject, arguments, firstVarArgOffset);
@@ -2854,7 +2854,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue key = JSValue::decode(encodedKey);
@@ -2875,7 +2875,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return NumberConstructor::isIntegerImpl(JSValue::decode(value));
}
@@ -2883,7 +2883,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
int32_t length = butterfly->publicLength();
@@ -2908,7 +2908,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue searchElement = JSValue::decode(encodedValue);
@@ -2931,7 +2931,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue searchElement = JSValue::decode(encodedValue);
@@ -2953,7 +2953,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue arguments = JSValue::decode(encodedArguments);
loadVarargs(globalObject, callFrame, VirtualRegister(firstElementDest), arguments, offset, length);
@@ -2978,7 +2978,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSC::stringFromCharCode(globalObject, op1);
}
@@ -2986,7 +2986,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue charValue = JSValue::decode(encodedValue);
int32_t chInt = charValue.toUInt32(globalObject);
return JSValue::encode(JSC::stringFromCharCode(globalObject, chInt));
@@ -3009,7 +3009,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (!butterfly
&& (structure->outOfLineCapacity() || hasIndexedProperties(structure->indexingType()))) {
@@ -3031,7 +3031,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
if (!butterfly) {
butterfly = Butterfly::create(
@@ -3046,7 +3046,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
IndexingHeader header;
header.setVectorLength(length);
@@ -3068,7 +3068,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
EncodedJSValue* values = static_cast<EncodedJSValue*>(buffer);
@@ -3126,7 +3126,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
if (JSFixedArray* result = JSFixedArray::tryCreate(vm, vm.fixedArrayStructure.get(), length))
@@ -3140,7 +3140,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
@@ -3175,7 +3175,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(isJSArray(cell));
JSArray* array = jsCast<JSArray*>(cell);
@@ -3188,7 +3188,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
vm.typeProfilerLog()->processLogEntries(vm, "Log Full, called from inside DFG."_s);
}
@@ -3197,7 +3197,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue resolvedScope = JSScope::resolveScopeForHoistingFuncDeclInEval(globalObject, scope, Identifier::fromUid(vm, impl));
return JSValue::encode(resolvedScope);
@@ -3207,7 +3207,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSObject* resolvedScope = JSScope::resolve(globalObject, scope, Identifier::fromUid(vm, impl));
return resolvedScope;
@@ -3217,7 +3217,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, impl);
@@ -3277,7 +3277,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
constexpr bool isStrictMode = true;
return putDynamicVar(globalObject, vm, scope, value, impl, getPutInfoBits, isStrictMode);
}
@@ -3286,7 +3286,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
constexpr bool isStrictMode = false;
return putDynamicVar(globalObject, vm, scope, value, impl, getPutInfoBits, isStrictMode);
}
@@ -3295,7 +3295,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsMapHash(globalObject, vm, JSValue::decode(input));
}
@@ -3304,7 +3304,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSMap::BucketType** bucket = jsCast<JSMap*>(map)->findBucket(globalObject, JSValue::decode(key), hash);
if (!bucket)
return vm.sentinelMapBucket();
@@ -3315,7 +3315,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSSet::BucketType** bucket = jsCast<JSSet*>(map)->findBucket(globalObject, JSValue::decode(key), hash);
if (!bucket)
return vm.sentinelSetBucket();
@@ -3326,7 +3326,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto* bucket = jsCast<JSSet*>(set)->addNormalized(globalObject, JSValue::decode(key), JSValue(), hash);
if (!bucket)
return vm.sentinelSetBucket();
@@ -3337,7 +3337,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto* bucket = jsCast<JSMap*>(map)->addNormalized(globalObject, JSValue::decode(key), JSValue::decode(value), hash);
if (!bucket)
return vm.sentinelMapBucket();
@@ -3348,7 +3348,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
jsCast<JSWeakSet*>(set)->add(vm, asObject(key), JSValue(), hash);
}
@@ -3356,7 +3356,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
jsCast<JSWeakMap*>(map)->add(vm, asObject(key), JSValue::decode(value), hash);
}
@@ -3364,7 +3364,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(thisObject->getPrototype(vm, globalObject));
}
@@ -3372,7 +3372,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue thisValue = JSValue::decode(encodedValue).toThis(globalObject, StrictMode);
@@ -3395,7 +3395,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
scope.throwException(globalObject, JSValue::decode(valueToThrow));
}
@@ -3404,7 +3404,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
String errorMessage = message->value(globalObject);
scope.throwException(globalObject, createError(globalObject, static_cast<ErrorType>(errorType), errorMessage));
@@ -3415,7 +3415,7 @@
JSGlobalObject* globalObject = callee->globalObject();
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeSpecializationKind kind = callLinkInfo->specializationKind();
@@ -3462,7 +3462,7 @@
linkDirectFor(callFrame, *callLinkInfo, codeBlock, codePtr);
}
-extern "C" void JIT_OPERATION triggerReoptimizationNow(CodeBlock* codeBlock, CodeBlock* optimizedCodeBlock, OSRExitBase* exit)
+void triggerReoptimizationNow(CodeBlock* codeBlock, CodeBlock* optimizedCodeBlock, OSRExitBase* exit)
{
// It's sort of preferable that we don't GC while in here. Anyways, doing so wouldn't
// really be profitable.
@@ -3518,6 +3518,11 @@
optimizedCodeBlock->jettison(Profiler::JettisonDueToOSRExit, CountReoptimization);
}
+void JIT_OPERATION operationTriggerReoptimizationNow(CodeBlock* codeBlock, CodeBlock* optimizedCodeBlock, OSRExitBase* exit)
+{
+ triggerReoptimizationNow(codeBlock, optimizedCodeBlock, exit);
+}
+
#if ENABLE(FTL_JIT)
static bool shouldTriggerFTLCompile(CodeBlock* codeBlock, JITCode* jitCode)
{
@@ -3591,11 +3596,11 @@
codeBlock, CompilationDeferred);
}
-void JIT_OPERATION triggerTierUpNow(VM* vmPointer)
+void JIT_OPERATION operationTriggerTierUpNow(VM* vmPointer)
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
DeferGCForAWhile deferGC(vm.heap);
CodeBlock* codeBlock = callFrame->codeBlock();
@@ -3850,11 +3855,11 @@
return retagCodePtr<char*>(address, JSEntryPtrTag, bitwise_cast<PtrTag>(callFrame));
}
-void JIT_OPERATION triggerTierUpNowInLoop(VM* vmPointer, unsigned bytecodeIndexBits)
+void JIT_OPERATION operationTriggerTierUpNowInLoop(VM* vmPointer, unsigned bytecodeIndexBits)
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
DeferGCForAWhile deferGC(vm.heap);
CodeBlock* codeBlock = callFrame->codeBlock();
BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
@@ -3886,11 +3891,11 @@
}
}
-char* JIT_OPERATION triggerOSREntryNow(VM* vmPointer, unsigned bytecodeIndexBits)
+char* JIT_OPERATION operationTriggerOSREntryNow(VM* vmPointer, unsigned bytecodeIndexBits)
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
DeferGCForAWhile deferGC(vm.heap);
CodeBlock* codeBlock = callFrame->codeBlock();
BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
diff --git a/Source/JavaScriptCore/dfg/DFGOperations.h b/Source/JavaScriptCore/dfg/DFGOperations.h
index 94f4c82..2564d9f 100644
--- a/Source/JavaScriptCore/dfg/DFGOperations.h
+++ b/Source/JavaScriptCore/dfg/DFGOperations.h
@@ -296,16 +296,17 @@
void JIT_OPERATION operationProcessTypeProfilerLogDFG(VM*) WTF_INTERNAL;
-void JIT_OPERATION triggerReoptimizationNow(CodeBlock* baselineCodeBlock, CodeBlock* optiimzedCodeBlock, OSRExitBase*) WTF_INTERNAL;
+void JIT_OPERATION operationTriggerReoptimizationNow(CodeBlock* baselineCodeBlock, CodeBlock* optiimzedCodeBlock, OSRExitBase*) WTF_INTERNAL;
+void triggerReoptimizationNow(CodeBlock* baselineCodeBlock, CodeBlock* optiimzedCodeBlock, OSRExitBase*); // This is not JIT_OPERATION.
#if USE(JSVALUE32_64)
double JIT_OPERATION operationRandom(JSGlobalObject*);
#endif
#if ENABLE(FTL_JIT)
-void JIT_OPERATION triggerTierUpNow(VM*) WTF_INTERNAL;
-void JIT_OPERATION triggerTierUpNowInLoop(VM*, unsigned bytecodeIndexBits) WTF_INTERNAL;
-char* JIT_OPERATION triggerOSREntryNow(VM*, unsigned bytecodeIndexBits) WTF_INTERNAL;
+void JIT_OPERATION operationTriggerTierUpNow(VM*) WTF_INTERNAL;
+void JIT_OPERATION operationTriggerTierUpNowInLoop(VM*, unsigned bytecodeIndexBits) WTF_INTERNAL;
+char* JIT_OPERATION operationTriggerOSREntryNow(VM*, unsigned bytecodeIndexBits) WTF_INTERNAL;
#endif // ENABLE(FTL_JIT)
} // extern "C"
diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
index f7579fc..142c7e0 100644
--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
+++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
@@ -5085,7 +5085,7 @@
callTierUp.link(&m_jit);
silentSpill(savePlans);
- callOperation(triggerTierUpNowInLoop, &vm(), TrustedImm32(bytecodeIndex.asBits()));
+ callOperation(operationTriggerTierUpNowInLoop, &vm(), TrustedImm32(bytecodeIndex.asBits()));
silentFill(savePlans);
m_jit.jump().linkTo(toNextOperation, &m_jit);
@@ -5100,7 +5100,7 @@
MacroAssembler::AbsoluteAddress(&m_jit.jitCode()->tierUpCounter.m_counter));
silentSpillAllRegisters(InvalidGPRReg);
- callOperation(triggerTierUpNow, &vm());
+ callOperation(operationTriggerTierUpNow, &vm());
silentFillAllRegisters();
done.link(&m_jit);
@@ -5138,7 +5138,7 @@
overflowedCounter.link(&m_jit);
silentSpill(savePlans);
- callOperation(triggerOSREntryNow, tempGPR, &vm(), TrustedImm32(bytecodeIndex.asBits()));
+ callOperation(operationTriggerOSREntryNow, tempGPR, &vm(), TrustedImm32(bytecodeIndex.asBits()));
if (savePlans.isEmpty())
m_jit.branchTestPtr(MacroAssembler::Zero, tempGPR).linkTo(toNextOperation, &m_jit);
diff --git a/Source/JavaScriptCore/dfg/DFGThunks.cpp b/Source/JavaScriptCore/dfg/DFGThunks.cpp
index 9d09fe7..6acafbf 100644
--- a/Source/JavaScriptCore/dfg/DFGThunks.cpp
+++ b/Source/JavaScriptCore/dfg/DFGThunks.cpp
@@ -42,7 +42,7 @@
MacroAssemblerCodeRef<JITThunkPtrTag> osrExitThunkGenerator(VM& vm)
{
- MacroAssembler jit;
+ CCallHelpers jit(nullptr);
jit.probe(OSRExit::executeOSRExit, &vm);
LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "DFG OSR exit thunk");
@@ -50,7 +50,7 @@
MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM& vm)
{
- MacroAssembler jit;
+ CCallHelpers jit(nullptr);
// This needs to happen before we use the scratch buffer because this function also uses the scratch buffer.
adjustFrameAndStackInOSRExitCompilerThunk<DFG::JITCode>(jit, vm, JITType::DFGJIT);
@@ -77,6 +77,7 @@
// Set up one argument.
jit.move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
+ jit.prepareCallOperation(vm);
MacroAssembler::Call functionCall = jit.call(OperationPtrTag);
@@ -99,7 +100,7 @@
LinkBuffer patchBuffer(jit, GLOBAL_THUNK_ID);
- patchBuffer.link(functionCall, FunctionPtr<OperationPtrTag>(OSRExit::compileOSRExit));
+ patchBuffer.link(functionCall, FunctionPtr<OperationPtrTag>(operationCompileOSRExit));
return FINALIZE_CODE(patchBuffer, JITThunkPtrTag, "DFG OSR exit generation thunk");
}
diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
index 8a00d96..60b004f 100644
--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
+++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
@@ -8845,6 +8845,7 @@
CCallHelpers::Jump dontThrow = jit.jump();
slowCase.link(&jit);
jit.setupArguments<decltype(operationThrowStackOverflowForVarargs)>(jit.codeBlock()->globalObjectFor(node->origin.semantic));
+ jit.prepareCallOperation(jit.vm());
callWithExceptionCheck(bitwise_cast<void*>(operationThrowStackOverflowForVarargs));
jit.abortWithReason(DFGVarargsThrowingPathDidNotThrow);
@@ -9111,6 +9112,7 @@
CCallHelpers::Jump done = jit.jump();
slowCase.link(&jit);
jit.setupArguments<decltype(operationThrowStackOverflowForVarargs)>(jit.codeBlock()->globalObjectFor(node->origin.semantic));
+ jit.prepareCallOperation(jit.vm());
callWithExceptionCheck(bitwise_cast<void*>(operationThrowStackOverflowForVarargs));
jit.abortWithReason(DFGVarargsThrowingPathDidNotThrow);
@@ -9118,6 +9120,7 @@
} else {
jit.move(CCallHelpers::TrustedImm32(originalStackHeight / sizeof(EncodedJSValue)), scratchGPR1);
jit.setupArguments<decltype(operationSizeFrameForVarargs)>(jit.codeBlock()->globalObjectFor(node->origin.semantic), argumentsGPR, scratchGPR1, CCallHelpers::TrustedImm32(data->firstVarArgOffset));
+ jit.prepareCallOperation(jit.vm());
callWithExceptionCheck(bitwise_cast<void*>(operationSizeFrameForVarargs));
jit.move(GPRInfo::returnValueGPR, scratchGPR1);
@@ -9126,6 +9129,7 @@
emitSetVarargsFrame(jit, scratchGPR1, false, scratchGPR2, scratchGPR2);
jit.addPtr(CCallHelpers::TrustedImm32(-minimumJSCallAreaSize), scratchGPR2, CCallHelpers::stackPointerRegister);
jit.setupArguments<decltype(operationSetupVarargsFrame)>(jit.codeBlock()->globalObjectFor(node->origin.semantic), scratchGPR2, argumentsGPR, CCallHelpers::TrustedImm32(data->firstVarArgOffset), scratchGPR1);
+ jit.prepareCallOperation(jit.vm());
callWithExceptionCheck(bitwise_cast<void*>(operationSetupVarargsFrame));
jit.addPtr(CCallHelpers::TrustedImm32(sizeof(CallerFrameAndPC)), GPRInfo::returnValueGPR, CCallHelpers::stackPointerRegister);
@@ -9277,6 +9281,7 @@
requiredBytes = WTF::roundUpToMultipleOf(stackAlignmentBytes(), requiredBytes);
jit.subPtr(CCallHelpers::TrustedImm32(requiredBytes), CCallHelpers::stackPointerRegister);
jit.setupArguments<decltype(operationCallEval)>(globalObject, GPRInfo::regT1);
+ jit.prepareCallOperation(vm);
jit.move(CCallHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationCallEval)), GPRInfo::nonPreservedNonArgumentGPR0);
jit.call(GPRInfo::nonPreservedNonArgumentGPR0, OperationPtrTag);
exceptions->append(jit.emitExceptionCheck(state->vm(), AssemblyHelpers::NormalExceptionCheck, AssemblyHelpers::FarJumpWidth));
@@ -12985,7 +12990,7 @@
// FIXME: Revisit JSGlobalObject.
// https://bugs.webkit.org/show_bug.cgi?id=203204
JSGlobalObject* globalObject = m_graph.globalObjectFor(m_node->origin.semantic);
- m_out.storePtr(weakPointer(globalObject), m_out.absolute(&vm().topCallFrame));
+ m_out.storePtr(m_callFrame, m_out.absolute(&vm().topCallFrame));
setJSValue(
vmCall(Int64, bitwise_cast<CustomGetterSetter::CustomGetter>(m_node->callDOMGetterData()->customAccessorGetter.retaggedExecutableAddress<CFunctionPtrTag>()),
weakPointer(globalObject), lowCell(m_node->child1()), m_out.constIntPtr(m_graph.identifiers()[m_node->callDOMGetterData()->identifierNumber])));
@@ -17263,6 +17268,9 @@
m_out.store32(
m_out.constInt32(callSiteIndex.bits()),
tagFor(CallFrameSlot::argumentCount));
+#if !USE(BUILTIN_FRAME_ADDRESS) || !ASSERT_DISABLED
+ m_out.storePtr(m_callFrame, m_out.absolute(&vm().topCallFrame));
+#endif
}
void callPreflight()
@@ -17291,8 +17299,12 @@
void callCheck()
{
JSGlobalObject* globalObject = m_graph.globalObjectFor(m_node->origin.semantic);
- if (Options::useExceptionFuzz())
+ if (Options::useExceptionFuzz()) {
+#if !USE(BUILTIN_FRAME_ADDRESS) || !ASSERT_DISABLED
+ m_out.storePtr(m_callFrame, m_out.absolute(&vm().topCallFrame));
+#endif
m_out.call(Void, m_out.operation(operationExceptionFuzz), weakPointer(globalObject));
+ }
LValue exception = m_out.load64(m_out.absolute(vm().addressOfException()));
LValue hadException = m_out.notZero64(exception);
diff --git a/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp b/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
index f6b3a74..664d3b9 100644
--- a/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
+++ b/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.cpp
@@ -137,8 +137,7 @@
value.dataFormat(), jit, GPRInfo::regT0, GPRInfo::regT1, GPRInfo::regT2);
}
-static void compileStub(
- unsigned exitID, JITCode* jitCode, OSRExit& exit, VM* vm, CodeBlock* codeBlock)
+static void compileStub(VM& vm, unsigned exitID, JITCode* jitCode, OSRExit& exit, CodeBlock* codeBlock)
{
// This code requires framePointerRegister is the same as callFrameRegister
static_assert(MacroAssembler::framePointerRegister == GPRInfo::callFrameRegister, "MacroAssembler::framePointerRegister and GPRInfo::callFrameRegister must be the same");
@@ -147,9 +146,9 @@
// The first thing we need to do is restablish our frame in the case of an exception.
if (exit.isGenericUnwindHandler()) {
- RELEASE_ASSERT(vm->callFrameForCatch); // The first time we hit this exit, like at all other times, this field should be non-null.
- jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm->topEntryFrame);
- jit.loadPtr(vm->addressOfCallFrameForCatch(), MacroAssembler::framePointerRegister);
+ RELEASE_ASSERT(vm.callFrameForCatch); // The first time we hit this exit, like at all other times, this field should be non-null.
+ jit.restoreCalleeSavesFromEntryFrameCalleeSavesBuffer(vm.topEntryFrame);
+ jit.loadPtr(vm.addressOfCallFrameForCatch(), MacroAssembler::framePointerRegister);
jit.addPtr(CCallHelpers::TrustedImm32(codeBlock->stackPointerOffset() * sizeof(Register)),
MacroAssembler::framePointerRegister, CCallHelpers::stackPointerRegister);
@@ -175,7 +174,7 @@
materialization->properties().size());
}
- ScratchBuffer* scratchBuffer = vm->scratchBufferForSize(
+ ScratchBuffer* scratchBuffer = vm.scratchBufferForSize(
sizeof(EncodedJSValue) * (
exit.m_descriptor->m_values.size() + numMaterializations + maxMaterializationNumArguments) +
requiredScratchMemorySizeInBytes() +
@@ -215,15 +214,15 @@
// to set it here because compileFTLOSRExit() is only called on the first time
// we exit from this site, but all subsequent exits will take this compiled
// ramp without calling compileFTLOSRExit() first.
- jit.store8(CCallHelpers::TrustedImm32(true), vm->heap.addressOfExpectDoesGC());
+ jit.store8(CCallHelpers::TrustedImm32(true), vm.heap.addressOfExpectDoesGC());
}
// Bring the stack back into a sane form and assert that it's sane.
jit.popToRestore(GPRInfo::regT0);
jit.checkStackPointerAlignment();
- if (UNLIKELY(vm->m_perBytecodeProfiler && jitCode->dfgCommon()->compilation)) {
- Profiler::Database& database = *vm->m_perBytecodeProfiler;
+ if (UNLIKELY(vm.m_perBytecodeProfiler && jitCode->dfgCommon()->compilation)) {
+ Profiler::Database& database = *vm.m_perBytecodeProfiler;
Profiler::Compilation* compilation = jitCode->dfgCommon()->compilation.get();
Profiler::OSRExit* profilerExit = compilation->addOSRExit(
@@ -335,6 +334,7 @@
CCallHelpers::TrustedImmPtr(codeBlock->globalObjectFor(materialization->origin())),
CCallHelpers::TrustedImmPtr(materialization),
CCallHelpers::TrustedImmPtr(materializationArguments));
+ jit.prepareCallOperation(vm);
jit.move(CCallHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationMaterializeObjectInOSR)), GPRInfo::nonArgGPR0);
jit.call(GPRInfo::nonArgGPR0, OperationPtrTag);
jit.storePtr(GPRInfo::returnValueGPR, materializationToPointer.get(materialization));
@@ -364,6 +364,7 @@
CCallHelpers::TrustedImmPtr(materialization),
CCallHelpers::TrustedImmPtr(materializationToPointer.get(materialization)),
CCallHelpers::TrustedImmPtr(materializationArguments));
+ jit.prepareCallOperation(vm);
jit.move(CCallHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationPopulateObjectInOSR)), GPRInfo::nonArgGPR0);
jit.call(GPRInfo::nonArgGPR0, OperationPtrTag);
}
@@ -410,7 +411,7 @@
RegisterAtOffsetList* vmCalleeSaves = RegisterSet::vmCalleeSaveRegisterOffsets();
RegisterSet vmCalleeSavesToSkip = RegisterSet::stackRegisters();
if (exit.isExceptionHandler()) {
- jit.loadPtr(&vm->topEntryFrame, GPRInfo::regT1);
+ jit.loadPtr(&vm.topEntryFrame, GPRInfo::regT1);
jit.addPtr(CCallHelpers::TrustedImm32(EntryFrame::calleeSaveRegistersBufferOffset()), GPRInfo::regT1);
}
@@ -485,9 +486,9 @@
jit.store64(GPRInfo::regT0, AssemblyHelpers::addressFor(reg));
}
- handleExitCounts(jit, exit);
+ handleExitCounts(vm, jit, exit);
reifyInlinedCallFrames(jit, exit);
- adjustAndJumpToTarget(*vm, jit, exit);
+ adjustAndJumpToTarget(vm, jit, exit);
LinkBuffer patchBuffer(jit, codeBlock);
exit.m_code = FINALIZE_CODE_IF(
@@ -500,7 +501,7 @@
);
}
-extern "C" void* compileFTLOSRExit(CallFrame* callFrame, unsigned exitID)
+extern "C" JIT_OPERATION void* operationCompileFTLOSRExit(CallFrame* callFrame, unsigned exitID)
{
if (shouldDumpDisassembly() || Options::verboseOSR() || Options::verboseFTLOSRExit())
dataLog("Compiling OSR exit with exitID = ", exitID, "\n");
@@ -545,7 +546,7 @@
}
}
- compileStub(exitID, jitCode, exit, &vm, codeBlock);
+ compileStub(vm, exitID, jitCode, exit, codeBlock);
MacroAssembler::repatchJump(
exit.codeLocationForRepatch(codeBlock), CodeLocationLabel<OSRExitPtrTag>(exit.m_code.code()));
diff --git a/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.h b/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.h
index 914aa19..be72f45 100644
--- a/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.h
+++ b/Source/JavaScriptCore/ftl/FTLOSRExitCompiler.h
@@ -34,7 +34,7 @@
// Takes the call frame and the index of the exit, and returns the address to
// jump to.
extern "C" {
-void* JIT_OPERATION compileFTLOSRExit(CallFrame*, unsigned exitID) WTF_INTERNAL;
+void* JIT_OPERATION operationCompileFTLOSRExit(CallFrame*, unsigned exitID) WTF_INTERNAL;
}
} } // namespace JSC::FTL
diff --git a/Source/JavaScriptCore/ftl/FTLOperations.cpp b/Source/JavaScriptCore/ftl/FTLOperations.cpp
index 28c95b1..829d2ba 100644
--- a/Source/JavaScriptCore/ftl/FTLOperations.cpp
+++ b/Source/JavaScriptCore/ftl/FTLOperations.cpp
@@ -55,7 +55,7 @@
using namespace DFG;
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
CodeBlock* codeBlock = callFrame->codeBlock();
@@ -144,7 +144,7 @@
using namespace DFG;
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
// We cannot GC. We've got pointers in evil places.
DeferGCForAWhile deferGC(vm.heap);
@@ -607,7 +607,7 @@
}
}
-extern "C" void* JIT_OPERATION compileFTLLazySlowPath(CallFrame* callFrame, unsigned index)
+extern "C" void* JIT_OPERATION operationCompileFTLLazySlowPath(CallFrame* callFrame, unsigned index)
{
VM& vm = callFrame->deprecatedVM();
diff --git a/Source/JavaScriptCore/ftl/FTLOperations.h b/Source/JavaScriptCore/ftl/FTLOperations.h
index 04d0283..05d98cf 100644
--- a/Source/JavaScriptCore/ftl/FTLOperations.h
+++ b/Source/JavaScriptCore/ftl/FTLOperations.h
@@ -40,7 +40,7 @@
void JIT_OPERATION operationPopulateObjectInOSR(JSGlobalObject*, ExitTimeObjectMaterialization*, EncodedJSValue*, EncodedJSValue*) WTF_INTERNAL;
-void* JIT_OPERATION compileFTLLazySlowPath(CallFrame*, unsigned) WTF_INTERNAL;
+void* JIT_OPERATION operationCompileFTLLazySlowPath(CallFrame*, unsigned) WTF_INTERNAL;
} // extern "C"
diff --git a/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp b/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp
index 4cc6ede..0c70c10 100644
--- a/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp
+++ b/Source/JavaScriptCore/ftl/FTLSlowPathCall.cpp
@@ -126,7 +126,7 @@
m_jit.addLinkTask(
[result, &vm] (LinkBuffer& linkBuffer) {
MacroAssemblerCodeRef<JITThunkPtrTag> thunk =
- vm.ftlThunks->getSlowPathCallThunk(result.key());
+ vm.ftlThunks->getSlowPathCallThunk(vm, result.key());
linkBuffer.link(result.call(), CodeLocationLabel<OperationPtrTag>(thunk.retaggedCode<OperationPtrTag>()));
});
diff --git a/Source/JavaScriptCore/ftl/FTLThunks.cpp b/Source/JavaScriptCore/ftl/FTLThunks.cpp
index fa9bfc7..e429453 100644
--- a/Source/JavaScriptCore/ftl/FTLThunks.cpp
+++ b/Source/JavaScriptCore/ftl/FTLThunks.cpp
@@ -86,6 +86,7 @@
jit.peek(
GPRInfo::argumentGPR1,
(stackMisalignment - MacroAssembler::pushToSaveByteOffset()) / sizeof(void*));
+ jit.prepareCallOperation(vm);
MacroAssembler::Call functionCall = jit.call(OperationPtrTag);
// At this point we want to make a tail call to what was returned to us in the
@@ -132,14 +133,14 @@
{
unsigned extraPopsToRestore = 0;
return genericGenerationThunkGenerator(
- vm, compileFTLOSRExit, OSRExitPtrTag, "FTL OSR exit generation thunk", extraPopsToRestore, FrameAndStackAdjustmentRequirement::Needed);
+ vm, operationCompileFTLOSRExit, OSRExitPtrTag, "FTL OSR exit generation thunk", extraPopsToRestore, FrameAndStackAdjustmentRequirement::Needed);
}
MacroAssemblerCodeRef<JITThunkPtrTag> lazySlowPathGenerationThunkGenerator(VM& vm)
{
unsigned extraPopsToRestore = 1;
return genericGenerationThunkGenerator(
- vm, compileFTLLazySlowPath, JITStubRoutinePtrTag, "FTL lazy slow path generation thunk", extraPopsToRestore, FrameAndStackAdjustmentRequirement::NotNeeded);
+ vm, operationCompileFTLLazySlowPath, JITStubRoutinePtrTag, "FTL lazy slow path generation thunk", extraPopsToRestore, FrameAndStackAdjustmentRequirement::NotNeeded);
}
static void registerClobberCheck(AssemblyHelpers& jit, RegisterSet dontClobber)
@@ -170,7 +171,7 @@
}
}
-MacroAssemblerCodeRef<JITThunkPtrTag> slowPathCallThunkGenerator(const SlowPathCallKey& key)
+MacroAssemblerCodeRef<JITThunkPtrTag> slowPathCallThunkGenerator(VM& vm, const SlowPathCallKey& key)
{
AssemblyHelpers jit(nullptr);
jit.tagReturnAddress();
@@ -201,6 +202,7 @@
jit.preserveReturnAddressAfterCall(GPRInfo::nonArgGPR0);
jit.storePtr(GPRInfo::nonArgGPR0, AssemblyHelpers::Address(MacroAssembler::stackPointerRegister, key.offset()));
+ jit.prepareCallOperation(vm);
registerClobberCheck(jit, key.argumentRegisters());
diff --git a/Source/JavaScriptCore/ftl/FTLThunks.h b/Source/JavaScriptCore/ftl/FTLThunks.h
index 7184da1..4f0b129 100644
--- a/Source/JavaScriptCore/ftl/FTLThunks.h
+++ b/Source/JavaScriptCore/ftl/FTLThunks.h
@@ -40,7 +40,7 @@
MacroAssemblerCodeRef<JITThunkPtrTag> osrExitGenerationThunkGenerator(VM&);
MacroAssemblerCodeRef<JITThunkPtrTag> lazySlowPathGenerationThunkGenerator(VM&);
-MacroAssemblerCodeRef<JITThunkPtrTag> slowPathCallThunkGenerator(const SlowPathCallKey&);
+MacroAssemblerCodeRef<JITThunkPtrTag> slowPathCallThunkGenerator(VM&, const SlowPathCallKey&);
template<typename KeyTypeArgument>
struct ThunkMap {
@@ -54,13 +54,13 @@
template<typename MapType, typename GeneratorType>
MacroAssemblerCodeRef<JITThunkPtrTag> generateIfNecessary(
- MapType& map, const typename MapType::KeyType& key, GeneratorType generator)
+ VM& vm, MapType& map, const typename MapType::KeyType& key, GeneratorType generator)
{
typename MapType::ToThunkMap::iterator iter = map.m_toThunk.find(key);
if (iter != map.m_toThunk.end())
return iter->value;
- MacroAssemblerCodeRef<JITThunkPtrTag> result = generator(key);
+ MacroAssemblerCodeRef<JITThunkPtrTag> result = generator(vm, key);
map.m_toThunk.add(key, result);
map.m_fromThunk.add(result.code(), key);
return result;
@@ -79,10 +79,9 @@
WTF_MAKE_NONCOPYABLE(Thunks);
public:
Thunks() = default;
- MacroAssemblerCodeRef<JITThunkPtrTag> getSlowPathCallThunk(const SlowPathCallKey& key)
+ MacroAssemblerCodeRef<JITThunkPtrTag> getSlowPathCallThunk(VM& vm, const SlowPathCallKey& key)
{
- return generateIfNecessary(
- m_slowPathCallThunks, key, slowPathCallThunkGenerator);
+ return generateIfNecessary(vm, m_slowPathCallThunks, key, slowPathCallThunkGenerator);
}
SlowPathCallKey keyForSlowPathCallThunk(MacroAssemblerCodePtr<JITThunkPtrTag> ptr)
diff --git a/Source/JavaScriptCore/interpreter/FrameTracers.h b/Source/JavaScriptCore/interpreter/FrameTracers.h
index 11f7b8a..f8d35f7 100644
--- a/Source/JavaScriptCore/interpreter/FrameTracers.h
+++ b/Source/JavaScriptCore/interpreter/FrameTracers.h
@@ -81,6 +81,17 @@
#endif
}
+class SlowPathFrameTracer {
+public:
+ ALWAYS_INLINE SlowPathFrameTracer(VM& vm, CallFrame* callFrame)
+ {
+ ASSERT(callFrame);
+ ASSERT(reinterpret_cast<void*>(callFrame) < reinterpret_cast<void*>(vm.topEntryFrame));
+ assertStackPointerIsAligned();
+ vm.topCallFrame = callFrame;
+ }
+};
+
class NativeCallFrameTracer {
public:
ALWAYS_INLINE NativeCallFrameTracer(VM& vm, CallFrame* callFrame)
@@ -92,4 +103,36 @@
}
};
+class JITOperationPrologueCallFrameTracer {
+public:
+ ALWAYS_INLINE JITOperationPrologueCallFrameTracer(VM& vm, CallFrame* callFrame)
+#if !ASSERT_DISABLED
+ : m_vm(vm)
+#endif
+ {
+ UNUSED_PARAM(vm);
+ UNUSED_PARAM(callFrame);
+ ASSERT(callFrame);
+ ASSERT(reinterpret_cast<void*>(callFrame) < reinterpret_cast<void*>(vm.topEntryFrame));
+ assertStackPointerIsAligned();
+#if USE(BUILTIN_FRAME_ADDRESS)
+ // If !ASSERT_DISABLED and USE(BUILTIN_FRAME_ADDRESS), prepareCallOperation() will put the frame pointer into vm.topCallFrame.
+ // We can ensure here that a call to prepareCallOperation() (or its equivalent) is not missing by comparing vm.topCallFrame to
+ // the result of __builtin_frame_address which is passed in as callFrame.
+ ASSERT(vm.topCallFrame == callFrame);
+ vm.topCallFrame = callFrame;
+#endif
+ }
+
+#if !ASSERT_DISABLED
+ ~JITOperationPrologueCallFrameTracer()
+ {
+ // Fill vm.topCallFrame with invalid value when leaving from JIT operation functions.
+ m_vm.topCallFrame = bitwise_cast<CallFrame*>(static_cast<uintptr_t>(0x0badbeef0badbeefULL));
+ }
+
+ VM& m_vm;
+#endif
+};
+
} // namespace JSC
diff --git a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
index 3ce29bd..1cac1c4 100644
--- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp
@@ -252,6 +252,7 @@
// Set up one argument.
move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
move(TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationExceptionFuzz)), GPRInfo::nonPreservedNonReturnGPR);
+ prepareCallOperation(vm);
call(GPRInfo::nonPreservedNonReturnGPR, OperationPtrTag);
for (unsigned i = 0; i < FPRInfo::numberOfRegisters; ++i) {
@@ -931,6 +932,7 @@
#else
#error "JIT not supported on this platform."
#endif
+ prepareCallOperation(vm);
move(TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(function)), scratch);
call(scratch, OperationPtrTag);
diff --git a/Source/JavaScriptCore/jit/AssemblyHelpers.h b/Source/JavaScriptCore/jit/AssemblyHelpers.h
index 2760ed6..bc59535 100644
--- a/Source/JavaScriptCore/jit/AssemblyHelpers.h
+++ b/Source/JavaScriptCore/jit/AssemblyHelpers.h
@@ -65,6 +65,14 @@
VM& vm() { return m_codeBlock->vm(); }
AssemblerType_T& assembler() { return m_assembler; }
+ void prepareCallOperation(VM& vm)
+ {
+ UNUSED_PARAM(vm);
+#if !USE(BUILTIN_FRAME_ADDRESS) || !ASSERT_DISABLED
+ storePtr(GPRInfo::callFrameRegister, &vm.topCallFrame);
+#endif
+ }
+
void checkStackPointerAlignment()
{
// This check is both unneeded and harder to write correctly for ARM64
diff --git a/Source/JavaScriptCore/jit/CCallHelpers.cpp b/Source/JavaScriptCore/jit/CCallHelpers.cpp
index b4b4697..8485a9f 100644
--- a/Source/JavaScriptCore/jit/CCallHelpers.cpp
+++ b/Source/JavaScriptCore/jit/CCallHelpers.cpp
@@ -61,6 +61,7 @@
loadPtr(Address(scratch1NonArgGPR), shadowPacket);
Jump ok = branchPtr(Below, shadowPacket, TrustedImmPtr(shadowChicken->logEnd()));
setupArguments<decltype(operationProcessShadowChickenLog)>(TrustedImmPtr(&vm));
+ prepareCallOperation(vm);
move(TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationProcessShadowChickenLog)), scratch1NonArgGPR);
call(scratch1NonArgGPR, OperationPtrTag);
move(TrustedImmPtr(shadowChicken->addressOfLogCursor()), scratch1NonArgGPR);
diff --git a/Source/JavaScriptCore/jit/CCallHelpers.h b/Source/JavaScriptCore/jit/CCallHelpers.h
index d810d23..015f03b 100644
--- a/Source/JavaScriptCore/jit/CCallHelpers.h
+++ b/Source/JavaScriptCore/jit/CCallHelpers.h
@@ -84,15 +84,6 @@
poke(GPRInfo::nonArgGPR0, POKE_ARGUMENT_OFFSET + argumentIndex - GPRInfo::numberOfArgumentRegisters);
}
- void prepareCallOperation(VM& vm)
- {
-#if USE(BUILTIN_FRAME_ADDRESS)
- UNUSED_PARAM(vm);
-#else
- storePtr(GPRInfo::callFrameRegister, &vm.topCallFrame);
-#endif
- }
-
private:
template<unsigned NumberOfRegisters, typename RegType>
diff --git a/Source/JavaScriptCore/jit/JITOperations.cpp b/Source/JavaScriptCore/jit/JITOperations.cpp
index 3809461..9c676f1 100644
--- a/Source/JavaScriptCore/jit/JITOperations.cpp
+++ b/Source/JavaScriptCore/jit/JITOperations.cpp
@@ -107,17 +107,17 @@
// We pass in our own code block, because the callframe hasn't been populated.
VM& vm = codeBlock->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
callFrame->convertToStackOverflowFrame(vm, codeBlock);
throwStackOverflowError(codeBlock->globalObject(), scope);
}
-void JIT_OPERATION throwStackOverflowErrorFromThunk(JSGlobalObject* globalObject)
+void JIT_OPERATION operationThrowStackOverflowErrorFromThunk(JSGlobalObject* globalObject)
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
throwStackOverflowError(globalObject, scope);
genericUnwind(vm, callFrame);
@@ -128,7 +128,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
int32_t missingArgCount = CommonSlowPaths::arityCheckFor(vm, callFrame, CodeForCall);
@@ -145,7 +145,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
int32_t missingArgCount = CommonSlowPaths::arityCheckFor(vm, callFrame, CodeForConstruct);
@@ -162,7 +162,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Identifier ident = Identifier::fromUid(vm, uid);
stubInfo->tookSlowPath = true;
@@ -178,7 +178,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
@@ -192,7 +192,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -213,7 +213,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
stubInfo->tookSlowPath = true;
@@ -231,7 +231,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -248,7 +248,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -271,7 +271,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
stubInfo->tookSlowPath = true;
@@ -291,7 +291,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue baseValue = JSValue::decode(base);
PropertySlot slot(baseValue, PropertySlot::InternalMethodType::Get);
@@ -309,7 +309,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
@@ -331,7 +331,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Identifier ident = Identifier::fromUid(vm, uid);
stubInfo->tookSlowPath = true;
@@ -349,7 +349,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
@@ -365,7 +365,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Identifier ident = Identifier::fromUid(vm, uid);
JSValue baseValue = JSValue::decode(base);
@@ -388,7 +388,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
stubInfo->tookSlowPath = true;
@@ -415,7 +415,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -440,7 +440,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -469,7 +469,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsBoolean(CommonSlowPaths::opInByVal(globalObject, base, JSValue::decode(key))));
}
@@ -480,7 +480,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
stubInfo->tookSlowPath = true;
@@ -498,7 +498,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
stubInfo->tookSlowPath = true;
@@ -516,7 +516,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
stubInfo->tookSlowPath = true;
@@ -534,7 +534,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
stubInfo->tookSlowPath = true;
@@ -552,7 +552,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -583,7 +583,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -614,7 +614,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -644,7 +644,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
Identifier ident = Identifier::fromUid(vm, uid);
@@ -859,7 +859,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBaseValue);
@@ -948,7 +948,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBaseValue);
@@ -972,7 +972,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue baseValue = JSValue::decode(encodedBaseValue);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -986,7 +986,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue baseValue = JSValue::decode(encodedBaseValue);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -1215,7 +1215,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsLess<true>(globalObject, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2));
}
@@ -1224,7 +1224,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsLessEq<true>(globalObject, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2));
}
@@ -1233,7 +1233,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsLess<false>(globalObject, JSValue::decode(encodedOp2), JSValue::decode(encodedOp1));
}
@@ -1242,7 +1242,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return jsLessEq<false>(globalObject, JSValue::decode(encodedOp2), JSValue::decode(encodedOp1));
}
@@ -1251,7 +1251,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::equalSlowCaseInline(globalObject, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2));
}
@@ -1264,7 +1264,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
bool result = asString(left)->equal(globalObject, asString(right));
#if USE(JSVALUE64)
@@ -1278,7 +1278,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue src1 = JSValue::decode(encodedOp1);
JSValue src2 = JSValue::decode(encodedOp2);
@@ -1290,7 +1290,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(constructArrayNegativeIndexed(globalObject, profile, values, size));
}
@@ -1298,7 +1298,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue sizeValue = JSValue::decode(size);
return JSValue::encode(constructArrayWithSizeQuirk(globalObject, profile, sizeValue));
}
@@ -1320,7 +1320,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSFunction>(vm, scope, functionExecutable, false);
}
@@ -1328,7 +1328,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSFunction>(vm, scope, functionExecutable, true);
}
@@ -1336,7 +1336,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSGeneratorFunction>(vm, scope, functionExecutable, false);
}
@@ -1344,7 +1344,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSGeneratorFunction>(vm, scope, functionExecutable, true);
}
@@ -1352,7 +1352,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSAsyncFunction>(vm, scope, functionExecutable, false);
}
@@ -1360,7 +1360,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSAsyncFunction>(vm, scope, functionExecutable, true);
}
@@ -1368,7 +1368,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSAsyncGeneratorFunction>(vm, scope, functionExecutable, false);
}
@@ -1376,7 +1376,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return newFunctionCommon<JSAsyncGeneratorFunction>(vm, scope, functionExecutable, true);
}
@@ -1384,7 +1384,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSFunction* func = jsCast<JSFunction*>(funcCell);
JSValue name = JSValue::decode(encodedName);
@@ -1395,7 +1395,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return constructEmptyObject(vm, structure);
}
@@ -1404,7 +1404,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSPromise::create(vm, structure);
}
@@ -1413,7 +1413,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSInternalPromise::create(vm, structure);
}
@@ -1422,7 +1422,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSGenerator::create(vm, structure);
}
@@ -1431,7 +1431,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSAsyncGenerator::create(vm, structure);
}
@@ -1441,7 +1441,7 @@
SuperSamplerScope superSamplerScope(false);
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
RegExp* regexp = static_cast<RegExp*>(regexpPtr);
ASSERT(regexp->isValid());
@@ -1456,7 +1456,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(vm.needTrapHandling());
vm.handleTraps(globalObject, callFrame);
return nullptr;
@@ -1466,7 +1466,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
vm.interpreter->debug(callFrame, static_cast<DebugHookType>(debugHookType));
}
@@ -1482,7 +1482,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
// Defer GC for a while so that it doesn't run between when we enter into this
@@ -1729,7 +1729,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
CodeBlock* optimizedReplacement = callFrame->codeBlock()->replacement();
@@ -1752,7 +1752,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
BytecodeIndex bytecodeIndex = BytecodeIndex::fromBits(bytecodeIndexBits);
CodeBlock* codeBlock = callFrame->codeBlock();
@@ -1786,7 +1786,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue arrayValue = JSValue::decode(encodedArrayValue);
ASSERT(isJSArray(arrayValue));
@@ -1816,7 +1816,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(object && object->isObject());
JSObject* baseObj = object->getObject();
@@ -1829,7 +1829,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(object && object->isObject());
JSObject* baseObj = object->getObject();
@@ -1842,7 +1842,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putAccessorByVal(globalObject, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(getter), AccessorType::Getter);
}
@@ -1851,7 +1851,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
putAccessorByVal(globalObject, asObject(base), JSValue::decode(encodedSubscript), attribute, asObject(setter), AccessorType::Setter);
}
@@ -1861,7 +1861,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(object && object->isObject());
JSObject* baseObject = asObject(object);
@@ -1878,7 +1878,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(object && object->isObject());
JSObject* baseObject = asObject(object);
@@ -1895,7 +1895,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSScope* scope = callFrame->uncheckedR(scopeReg).Register::scope();
callFrame->uncheckedR(scopeReg) = scope->next();
@@ -1905,7 +1905,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue value = JSValue::decode(encodedValue);
JSValue hasInstanceValue = JSValue::decode(encodedHasInstance);
@@ -2068,7 +2068,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -2080,7 +2080,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
@@ -2101,7 +2101,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -2149,7 +2149,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -2170,7 +2170,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue baseValue = JSValue::decode(encodedBase);
JSValue subscript = JSValue::decode(encodedSubscript);
@@ -2220,7 +2220,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsBoolean(deleteById(globalObject, callFrame, vm, JSValue::decode(encodedBase), uid)));
}
@@ -2228,7 +2228,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return deleteById(globalObject, callFrame, vm, JSValue::decode(encodedBase), uid);
}
@@ -2260,7 +2260,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsBoolean(deleteByVal(globalObject, callFrame, vm, JSValue::decode(encodedBase), JSValue::decode(encodedKey))));
}
@@ -2268,7 +2268,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return deleteByVal(globalObject, callFrame, vm, JSValue::decode(encodedBase), JSValue::decode(encodedKey));
}
@@ -2276,7 +2276,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSObject* object = JSValue::decode(objectValue).toObject(globalObject);
@@ -2291,7 +2291,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSScope* currentScope = jsCast<JSScope*>(currentScopeCell);
return JSWithScope::create(vm, globalObject, currentScope, object);
}
@@ -2300,7 +2300,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue value = JSValue::decode(encodedValue);
JSValue proto = JSValue::decode(encodedProto);
@@ -2312,7 +2312,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue value = JSValue::decode(encodedValue);
JSValue proto = JSValue::decode(encodedProto);
@@ -2326,7 +2326,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue value = JSValue::decode(encodedValue);
JSValue proto = JSValue::decode(encodedProto);
@@ -2345,7 +2345,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return sizeFrameForForwardArguments(globalObject, callFrame, vm, numUsedStackSlots);
}
@@ -2353,7 +2353,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue arguments = JSValue::decode(encodedArguments);
return sizeFrameForVarargs(globalObject, callFrame, vm, arguments, numUsedStackSlots, firstVarArgOffset);
}
@@ -2362,7 +2362,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
setupForwardArgumentsFrame(globalObject, callFrame, newCallFrame, length);
return newCallFrame;
}
@@ -2371,7 +2371,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue arguments = JSValue::decode(encodedArguments);
setupVarargsFrame(globalObject, callFrame, newCallFrame, arguments, firstVarArgOffset, length);
return newCallFrame;
@@ -2381,7 +2381,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
JSValue key = JSValue::decode(encodedKey);
@@ -2407,7 +2407,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue key = JSValue::decode(encodedKey);
CodeBlock* codeBlock = callFrame->codeBlock();
@@ -2427,7 +2427,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue key = JSValue::decode(encodedKey);
CodeBlock* codeBlock = callFrame->codeBlock();
auto throwScope = DECLARE_THROW_SCOPE(vm);
@@ -2452,7 +2452,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeBlock* codeBlock = callFrame->codeBlock();
@@ -2494,7 +2494,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
CodeBlock* codeBlock = callFrame->codeBlock();
@@ -2548,7 +2548,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue exceptionValue = JSValue::decode(encodedExceptionValue);
@@ -2562,7 +2562,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(!object->structure(vm)->outOfLineCapacity());
Butterfly* result = object->allocateMoreOutOfLineStorage(vm, 0, initialOutOfLineCapacity);
@@ -2574,7 +2574,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
Butterfly* result = object->allocateMoreOutOfLineStorage(vm, object->structure(vm)->outOfLineCapacity(), newSize);
object->nukeStructureAndSetButterfly(vm, object->structureID(), result);
@@ -2585,7 +2585,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
vm.heap.writeBarrier(cell);
}
@@ -2593,7 +2593,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
vm.heap.writeBarrierSlowPath(cell);
}
@@ -2601,7 +2601,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
genericUnwind(vm, callFrame);
ASSERT(vm.targetMachinePCForThrow);
}
@@ -2610,7 +2610,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(callFrame->isStackOverflowFrame());
ASSERT(jsCast<ErrorInstance*>(vm.exceptionForInspection()->value().asCell())->isStackOverflowError());
genericUnwind(vm, callFrame);
@@ -2621,7 +2621,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
genericUnwind(vm, callFrame);
}
@@ -2634,7 +2634,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(scope);
#if COMPILER(GCC_COMPATIBLE)
@@ -2655,7 +2655,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsAdd(globalObject, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2)));
}
@@ -2664,7 +2664,7 @@
ASSERT(arithProfile);
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(profiledAdd(globalObject, JSValue::decode(encodedOp1), JSValue::decode(encodedOp2), *arithProfile));
}
@@ -2672,7 +2672,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -2697,7 +2697,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ArithProfile* arithProfile = addIC->arithProfile();
ASSERT(arithProfile);
@@ -2708,7 +2708,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -2729,7 +2729,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue op1 = JSValue::decode(encodedOp1);
JSValue op2 = JSValue::decode(encodedOp2);
@@ -2767,7 +2767,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return unprofiledMul(globalObject, encodedOp1, encodedOp2);
}
@@ -2776,7 +2776,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return unprofiledMul(globalObject, encodedOp1, encodedOp2);
}
@@ -2785,7 +2785,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto nonOptimizeVariant = operationValueMulNoOptimize;
if (ArithProfile* arithProfile = mulIC->arithProfile())
@@ -2803,7 +2803,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ASSERT(arithProfile);
return profiledMul(globalObject, encodedOp1, encodedOp2, *arithProfile);
@@ -2813,7 +2813,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ArithProfile* arithProfile = mulIC->arithProfile();
ASSERT(arithProfile);
@@ -2832,7 +2832,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ArithProfile* arithProfile = mulIC->arithProfile();
ASSERT(arithProfile);
@@ -2844,7 +2844,7 @@
VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue operand = JSValue::decode(encodedOperand);
@@ -2866,7 +2866,7 @@
VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue operand = JSValue::decode(encodedOperand);
arithProfile->observeLHS(operand);
@@ -2893,7 +2893,7 @@
VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue operand = JSValue::decode(encodedOperand);
@@ -2927,7 +2927,7 @@
VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue operand = JSValue::decode(encodedOperand);
@@ -2978,7 +2978,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return unprofiledSub(globalObject, encodedOp1, encodedOp2);
}
@@ -2988,7 +2988,7 @@
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return profiledSub(vm, globalObject, encodedOp1, encodedOp2, *arithProfile);
}
@@ -2997,7 +2997,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto nonOptimizeVariant = operationValueSubNoOptimize;
if (ArithProfile* arithProfile = subIC->arithProfile())
@@ -3015,7 +3015,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return unprofiledSub(globalObject, encodedOp1, encodedOp2);
}
@@ -3024,7 +3024,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ArithProfile* arithProfile = subIC->arithProfile();
ASSERT(arithProfile);
@@ -3043,7 +3043,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
ArithProfile* arithProfile = subIC->arithProfile();
ASSERT(arithProfile);
@@ -3054,7 +3054,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
vm.typeProfilerLog()->processLogEntries(vm, "Log Full, called from inside baseline JIT"_s);
}
@@ -3062,7 +3062,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
RELEASE_ASSERT(vm.shadowChicken());
vm.shadowChicken()->update(vm, callFrame);
}
@@ -3071,7 +3071,7 @@
{
VM& vm = *vmPointer;
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
RELEASE_ASSERT(!!scope.exception());
diff --git a/Source/JavaScriptCore/jit/JITOperations.h b/Source/JavaScriptCore/jit/JITOperations.h
index 0addbff..37e8361 100644
--- a/Source/JavaScriptCore/jit/JITOperations.h
+++ b/Source/JavaScriptCore/jit/JITOperations.h
@@ -152,7 +152,7 @@
void JIT_OPERATION operationLookupExceptionHandler(VM*) WTF_INTERNAL;
void JIT_OPERATION operationLookupExceptionHandlerFromCallerFrame(VM*) WTF_INTERNAL;
void JIT_OPERATION operationVMHandleException(VM*) WTF_INTERNAL;
-void JIT_OPERATION throwStackOverflowErrorFromThunk(JSGlobalObject*) WTF_INTERNAL;
+void JIT_OPERATION operationThrowStackOverflowErrorFromThunk(JSGlobalObject*) WTF_INTERNAL;
void JIT_OPERATION operationThrowStackOverflowError(CodeBlock*) WTF_INTERNAL;
int32_t JIT_OPERATION operationCallArityCheck(JSGlobalObject*) WTF_INTERNAL;
diff --git a/Source/JavaScriptCore/jit/Repatch.cpp b/Source/JavaScriptCore/jit/Repatch.cpp
index b5ec97c..7dc46b5 100644
--- a/Source/JavaScriptCore/jit/Repatch.cpp
+++ b/Source/JavaScriptCore/jit/Repatch.cpp
@@ -95,7 +95,7 @@
auto slowPathThunk = MacroAssemblerCodePtr<JITThunkPtrTag>::createFromExecutableAddress(target.retaggedExecutableAddress<JITThunkPtrTag>());
FTL::SlowPathCallKey key = thunks.keyForSlowPathCallThunk(slowPathThunk);
key = key.withCallTarget(newCalleeFunction);
- MacroAssembler::repatchCall(call, FunctionPtr<OperationPtrTag>(thunks.getSlowPathCallThunk(key).retaggedCode<OperationPtrTag>()));
+ MacroAssembler::repatchCall(call, FunctionPtr<OperationPtrTag>(thunks.getSlowPathCallThunk(vm, key).retaggedCode<OperationPtrTag>()));
return;
}
#else // ENABLE(FTL_JIT)
diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
index 6bbc669..4686150 100644
--- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp
+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp
@@ -1173,8 +1173,9 @@
// Throw Stack Overflow exception
jit.copyCalleeSavesToEntryFrameCalleeSavesBuffer(vm.topEntryFrame);
jit.loadPtr(CCallHelpers::Address(GPRInfo::regT3, JSBoundFunction::offsetOfGlobalObject()), GPRInfo::regT3);
- jit.setupArguments<decltype(throwStackOverflowErrorFromThunk)>(GPRInfo::regT3);
- jit.move(CCallHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(throwStackOverflowErrorFromThunk)), GPRInfo::nonArgGPR0);
+ jit.setupArguments<decltype(operationThrowStackOverflowErrorFromThunk)>(GPRInfo::regT3);
+ jit.prepareCallOperation(vm);
+ jit.move(CCallHelpers::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationThrowStackOverflowErrorFromThunk)), GPRInfo::nonArgGPR0);
emitPointerValidation(jit, GPRInfo::nonArgGPR0, OperationPtrTag);
jit.call(GPRInfo::nonArgGPR0, OperationPtrTag);
jit.jumpToExceptionHandler(vm);
diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
index 60b49f9..5798d30 100644
--- a/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
@@ -79,7 +79,7 @@
CodeBlock* codeBlock = callFrame->codeBlock(); \
JSGlobalObject* globalObject = codeBlock->globalObject(); \
VM& vm = codeBlock->vm(); \
- NativeCallFrameTracer tracer(vm, callFrame); \
+ SlowPathFrameTracer tracer(vm, callFrame); \
auto throwScope = DECLARE_THROW_SCOPE(vm)
#ifndef NDEBUG
@@ -536,10 +536,10 @@
VM& vm = codeBlock->vm();
auto throwScope = DECLARE_THROW_SCOPE(vm);
- // It's ok to create the NativeCallFrameTracer here before we
+ // It's ok to create the SlowPathFrameTracer here before we
// convertToStackOverflowFrame() because this function is always called
// after the frame has been propulated with a proper CodeBlock and callee.
- NativeCallFrameTracer tracer(vm, callFrame);
+ SlowPathFrameTracer tracer(vm, callFrame);
LLINT_SET_PC_FOR_STUBS();
@@ -1436,7 +1436,7 @@
ASSERT(callType != CallType::JS);
if (callType == CallType::Host) {
- NativeCallFrameTracer tracer(vm, calleeFrame);
+ SlowPathFrameTracer tracer(vm, calleeFrame);
calleeFrame->setCallee(asObject(callee));
vm.hostCallReturnValue = JSValue::decode(callData.native.function(asObject(callee)->globalObject(vm), calleeFrame));
LLINT_CALL_RETURN(globalObject, calleeFrame, LLInt::getCodePtr(getHostCallReturnValue), CFunctionPtrTag);
@@ -1456,7 +1456,7 @@
ASSERT(constructType != ConstructType::JS);
if (constructType == ConstructType::Host) {
- NativeCallFrameTracer tracer(vm, calleeFrame);
+ SlowPathFrameTracer tracer(vm, calleeFrame);
calleeFrame->setCallee(asObject(callee));
vm.hostCallReturnValue = JSValue::decode(constructData.native.function(asObject(callee)->globalObject(vm), calleeFrame));
LLINT_CALL_RETURN(globalObject, calleeFrame, LLInt::getCodePtr(getHostCallReturnValue), CFunctionPtrTag);
@@ -1773,7 +1773,7 @@
LLINT_SLOW_PATH_DECL(slow_path_handle_exception)
{
VM& vm = callFrame->deprecatedVM();
- NativeCallFrameTracer tracer(vm, callFrame);
+ SlowPathFrameTracer tracer(vm, callFrame);
genericUnwind(vm, callFrame);
LLINT_END_IMPL();
}
diff --git a/Source/JavaScriptCore/runtime/AtomicsObject.cpp b/Source/JavaScriptCore/runtime/AtomicsObject.cpp
index 69deb66..b68b2f3 100644
--- a/Source/JavaScriptCore/runtime/AtomicsObject.cpp
+++ b/Source/JavaScriptCore/runtime/AtomicsObject.cpp
@@ -471,7 +471,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, globalObject, args, AddFunc());
}
@@ -480,7 +480,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, globalObject, args, AndFunc());
}
@@ -489,7 +489,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(expected), JSValue::decode(newValue)};
return atomicOperationWithArgs(vm, globalObject, args, CompareExchangeFunc());
}
@@ -498,7 +498,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, globalObject, args, ExchangeFunc());
}
@@ -507,7 +507,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return isLockFree(globalObject, JSValue::decode(size));
}
@@ -515,7 +515,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index)};
return atomicOperationWithArgs(vm, globalObject, args, LoadFunc());
}
@@ -524,7 +524,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, globalObject, args, OrFunc());
}
@@ -533,7 +533,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, globalObject, args, StoreFunc());
}
@@ -542,7 +542,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, globalObject, args, SubFunc());
}
@@ -551,7 +551,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSValue args[] = {JSValue::decode(base), JSValue::decode(index), JSValue::decode(operand)};
return atomicOperationWithArgs(vm, globalObject, args, XorFunc());
}
diff --git a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
index 90c3de7..866d2a9 100644
--- a/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
+++ b/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp
@@ -77,7 +77,7 @@
CodeBlock* codeBlock = callFrame->codeBlock(); \
JSGlobalObject* globalObject = codeBlock->globalObject(); \
VM& vm = codeBlock->vm(); \
- NativeCallFrameTracer tracer(vm, callFrame); \
+ SlowPathFrameTracer tracer(vm, callFrame); \
auto throwScope = DECLARE_THROW_SCOPE(vm); \
UNUSED_PARAM(throwScope)
@@ -175,7 +175,7 @@
if (UNLIKELY(slotsToAdd < 0)) {
CodeBlock* codeBlock = CommonSlowPaths::codeBlockFromCallFrameCallee(callFrame, CodeForCall);
callFrame->convertToStackOverflowFrame(vm, codeBlock);
- NativeCallFrameTracer tracer(vm, callFrame);
+ SlowPathFrameTracer tracer(vm, callFrame);
ErrorHandlingScope errorScope(vm);
throwScope.release();
throwArityCheckStackOverflowError(globalObject, throwScope);
@@ -191,7 +191,7 @@
if (UNLIKELY(slotsToAdd < 0)) {
CodeBlock* codeBlock = CommonSlowPaths::codeBlockFromCallFrameCallee(callFrame, CodeForConstruct);
callFrame->convertToStackOverflowFrame(vm, codeBlock);
- NativeCallFrameTracer tracer(vm, callFrame);
+ SlowPathFrameTracer tracer(vm, callFrame);
ErrorHandlingScope errorScope(vm);
throwArityCheckStackOverflowError(globalObject, throwScope);
RETURN_TWO(bitwise_cast<void*>(static_cast<uintptr_t>(1)), callFrame);
diff --git a/Source/JavaScriptCore/runtime/StringPrototype.cpp b/Source/JavaScriptCore/runtime/StringPrototype.cpp
index a8e97c0..f4ba632 100644
--- a/Source/JavaScriptCore/runtime/StringPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/StringPrototype.cpp
@@ -724,7 +724,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
RegExp* regExp = searchValue->regExp();
@@ -747,7 +747,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
CallData callData;
@@ -925,7 +925,7 @@
{
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return replace(
vm, globalObject, callFrame, JSValue::decode(thisValue), JSValue::decode(searchValue),
diff --git a/Source/JavaScriptCore/tools/JSDollarVM.cpp b/Source/JavaScriptCore/tools/JSDollarVM.cpp
index 19c8899..3b1187e 100644
--- a/Source/JavaScriptCore/tools/JSDollarVM.cpp
+++ b/Source/JavaScriptCore/tools/JSDollarVM.cpp
@@ -757,7 +757,7 @@
DollarVMAssertScope assertScope;
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsNumber(static_cast<DOMJITGetter*>(pointer)->value()));
}
@@ -851,7 +851,7 @@
DollarVMAssertScope assertScope;
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
auto* object = static_cast<DOMJITNode*>(pointer);
auto* domjitGetterComplex = jsDynamicCast<DOMJITGetterComplex*>(vm, object);
@@ -958,7 +958,6 @@
{
DollarVMAssertScope assertScope;
VM& vm = globalObject->vm();
- NativeCallFrameTracer tracer(vm, callFrame);
auto scope = DECLARE_THROW_SCOPE(vm);
DOMJITNode* thisObject = jsDynamicCast<DOMJITNode*>(vm, callFrame->thisValue());
@@ -972,7 +971,7 @@
DollarVMAssertScope assertScope;
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsNumber(node->value()));
}
@@ -1051,7 +1050,7 @@
DollarVMAssertScope assertScope;
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSValue::encode(jsNumber(node->value()));
}
@@ -1114,7 +1113,7 @@
DollarVMAssertScope assertScope;
VM& vm = globalObject->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
JSObject* object = static_cast<JSObject*>(pointer);
return JSValue::encode(object->getPrototypeDirect(vm));
}
diff --git a/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp b/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp
index 7b8c5d9..fbc3a17 100644
--- a/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp
+++ b/Source/JavaScriptCore/wasm/WasmAirIRGenerator.cpp
@@ -1768,7 +1768,7 @@
forceOSREntry.link(&jit);
tierUp.link(&jit);
- jit.probe(triggerOSREntryNow, osrEntryDataPtr);
+ jit.probe(operationWasmTriggerOSREntryNow, osrEntryDataPtr);
jit.branchTestPtr(CCallHelpers::Zero, GPRInfo::argumentGPR0).linkTo(tierUpResume, &jit);
jit.farJump(GPRInfo::argumentGPR1, WasmEntryPtrTag);
});
diff --git a/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
index 4f01571..dc3a211 100644
--- a/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
+++ b/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp
@@ -1271,7 +1271,7 @@
forceOSREntry.link(&jit);
tierUp.link(&jit);
- jit.probe(triggerOSREntryNow, osrEntryDataPtr);
+ jit.probe(operationWasmTriggerOSREntryNow, osrEntryDataPtr);
jit.branchTestPtr(CCallHelpers::Zero, GPRInfo::argumentGPR0).linkTo(tierUpResume, &jit);
jit.farJump(GPRInfo::argumentGPR1, WasmEntryPtrTag);
});
diff --git a/Source/JavaScriptCore/wasm/WasmOperations.cpp b/Source/JavaScriptCore/wasm/WasmOperations.cpp
index 5bc52fe..57463e2 100644
--- a/Source/JavaScriptCore/wasm/WasmOperations.cpp
+++ b/Source/JavaScriptCore/wasm/WasmOperations.cpp
@@ -51,11 +51,11 @@
namespace JSC { namespace Wasm {
-void JIT_OPERATION operationThrowBadI64(JSWebAssemblyInstance* instance)
+void JIT_OPERATION operationWasmThrowBadI64(JSWebAssemblyInstance* instance)
{
VM& vm = instance->vm();
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- NativeCallFrameTracer tracer(vm, callFrame);
+ JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
{
auto throwScope = DECLARE_THROW_SCOPE(vm);
@@ -224,7 +224,7 @@
context.gpr(GPRInfo::argumentGPR1) = bitwise_cast<UCPURegister>(osrEntryCallee.entrypoint().executableAddress<>());
}
-void JIT_OPERATION triggerOSREntryNow(Probe::Context& context)
+void JIT_OPERATION operationWasmTriggerOSREntryNow(Probe::Context& context)
{
OSREntryData& osrEntryData = *context.arg<OSREntryData*>();
uint32_t functionIndex = osrEntryData.functionIndex();
@@ -408,7 +408,7 @@
return returnWithoutOSREntry();
}
-void JIT_OPERATION triggerTierUpNow(Instance* instance, uint32_t functionIndex)
+void JIT_OPERATION operationWasmTriggerTierUpNow(Instance* instance, uint32_t functionIndex)
{
Wasm::CodeBlock& codeBlock = *instance->codeBlock();
ASSERT(instance->memory()->mode() == codeBlock.mode());
diff --git a/Source/JavaScriptCore/wasm/WasmOperations.h b/Source/JavaScriptCore/wasm/WasmOperations.h
index af05693..35f99ae 100644
--- a/Source/JavaScriptCore/wasm/WasmOperations.h
+++ b/Source/JavaScriptCore/wasm/WasmOperations.h
@@ -40,9 +40,9 @@
class Instance;
-void JIT_OPERATION triggerOSREntryNow(Probe::Context&) WTF_INTERNAL;
-void JIT_OPERATION triggerTierUpNow(Instance*, uint32_t functionIndex) WTF_INTERNAL;
-void JIT_OPERATION operationThrowBadI64(JSWebAssemblyInstance*) WTF_INTERNAL;
+void JIT_OPERATION operationWasmTriggerOSREntryNow(Probe::Context&) WTF_INTERNAL;
+void JIT_OPERATION operationWasmTriggerTierUpNow(Instance*, uint32_t functionIndex) WTF_INTERNAL;
+void JIT_OPERATION operationWasmThrowBadI64(JSWebAssemblyInstance*) WTF_INTERNAL;
} } // namespace JSC::Wasm
diff --git a/Source/JavaScriptCore/wasm/WasmThunks.cpp b/Source/JavaScriptCore/wasm/WasmThunks.cpp
index ae4202e..f2b3ee1 100644
--- a/Source/JavaScriptCore/wasm/WasmThunks.cpp
+++ b/Source/JavaScriptCore/wasm/WasmThunks.cpp
@@ -90,7 +90,7 @@
unsigned numberOfStackBytesUsedForRegisterPreservation = ScratchRegisterAllocator::preserveRegistersToStackForCall(jit, registersToSpill, extraPaddingBytes);
jit.loadWasmContextInstance(GPRInfo::argumentGPR0);
- jit.move(MacroAssembler::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(triggerTierUpNow)), GPRInfo::argumentGPR2);
+ jit.move(MacroAssembler::TrustedImmPtr(tagCFunctionPtr<OperationPtrTag>(operationWasmTriggerTierUpNow)), GPRInfo::argumentGPR2);
jit.call(GPRInfo::argumentGPR2, OperationPtrTag);
ScratchRegisterAllocator::restoreRegistersFromStackForCall(jit, registersToSpill, RegisterSet(), numberOfStackBytesUsedForRegisterPreservation, extraPaddingBytes);
diff --git a/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp b/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp
index 295b2d3..678b4094 100644
--- a/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp
+++ b/Source/JavaScriptCore/wasm/js/JSWebAssembly.cpp
@@ -227,7 +227,7 @@
JSGlobalObject* globalObject = instance->globalObject();
resolve(vm, globalObject, promise, instance, module, importObject, codeBlock.releaseNonNull(), resolveKind, creationMode);
});
- }), &Wasm::createJSToWasmWrapper, &Wasm::wasmToJSException);
+ }), &Wasm::createJSToWasmWrapper, &Wasm::operationWasmToJSException);
}
static void compileAndInstantiate(VM& vm, JSGlobalObject* globalObject, JSPromiseDeferred* promise, const Identifier& moduleKey, JSValue buffer, JSObject* importObject, Resolve resolveKind, Wasm::CreationMode creationMode)
diff --git a/Source/JavaScriptCore/wasm/js/WasmToJS.cpp b/Source/JavaScriptCore/wasm/js/WasmToJS.cpp
index 90c6277..8674627 100644
--- a/Source/JavaScriptCore/wasm/js/WasmToJS.cpp
+++ b/Source/JavaScriptCore/wasm/js/WasmToJS.cpp
@@ -68,6 +68,7 @@
// Store Callee.
jit.loadPtr(CCallHelpers::Address(GPRInfo::argumentGPR0, Instance::offsetOfOwner()), GPRInfo::argumentGPR0);
jit.loadPtr(CCallHelpers::Address(GPRInfo::argumentGPR0, JSWebAssemblyInstance::offsetOfCallee()), GPRInfo::argumentGPR1);
+ jit.prepareCallOperation(vm);
jit.storePtr(GPRInfo::argumentGPR1, JIT::Address(GPRInfo::callFrameRegister, CallFrameSlot::callee * static_cast<int>(sizeof(Register))));
auto call = jit.call(OperationPtrTag);
@@ -77,7 +78,7 @@
if (UNLIKELY(linkBuffer.didFailToAllocate()))
return makeUnexpected(BindingFailure::OutOfMemory);
- linkBuffer.link(call, FunctionPtr<OperationPtrTag>(operationThrowBadI64));
+ linkBuffer.link(call, FunctionPtr<OperationPtrTag>(operationWasmThrowBadI64));
return FINALIZE_WASM_CODE(linkBuffer, WasmEntryPtrTag, "WebAssembly->JavaScript invalid i64 use in import[%i]", importIndex);
}
@@ -516,7 +517,7 @@
return FINALIZE_WASM_CODE(patchBuffer, WasmEntryPtrTag, "WebAssembly->JavaScript import[%i] %s", importIndex, signature.toString().ascii().data());
}
-void* wasmToJSException(CallFrame* callFrame, Wasm::ExceptionType type, Instance* wasmInstance)
+void* JIT_OPERATION operationWasmToJSException(CallFrame* callFrame, Wasm::ExceptionType type, Instance* wasmInstance)
{
wasmInstance->storeTopCallFrame(callFrame);
JSWebAssemblyInstance* instance = wasmInstance->owner<JSWebAssemblyInstance>();
@@ -565,7 +566,7 @@
jit.breakpoint(); // We should not reach this.
jit.addLinkTask([=] (LinkBuffer& linkBuffer) {
- linkBuffer.link(call, FunctionPtr<OperationPtrTag>(Wasm::wasmToJSException));
+ linkBuffer.link(call, FunctionPtr<OperationPtrTag>(Wasm::operationWasmToJSException));
});
}
diff --git a/Source/JavaScriptCore/wasm/js/WasmToJS.h b/Source/JavaScriptCore/wasm/js/WasmToJS.h
index 48160e5..2dee10f 100644
--- a/Source/JavaScriptCore/wasm/js/WasmToJS.h
+++ b/Source/JavaScriptCore/wasm/js/WasmToJS.h
@@ -44,7 +44,7 @@
Expected<MacroAssemblerCodeRef<WasmEntryPtrTag>, BindingFailure> wasmToJS(VM&, Bag<CallLinkInfo>& callLinkInfos, SignatureIndex, unsigned importIndex);
-void* wasmToJSException(CallFrame*, Wasm::ExceptionType, Instance*);
+void* JIT_OPERATION operationWasmToJSException(CallFrame*, Wasm::ExceptionType, Instance*) WTF_INTERNAL;
void emitThrowWasmToJSException(CCallHelpers&, GPRReg wasmInstance, Wasm::ExceptionType);
} } // namespace JSC::Wasm
diff --git a/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp b/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp
index 6a245d1..e7407e8 100644
--- a/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp
+++ b/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp
@@ -80,7 +80,7 @@
JSWebAssemblyInstance* instance = JSWebAssemblyInstance::create(vm, globalObject, JSWebAssemblyInstance::createPrivateModuleKey(), module, importObject, instanceStructure, Ref<Wasm::Module>(module->module()), Wasm::CreationMode::FromJS);
RETURN_IF_EXCEPTION(scope, { });
- instance->finalizeCreation(vm, globalObject, module->module().compileSync(&vm.wasmContext, instance->memoryMode(), &Wasm::createJSToWasmWrapper, &Wasm::wasmToJSException), importObject, Wasm::CreationMode::FromJS);
+ instance->finalizeCreation(vm, globalObject, module->module().compileSync(&vm.wasmContext, instance->memoryMode(), &Wasm::createJSToWasmWrapper, &Wasm::operationWasmToJSException), importObject, Wasm::CreationMode::FromJS);
RETURN_IF_EXCEPTION(scope, { });
return JSValue::encode(instance);
}
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index 72237ab..4ed6f44 100644
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2019-10-23 Yusuke Suzuki <ysuzuki@apple.com>
+
+ [JSC] Figure out missing prepareCallOperation
+ https://bugs.webkit.org/show_bug.cgi?id=203285
+
+ Reviewed by Mark Lam.
+
+ Enable USE(BUILTIN_FRAME_ADDRESS) regardless of platform is the compilers and architectures match.
+
+ * wtf/Platform.h:
+
2019-10-23 Tim Horton <timothy_horton@apple.com>
macCatalyst: Should dispatch contextmenu event on right click
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
index f0c0fff..b7027ec 100644
--- a/Source/WTF/wtf/Platform.h
+++ b/Source/WTF/wtf/Platform.h
@@ -1001,7 +1001,7 @@
#endif
/* Use __builtin_frame_address(1) to get CallFrame* */
-#if COMPILER(GCC_COMPATIBLE) && (CPU(ARM64) || CPU(X86_64)) && (OS(LINUX) || OS(DARWIN))
+#if COMPILER(GCC_COMPATIBLE) && (CPU(ARM64) || CPU(X86_64))
#define USE_BUILTIN_FRAME_ADDRESS 1
#endif
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 25f68cf..99a09e5 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2019-10-23 Yusuke Suzuki <ysuzuki@apple.com>
+
+ [JSC] Figure out missing prepareCallOperation
+ https://bugs.webkit.org/show_bug.cgi?id=203285
+
+ Reviewed by Mark Lam.
+
+ Use JITOperationPrologueCallFrameTracer instead of NativeCallFrameTracer.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateOperationDefinition):
+ * bindings/scripts/test/JS/JSTestDOMJIT.cpp:
+ (WebCore::jsTestDOMJITPrototypeFunctionGetAttributeWithoutTypeCheck):
+ (WebCore::jsTestDOMJITPrototypeFunctionItemWithoutTypeCheck):
+ (WebCore::jsTestDOMJITPrototypeFunctionHasAttributeWithoutTypeCheck):
+ (WebCore::jsTestDOMJITPrototypeFunctionGetElementByIdWithoutTypeCheck):
+ (WebCore::jsTestDOMJITPrototypeFunctionGetElementsByNameWithoutTypeCheck):
+ * domjit/DOMJITHelpers.h:
+ (WebCore::DOMJIT::toWrapperSlow):
+
2019-10-23 Tim Horton <timothy_horton@apple.com>
macCatalyst: Should dispatch contextmenu event on right click
diff --git a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
index df1b81c..5d5908d 100644
--- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
+++ b/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm
@@ -5368,7 +5368,7 @@
push(@$outputArray, " IGNORE_WARNINGS_BEGIN(\"frame-address\")\n");
push(@$outputArray, " CallFrame* callFrame = DECLARE_CALL_FRAME(vm);\n");
push(@$outputArray, " IGNORE_WARNINGS_END\n");
- push(@$outputArray, " JSC::NativeCallFrameTracer tracer(vm, callFrame);\n");
+ push(@$outputArray, " JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);\n");
push(@$outputArray, " auto throwScope = DECLARE_THROW_SCOPE(vm);\n");
push(@$outputArray, " UNUSED_PARAM(throwScope);\n");
push(@$outputArray, " auto& impl = castedThis->wrapped();\n");
diff --git a/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp b/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp
index ea833a1..193e228 100644
--- a/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp
+++ b/Source/WebCore/bindings/scripts/test/JS/JSTestDOMJIT.cpp
@@ -1141,7 +1141,7 @@
IGNORE_WARNINGS_BEGIN("frame-address")
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
IGNORE_WARNINGS_END
- JSC::NativeCallFrameTracer tracer(vm, callFrame);
+ JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
@@ -1177,7 +1177,7 @@
IGNORE_WARNINGS_BEGIN("frame-address")
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
IGNORE_WARNINGS_END
- JSC::NativeCallFrameTracer tracer(vm, callFrame);
+ JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
@@ -1209,7 +1209,7 @@
IGNORE_WARNINGS_BEGIN("frame-address")
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
IGNORE_WARNINGS_END
- JSC::NativeCallFrameTracer tracer(vm, callFrame);
+ JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
@@ -1241,7 +1241,7 @@
IGNORE_WARNINGS_BEGIN("frame-address")
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
IGNORE_WARNINGS_END
- JSC::NativeCallFrameTracer tracer(vm, callFrame);
+ JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
@@ -1275,7 +1275,7 @@
IGNORE_WARNINGS_BEGIN("frame-address")
CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
IGNORE_WARNINGS_END
- JSC::NativeCallFrameTracer tracer(vm, callFrame);
+ JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
auto throwScope = DECLARE_THROW_SCOPE(vm);
UNUSED_PARAM(throwScope);
auto& impl = castedThis->wrapped();
diff --git a/Source/WebCore/domjit/DOMJITHelpers.h b/Source/WebCore/domjit/DOMJITHelpers.h
index e6bea5d..6d56886 100644
--- a/Source/WebCore/domjit/DOMJITHelpers.h
+++ b/Source/WebCore/domjit/DOMJITHelpers.h
@@ -61,7 +61,7 @@
ASSERT(globalObject);
JSC::VM& vm = globalObject->vm();
JSC::CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
- JSC::NativeCallFrameTracer tracer(vm, callFrame);
+ JSC::JITOperationPrologueCallFrameTracer tracer(vm, callFrame);
return JSC::JSValue::encode(toJS(globalObject, static_cast<JSDOMGlobalObject*>(globalObject), *static_cast<WrappedNode*>(result)));
}
