Changeset 267820 in webkit for trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

Timestamp:

Sep 30, 2020, 10:15:14 PM (5 years ago)

Author:

[email protected]

Message:

[JSC] We should not tag C function with JIT code related ptr tag
​https://bugs.webkit.org/show_bug.cgi?id=217150

Reviewed by Mark Lam.

We are tagging getHostCallReturnValue function with JIT related PtrTag. As a part of JIT-caging effort, we are restricting our
PtrTag usage more for code types (e.g. JIT code should be tagged with JIT related PtrTag). So, we should not tag getHostCallReturnValue
with that. This patch implements getHostCallReturnValue in JIT code if JIT is enabled. If not, it is implemented by LLInt.

• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• bytecode/BytecodeList.rb:
• dfg/DFGCapabilities.cpp:

(JSC::DFG::capabilityLevel):

• heap/MarkedBlock.h:

(JSC::MarkedBlock::Footer::offsetOfVM):

• heap/PreciseAllocation.h:

(JSC::PreciseAllocation::offsetOfWeakSet):

• heap/WeakSet.h:

(JSC::WeakSet::offsetOfVM):

• jit/HostCallReturnValue.cpp: Removed.
• jit/HostCallReturnValue.h: Removed.
• jit/JITOperations.cpp:
• jit/JITOperationsMSVC64.cpp: Removed.
• jit/JITStubsMSVC64.asm:
• llint/LLIntEntrypoint.cpp:

(JSC::LLInt::getHostCallReturnValueEntrypoint):

• llint/LLIntEntrypoint.h:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::handleHostCall):
(JSC::LLInt::commonCallEval):

• llint/LLIntThunks.cpp:

(JSC::LLInt::getHostCallReturnValueThunk):

• llint/LLIntThunks.h:
• llint/LowLevelInterpreter.cpp:

(JSC::CLoop::execute):

• llint/LowLevelInterpreter32_64.asm:
• llint/LowLevelInterpreter64.asm:
• runtime/JSCellInlines.h:

(JSC::tryAllocateCellHelper):

• runtime/JSGlobalObject.h:

(JSC::JSGlobalObject::offsetOfVM):

• runtime/VM.cpp:

(JSC::VM::VM):

• runtime/VM.h:

(JSC::VM::offsetOfEncodedHostCallReturnValue):

File:

• trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -41 +41 @@
 #include "FunctionCodeBlock.h"
 #include "GetterSetter.h"
-#include "HostCallReturnValue.h"
 #include "JITExceptions.h"
 #include "JITWorklist.h"
@@ -1672 +1671 @@
             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);
+            vm.encodedHostCallReturnValue = callData.native.function(asObject(callee)->globalObject(vm), calleeFrame);
+            DisallowGC disallowGC;
+            LLINT_CALL_RETURN(globalObject, calleeFrame, LLInt::getHostCallReturnValueEntrypoint().code().executableAddress(), JSEntryPtrTag);
         }
         
@@ -1690 +1690 @@
         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);
+        vm.encodedHostCallReturnValue = constructData.native.function(asObject(callee)->globalObject(vm), calleeFrame);
+        DisallowGC disallowGC;
+        LLINT_CALL_RETURN(globalObject, calleeFrame, LLInt::getHostCallReturnValueEntrypoint().code().executableAddress(), JSEntryPtrTag);
     }
     
@@ -1960 +1961 @@
         RELEASE_AND_RETURN(throwScope, setUpCall(calleeFrame, CodeForCall, calleeAsValue));
     
-    vm.hostCallReturnValue = eval(globalObject, calleeFrame, bytecode.m_ecmaMode);
-    LLINT_CALL_RETURN(globalObject, calleeFrame, LLInt::getCodePtr(getHostCallReturnValue), CFunctionPtrTag);
+    vm.encodedHostCallReturnValue = JSValue::encode(eval(globalObject, calleeFrame, bytecode.m_ecmaMode));
+    DisallowGC disallowGC;
+    LLINT_CALL_RETURN(globalObject, calleeFrame, LLInt::getHostCallReturnValueEntrypoint().code().executableAddress(), JSEntryPtrTag);
 }