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

Timestamp:

Oct 23, 2019, 10:34:21 PM (6 years ago)

Author:

[email protected]

Message:

[JSC] Remove wasmAwareLexicalGlobalObject
​https://bugs.webkit.org/show_bug.cgi?id=203351

Reviewed by Mark Lam.

Source/JavaScriptCore:

CallFrame::lexicalGlobalObject() is no longer called frequently. We can just make the current wasmAwareLexicalGlobalObject as CallFrame::lexicalGlobalObject,
and remove wasmAwareLexicalGlobalObject function.

• debugger/Debugger.cpp:

(JSC::Debugger::hasBreakpoint):
(JSC::Debugger::breakProgram):
(JSC::lexicalGlobalObjectForCallFrame):

• debugger/DebuggerCallFrame.cpp:

(JSC::DebuggerCallFrame::deprecatedVMEntryGlobalObject const):
(JSC::DebuggerCallFrame::scope):
(JSC::DebuggerCallFrame::thisValue const):
(JSC::DebuggerCallFrame::evaluateWithScopeExtension):

• debugger/DebuggerCallFrame.h:
• inspector/JSJavaScriptCallFrame.cpp:

(Inspector::JSJavaScriptCallFrame::thisObject const):

• inspector/JavaScriptCallFrame.h:

(Inspector::JavaScriptCallFrame::thisValue const):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::lexicalGlobalObjectFromWasmCallee const):
(JSC::CallFrame::wasmAwareLexicalGlobalObject): Deleted.

• interpreter/CallFrame.h:
• interpreter/Interpreter.cpp:

(JSC::notifyDebuggerOfUnwinding):
(JSC::Interpreter::debug):

• interpreter/StackVisitor.cpp:

(JSC::StackVisitor::Frame::createArguments):

• interpreter/StackVisitor.h:
• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::llint_throw_stack_overflow_error):

• runtime/JSFunction.cpp:

(JSC::RetrieveArgumentsFunctor::RetrieveArgumentsFunctor):
(JSC::RetrieveArgumentsFunctor::operator() const):
(JSC::retrieveArguments):

• runtime/JSScope.h:

(JSC::CallFrame::lexicalGlobalObject const):

• runtime/RegExpInlines.h:

(JSC::RegExp::matchInline):

• wasm/js/WasmToJS.cpp:

(JSC::Wasm::wasmToJS):

Source/WebCore:

• bindings/js/CommonVM.cpp:

(WebCore::lexicalFrameFromCommonVM):

• bindings/js/JSDOMWindowBase.cpp:

(WebCore::responsibleDocument):

• bindings/js/StructuredClone.cpp:

(WebCore::cloneArrayBufferImpl):

• dom/Document.cpp:

(WebCore::Document::shouldBypassMainWorldContentSecurityPolicy const):

• testing/Internals.cpp:

(WebCore::Internals::parserMetaData):
(WebCore::Internals::isFromCurrentWorld const):

Location:

trunk/Source/JavaScriptCore/interpreter

Files:

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

trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp

@@ -191 +191 @@
 }
 
-JSGlobalObject* CallFrame::wasmAwareLexicalGlobalObject(VM& vm)
-{
-#if ENABLE(WEBASSEMBLY)
-    if (!callee().isWasm())
-        return lexicalGlobalObject();
-    return vm.wasmContext.load()->owner<JSWebAssemblyInstance>()->globalObject();
-#else
-    UNUSED_PARAM(vm);
-    return lexicalGlobalObject();
-#endif
-}
-
 bool CallFrame::isAnyWasmCallee()
 {
@@ -358 +346 @@
 }
 
+#if ENABLE(WEBASSEMBLY)
+JSGlobalObject* CallFrame::lexicalGlobalObjectFromWasmCallee(VM& vm) const
+{
+    return vm.wasmContext.load()->owner<JSWebAssemblyInstance>()->globalObject();
+}
+#endif
+
 bool isFromJSCode(void* returnAddress)
 {

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -126 +126 @@
         }
 
-        JSGlobalObject* wasmAwareLexicalGlobalObject(VM&);
-
         JS_EXPORT_PRIVATE bool isAnyWasmCallee();
 
         // Global object in which the currently executing code was defined.
         // Differs from VM::deprecatedVMEntryGlobalObject() during function calls across web browser frames.
-        JSGlobalObject* lexicalGlobalObject() const;
+        JSGlobalObject* lexicalGlobalObject(VM&) const;
 
         // FIXME: Remove this function
@@ -170 +168 @@
     private:
         unsigned callSiteBitsAsBytecodeOffset() const;
+#if ENABLE(WEBASSEMBLY)
+        JS_EXPORT_PRIVATE JSGlobalObject* lexicalGlobalObjectFromWasmCallee(VM&) const;
+#endif
     public:
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -516 +516 @@
 ALWAYS_INLINE static void notifyDebuggerOfUnwinding(VM& vm, CallFrame* callFrame)
 {
-    JSGlobalObject* globalObject = callFrame->wasmAwareLexicalGlobalObject(vm);
+    JSGlobalObject* globalObject = callFrame->lexicalGlobalObject(vm);
     auto catchScope = DECLARE_CATCH_SCOPE(vm);
     if (Debugger* debugger = globalObject->debugger()) {
@@ -1217 +1217 @@
     VM& vm = callFrame->deprecatedVM();
     auto scope = DECLARE_CATCH_SCOPE(vm);
-    Debugger* debugger = callFrame->lexicalGlobalObject()->debugger();
+    Debugger* debugger = callFrame->lexicalGlobalObject(vm)->debugger();
     if (!debugger)
         return;

trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp

@@ -370 +370 @@
 }
 
-ClonedArguments* StackVisitor::Frame::createArguments()
+ClonedArguments* StackVisitor::Frame::createArguments(VM& vm)
 {
     ASSERT(m_callFrame);
@@ -376 +376 @@
     // FIXME: Revisit JSGlobalObject.
     // https://bugs.webkit.org/show_bug.cgi?id=203204
-    JSGlobalObject* globalObject = physicalFrame->lexicalGlobalObject();
+    JSGlobalObject* globalObject = physicalFrame->lexicalGlobalObject(vm);
     ClonedArguments* arguments;
     ArgumentsMode mode;

trunk/Source/JavaScriptCore/interpreter/StackVisitor.h

@@ -98 +98 @@
 #endif
 
-        ClonedArguments* createArguments();
+        ClonedArguments* createArguments(VM&);
         CallFrame* callFrame() const { return m_callFrame; }