Changeset 290873 in webkit for trunk/Source/JavaScriptCore/assembler

Timestamp:

Mar 5, 2022, 10:59:01 PM (3 years ago)

Author:

[email protected]

Message:

Fix JITOperationList::addPointers() to support JIT_OPERATION_VALIDATION_ASSERT_ENABLED.
​https://bugs.webkit.org/show_bug.cgi?id=237504
<rdar://problem/89770507>

Reviewed by Saam Barati.

According to tagJSCCodePtrImpl(), we will only use an operation's validation entry
if Options::useJITCage(). Make JITOperationList::addPointers() conform to this.

• assembler/JITOperationList.cpp:

(JSC::JITOperationList::addPointers):

File:

• trunk/Source/JavaScriptCore/assembler/JITOperationList.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/assembler/JITOperationList.cpp

@@ -67 +67 @@
     }
 #endif
-    if constexpr (ASSERT_ENABLED) {
+    if constexpr (JIT_OPERATION_VALIDATION_ASSERT_ENABLED) {
         for (const auto* current = begin; current != end; ++current) {
             void* operation = removeCodePtrTag(current->operation);
             if (operation) {
-                void* validator = removeCodePtrTag(current->operationWithValidation);
+                void* validator = removeCodePtrTag(Options::useJITCage() ? current->operationWithValidation : current->operation);
                 validator = WTF::tagNativeCodePtrImpl<OperationPtrTag>(validator);
                 map.add(operation, validator);