Changeset 273217 in webkit

Timestamp:

Feb 21, 2021 4:35:49 AM (3 years ago)

Author:

ysuzuki@apple.com

Message:

[JSC] Remove vm.topCallFrame storing in Baseline JIT
​https://bugs.webkit.org/show_bug.cgi?id=222162

Reviewed by Mark Lam.

This patch removes vm.topCallFrame storing in the Baseline JIT for ports that can USE(BUILTIN_FRAME_ADDRESS).
Also refactored some CommonSlowPath functions so that they can start using builtin_frame_address later
instead of requiring that CallFrame be passed in.

• jit/JITInlines.h:

(JSC::JIT::updateTopCallFrame):

• runtime/CommonSlowPaths.cpp:

(JSC::iteratorOpenTryFastImpl):
(JSC::JSC_DEFINE_COMMON_SLOW_PATH):
(JSC::iteratorNextTryFastImpl):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITInlines.h (modified) (1 diff)
• runtime/CommonSlowPaths.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-02-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
+        [JSC] Remove vm.topCallFrame storing in Baseline JIT
+        https://bugs.webkit.org/show_bug.cgi?id=222162
+
+        Reviewed by Mark Lam.
+
+        This patch removes vm.topCallFrame storing in the Baseline JIT for ports that can USE(BUILTIN_FRAME_ADDRESS).
+        Also refactored some CommonSlowPath functions so that they can start using __builtin_frame_address later
+        instead of requiring that CallFrame be passed in.
+
+        * jit/JITInlines.h:
+        (JSC::JIT::updateTopCallFrame):
+        * runtime/CommonSlowPaths.cpp:
+        (JSC::iteratorOpenTryFastImpl):
+        (JSC::JSC_DEFINE_COMMON_SLOW_PATH):
+        (JSC::iteratorNextTryFastImpl):
+
 2021-02-19  Yusuke Suzuki  <ysuzuki@apple.com>
 

trunk/Source/JavaScriptCore/jit/JITInlines.h

@@ -110 +110 @@
     uint32_t locationBits = CallSiteIndex(m_bytecodeIndex.offset()).bits();
     store32(TrustedImm32(locationBits), tagFor(CallFrameSlot::argumentCountIncludingThis));
-    
-    // FIXME: It's not clear that this is needed. JITOperations tend to update the top call frame on
-    // the C++ side.
-    // https://bugs.webkit.org/show_bug.cgi?id=155693
-    storePtr(callFrameRegister, &m_vm->topCallFrame);
+    prepareCallOperation(*m_vm);
 }
 

trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.cpp

@@ -853 +853 @@
 
 template<OpcodeSize width>
-ALWAYS_INLINE SlowPathReturnType iteratorOpenTryFastImpl(CallFrame* callFrame, const Instruction* pc)
-{
-    // Don't set PC; we can't throw and it's relatively slow.
-    BEGIN_NO_SET_PC();
-
+ALWAYS_INLINE SlowPathReturnType iteratorOpenTryFastImpl(VM& vm, JSGlobalObject* globalObject, CodeBlock* codeBlock, CallFrame* callFrame, const Instruction* pc)
+{
     auto bytecode = pc->asKnownWidth<OpIteratorOpen, width>();
     auto& metadata = bytecode.metadata(codeBlock);
@@ -882 +879 @@
 JSC_DEFINE_COMMON_SLOW_PATH(iterator_open_try_fast_narrow)
 {
-    return iteratorOpenTryFastImpl<Narrow>(callFrame, pc);
+    // Don't set PC; we can't throw and it's relatively slow.
+    BEGIN_NO_SET_PC();
+    return iteratorOpenTryFastImpl<Narrow>(vm, globalObject, codeBlock, callFrame, pc);
 }
 
 JSC_DEFINE_COMMON_SLOW_PATH(iterator_open_try_fast_wide16)
 {
-    return iteratorOpenTryFastImpl<Wide16>(callFrame, pc);
+    // Don't set PC; we can't throw and it's relatively slow.
+    BEGIN_NO_SET_PC();
+    return iteratorOpenTryFastImpl<Wide16>(vm, globalObject, codeBlock, callFrame, pc);
 }
 
 JSC_DEFINE_COMMON_SLOW_PATH(iterator_open_try_fast_wide32)
 {
-    return iteratorOpenTryFastImpl<Wide32>(callFrame, pc);
+    // Don't set PC; we can't throw and it's relatively slow.
+    BEGIN_NO_SET_PC();
+    return iteratorOpenTryFastImpl<Wide32>(vm, globalObject, codeBlock, callFrame, pc);
 }
 
 template<OpcodeSize width>
-ALWAYS_INLINE SlowPathReturnType iteratorNextTryFastImpl(CallFrame* callFrame, const Instruction* pc)
-{
-    BEGIN();
-
+ALWAYS_INLINE SlowPathReturnType iteratorNextTryFastImpl(VM& vm, JSGlobalObject* globalObject, CodeBlock* codeBlock, CallFrame* callFrame, ThrowScope& throwScope, const Instruction* pc)
+{
     auto bytecode = pc->asKnownWidth<OpIteratorNext, width>();
     auto& metadata = bytecode.metadata(codeBlock);
@@ -939 +940 @@
 JSC_DEFINE_COMMON_SLOW_PATH(iterator_next_try_fast_narrow)
 {
-    return iteratorNextTryFastImpl<Narrow>(callFrame, pc);
+    BEGIN();
+    return iteratorNextTryFastImpl<Narrow>(vm, globalObject, codeBlock, callFrame, throwScope, pc);
 }
 
 JSC_DEFINE_COMMON_SLOW_PATH(iterator_next_try_fast_wide16)
 {
-    return iteratorNextTryFastImpl<Wide16>(callFrame, pc);
+    BEGIN();
+    return iteratorNextTryFastImpl<Wide16>(vm, globalObject, codeBlock, callFrame, throwScope, pc);
 }
 
 JSC_DEFINE_COMMON_SLOW_PATH(iterator_next_try_fast_wide32)
 {
-    return iteratorNextTryFastImpl<Wide32>(callFrame, pc);
+    BEGIN();
+    return iteratorNextTryFastImpl<Wide32>(vm, globalObject, codeBlock, callFrame, throwScope, pc);
 }