Changeset 292891 in webkit for trunk/Source/JavaScriptCore/debugger/Debugger.cpp

Timestamp:

Apr 14, 2022, 2:56:27 PM (3 years ago)

Author:

[email protected]

Message:

[JSC] Reduce use of CallFrame::deprecatedVM
​https://bugs.webkit.org/show_bug.cgi?id=239326

Reviewed by Devin Rousso.

Reduce use of CallFrame::deprecatedVM, mainly in inspector related code to eventually remove CallFrame::deprecatedVM.

• Source/JavaScriptCore/debugger/Debugger.cpp:

(JSC::Debugger::evaluateBreakpointCondition):
(JSC::Debugger::evaluateBreakpointActions):
(JSC::Debugger::exceptionOrCaughtValue):

• Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp:

(JSC::DebuggerCallFrame::globalObject):
(JSC::DebuggerCallFrame::functionName const):
(JSC::DebuggerCallFrame::scope):
(JSC::DebuggerCallFrame::type const):
(JSC::DebuggerCallFrame::evaluateWithScopeExtension):
(JSC::DebuggerCallFrame::deprecatedVMEntryGlobalObject const): Deleted.

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

(Inspector::JSJavaScriptCallFrame::evaluateWithScopeExtension):
(Inspector::JSJavaScriptCallFrame::scopeDescriptions):
(Inspector::JSJavaScriptCallFrame::functionName const):
(Inspector::JSJavaScriptCallFrame::scopeChain const):
(Inspector::JSJavaScriptCallFrame::type const):

• Source/JavaScriptCore/inspector/JavaScriptCallFrame.h:

(Inspector::JavaScriptCallFrame::functionName const):
(Inspector::JavaScriptCallFrame::type const):
(Inspector::JavaScriptCallFrame::scopeChain const):
(Inspector::JavaScriptCallFrame::evaluateWithScopeExtension const):
(Inspector::JavaScriptCallFrame::deprecatedVMEntryGlobalObject const): Deleted.

• Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp:

(Inspector::InspectorDebuggerAgent::debuggerScopeExtensionObject):
(Inspector::InspectorDebuggerAgent::didPause):

• Source/JavaScriptCore/interpreter/Interpreter.cpp:

(JSC::Interpreter::debug):

Canonical link: ​https://commits.webkit.org/249661@main

File:

• trunk/Source/JavaScriptCore/debugger/Debugger.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/debugger/Debugger.cpp

@@ -608 +608 @@
     ASSERT(isAttached(globalObject));
 
+    VM& vm = globalObject->vm();
     const String& condition = breakpoint.condition();
     if (condition.isEmpty())
@@ -615 +616 @@
     DebuggerCallFrame& debuggerCallFrame = currentDebuggerCallFrame();
     JSObject* scopeExtensionObject = m_client ? m_client->debuggerScopeExtensionObject(*this, globalObject, debuggerCallFrame) : nullptr;
-    JSValue result = debuggerCallFrame.evaluateWithScopeExtension(condition, scopeExtensionObject, exception);
+    JSValue result = debuggerCallFrame.evaluateWithScopeExtension(vm, condition, scopeExtensionObject, exception);
 
     // We can lose the debugger while executing JavaScript.
@@ -634 +635 @@
     ASSERT(isAttached(globalObject));
 
+    VM& vm = globalObject->vm();
+
     m_currentProbeBatchId++;
 
@@ -645 +648 @@
         case Breakpoint::Action::Type::Log:
             dispatchFunctionToObservers([&] (Observer& observer) {
-                observer.breakpointActionLog(debuggerCallFrame.globalObject(), action.data);
+                observer.breakpointActionLog(debuggerCallFrame.globalObject(vm), action.data);
             });
             break;
@@ -652 +655 @@
             NakedPtr<Exception> exception;
             JSObject* scopeExtensionObject = m_client ? m_client->debuggerScopeExtensionObject(*this, globalObject, debuggerCallFrame) : nullptr;
-            debuggerCallFrame.evaluateWithScopeExtension(action.data, scopeExtensionObject, exception);
+            debuggerCallFrame.evaluateWithScopeExtension(vm, action.data, scopeExtensionObject, exception);
             if (exception)
-                reportException(debuggerCallFrame.globalObject(), exception);
+                reportException(debuggerCallFrame.globalObject(vm), exception);
             break;
         }
@@ -667 +670 @@
             NakedPtr<Exception> exception;
             JSObject* scopeExtensionObject = m_client ? m_client->debuggerScopeExtensionObject(*this, globalObject, debuggerCallFrame) : nullptr;
-            JSValue result = debuggerCallFrame.evaluateWithScopeExtension(action.data, scopeExtensionObject, exception);
-            JSC::JSGlobalObject* debuggerGlobalObject = debuggerCallFrame.globalObject();
+            JSValue result = debuggerCallFrame.evaluateWithScopeExtension(vm, action.data, scopeExtensionObject, exception);
+            JSC::JSGlobalObject* debuggerGlobalObject = debuggerCallFrame.globalObject(vm);
             if (exception)
                 reportException(debuggerGlobalObject, exception);
@@ -1027 +1030 @@
         return currentException();
 
+    VM& vm = globalObject->vm();
     for (RefPtr<DebuggerCallFrame> frame = &currentDebuggerCallFrame(); frame; frame = frame->callerFrame()) {
-        DebuggerScope& scope = *frame->scope();
+        DebuggerScope& scope = *frame->scope(vm);
         if (scope.isCatchScope())
             return scope.caughtValue(globalObject);