Changeset 251475 in webkit for trunk/Source/JavaScriptCore/interpreter

Timestamp:

Oct 22, 2019, 10:16:51 PM (6 years ago)

Author:

[email protected]

Message:

Make JSGlobalObject* threading change more stabilized by adding tests and assertions
​https://bugs.webkit.org/show_bug.cgi?id=203274

Reviewed by Saam Barati.

Source/JavaScriptCore:

This patch does some follow-up changes after r251425.

1. Add tests that tests vm.topCallFrame from C++ world to ensure that vm.topCallFrame is kept nullptr if it is accessed from C++ world even after executing some scripts.
2. Add assertion to ensure that DECLARE_CALL_FRAME is only called in JIT operation's prologue.
3. Remove some of ExecState::deprecatedVM call.
4. Define USE(BUILTIN_FRAME_ADDRESS) when using builtin_frame_address to get CallFrame.

• API/tests/testapi.cpp:

(TestAPI::topCallFrameAccess):
(testCAPIViaCpp):

• interpreter/CallFrame.cpp:

(JSC::isFromJSCode):

• interpreter/CallFrame.h:
• jit/CCallHelpers.h:

(JSC::CCallHelpers::prepareCallOperation):

• tools/VMInspector.cpp:

(JSC::VMInspector::dumpRegisters):

Source/WTF:

• wtf/Platform.h:

Location:

trunk/Source/JavaScriptCore/interpreter

Files:

• CallFrame.cpp (modified) (2 diffs)
• CallFrame.h (modified) (1 diff)

trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -28 +28 @@
 
 #include "CodeBlock.h"
+#include "ExecutableAllocator.h"
 #include "InlineCallFrame.h"
 #include "Interpreter.h"
 #include "JSCInlines.h"
 #include "JSWebAssemblyInstance.h"
+#include "LLIntPCRanges.h"
 #include "VMEntryScope.h"
 #include "WasmContextInlines.h"
@@ -356 +358 @@
 }
 
+bool isFromJSCode(void* returnAddress)
+{
+    UNUSED_PARAM(returnAddress);
+#if ENABLE(JIT)
+    if (isJITPC(returnAddress))
+        return true;
+#endif
+#if ENABLE(C_LOOP)
+    return true;
+#else
+    return LLInt::isLLIntPC(returnAddress);
+#endif
+}
+
 } // namespace JSC

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -325 +325 @@
 // Helper function to get VM& from JSGlobalObject* if JSGlobalObject.h is not included.
 VM& getVM(JSGlobalObject*);
-
-#if COMPILER(GCC_COMPATIBLE) && (CPU(ARM64) || CPU(X86_64)) && (OS(LINUX) || OS(DARWIN))
-#define DECLARE_CALL_FRAME(vm) (bitwise_cast<JSC::CallFrame*>(__builtin_frame_address(1)))
+JS_EXPORT_PRIVATE bool isFromJSCode(void* returnAddress);
+
+#if USE(BUILTIN_FRAME_ADDRESS)
+#define DECLARE_CALL_FRAME(vm) \
+    ({ \
+        ASSERT(JSC::isFromJSCode(removeCodePtrTag<void*>(__builtin_return_address(0)))); \
+        bitwise_cast<JSC::CallFrame*>(__builtin_frame_address(1)); \
+    })
 #else
 #define DECLARE_CALL_FRAME(vm) ((vm).topCallFrame)