Title: [277882] trunk/Source/_javascript_Core
- Revision
- 277882
- Author
- mark....@apple.com
- Date
- 2021-05-21 13:21:37 -0700 (Fri, 21 May 2021)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (277881 => 277882)
--- trunk/Source/_javascript_Core/ChangeLog 2021-05-21 20:20:07 UTC (rev 277881)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-05-21 20:21:37 UTC (rev 277882)
@@ -1,3 +1,22 @@
+2021-05-21 Mark Lam <mark....@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 <ape...@igalia.com>
Non-unified build fixes, late-ish May 2021 edition
Modified: trunk/Source/_javascript_Core/jit/JITThunks.cpp (277881 => 277882)
--- trunk/Source/_javascript_Core/jit/JITThunks.cpp 2021-05-21 20:20:07 UTC (rev 277881)
+++ trunk/Source/_javascript_Core/jit/JITThunks.cpp 2021-05-21 20:21:37 UTC (rev 277882)
@@ -258,13 +258,12 @@
return hostFunctionStub(vm, function, callHostFunctionAsConstructor, generator, intrinsic, nullptr, name);
}
-#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.
ctiStub(vm, handleExceptionGenerator);
@@ -377,12 +376,12 @@
ctiStub(vm, JIT::op_enter_handlerGenerator);
ctiStub(vm, JIT::op_ret_handlerGenerator);
ctiStub(vm, JIT::op_throw_handlerGenerator);
+#endif // ENABLE(EXTRA_CTI_THUNKS)
ctiStub(vm, linkCallThunkGenerator);
ctiStub(vm, arityFixupGenerator);
}
-#endif // ENABLE(EXTRA_CTI_THUNKS)
} // namespace JSC
Modified: trunk/Source/_javascript_Core/jit/JITThunks.h (277881 => 277882)
--- trunk/Source/_javascript_Core/jit/JITThunks.h 2021-05-21 20:20:07 UTC (rev 277881)
+++ trunk/Source/_javascript_Core/jit/JITThunks.h 2021-05-21 20:21:37 UTC (rev 277882)
@@ -53,9 +53,7 @@
JITThunks();
~JITThunks() final;
-#if ENABLE(EXTRA_CTI_THUNKS)
- void preinitializeExtraCTIThunks(VM&);
-#endif
+ void preinitializeCTIThunks(VM&);
MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeCall(VM&);
MacroAssemblerCodePtr<JITThunkPtrTag> ctiNativeConstruct(VM&);
Modified: trunk/Source/_javascript_Core/runtime/VM.cpp (277881 => 277882)
--- trunk/Source/_javascript_Core/runtime/VM.cpp 2021-05-21 20:20:07 UTC (rev 277881)
+++ trunk/Source/_javascript_Core/runtime/VM.cpp 2021-05-21 20:21:37 UTC (rev 277882)
@@ -568,9 +568,7 @@
getCTIInternalFunctionTrampolineFor(CodeForCall);
getCTIInternalFunctionTrampolineFor(CodeForConstruct);
-#if ENABLE(EXTRA_CTI_THUNKS)
- jitStubs->preinitializeExtraCTIThunks(*this);
-#endif
+ jitStubs->preinitializeCTIThunks(*this);
}
#endif // ENABLE(JIT)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
