Changeset 277882 in webkit

Timestamp:

May 21, 2021, 1:21:37 PM (4 years ago)

Author:

mark.lam@apple.com

Message:

Introducing JITThunks::preinitializeCTIThunks().
​https://bugs.webkit.org/show_bug.cgi?id=226105

Reviewed by Geoffrey Garen.

We're basically renaming JITThunks::preinitializeExtraCTIThunks() to
JITThunks::preinitializeCTIThunks() and making it not conditional on
#if ENABLE(EXTRA_CTI_THUNKS). Some thunks need to be initialized independent of
#if ENABLE(EXTRA_CTI_THUNKS).

• jit/JITThunks.cpp:

(JSC::JITThunks::preinitializeCTIThunks):
(JSC::JITThunks::preinitializeExtraCTIThunks): Deleted.

• jit/JITThunks.h:
• runtime/VM.cpp:

(JSC::VM::VM):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jit/JITThunks.cpp (modified) (3 diffs)
• jit/JITThunks.h (modified) (1 diff)
• runtime/VM.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2021-05-21  Mark Lam  <mark.lam@apple.com>
+
+        Introducing JITThunks::preinitializeCTIThunks().
+        https://bugs.webkit.org/show_bug.cgi?id=226105
+
+        Reviewed by Geoffrey Garen.
+
+        We're basically renaming JITThunks::preinitializeExtraCTIThunks() to
+        JITThunks::preinitializeCTIThunks() and making it not conditional on
+        #if ENABLE(EXTRA_CTI_THUNKS).  Some thunks need to be initialized independent of
+        #if ENABLE(EXTRA_CTI_THUNKS).
+
+        * jit/JITThunks.cpp:
+        (JSC::JITThunks::preinitializeCTIThunks):
+        (JSC::JITThunks::preinitializeExtraCTIThunks): Deleted.
+        * jit/JITThunks.h:
+        * runtime/VM.cpp:
+        (JSC::VM::VM):
+
 2021-05-21  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/JavaScriptCore/jit/JITThunks.cpp

@@ -259 +259 @@
 }
 
-#if ENABLE(EXTRA_CTI_THUNKS)
-
-void JITThunks::preinitializeExtraCTIThunks(VM& vm)
+void JITThunks::preinitializeCTIThunks(VM& vm)
 {
     if (!Options::useJIT())
         return;
 
+#if ENABLE(EXTRA_CTI_THUNKS)
     // These 4 should always be initialized first in the following order because
     // the other thunk generators rely on these already being initialized.
@@ -378 +377 @@
     ctiStub(vm, JIT::op_ret_handlerGenerator);
     ctiStub(vm, JIT::op_throw_handlerGenerator);
+#endif // ENABLE(EXTRA_CTI_THUNKS)
 
     ctiStub(vm, linkCallThunkGenerator);
@@ -383 +383 @@
 }
 
-#endif // ENABLE(EXTRA_CTI_THUNKS)
 
 } // namespace JSC

trunk/Source/JavaScriptCore/jit/JITThunks.h

@@ -54 +54 @@
     ~JITThunks() final;
 
-#if ENABLE(EXTRA_CTI_THUNKS)
-    void preinitializeExtraCTIThunks(VM&);
-#endif
+    void preinitializeCTIThunks(VM&);
 
     MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeCall(VM&);

trunk/Source/JavaScriptCore/runtime/VM.cpp

@@ -569 +569 @@
         getCTIInternalFunctionTrampolineFor(CodeForConstruct);
 
-#if ENABLE(EXTRA_CTI_THUNKS)
-        jitStubs->preinitializeExtraCTIThunks(*this);
-#endif
+        jitStubs->preinitializeCTIThunks(*this);
     }
 #endif // ENABLE(JIT)