Changeset 293779 in webkit for trunk/Source/JavaScriptCore/tools/JSDollarVM.cpp

Timestamp:

May 4, 2022, 10:44:44 AM (3 years ago)

Author:

[email protected]

Message:

Use IterationStatus in more places.
​https://bugs.webkit.org/show_bug.cgi?id=239864

Reviewed by Saam Barati.

Source/JavaScriptCore:

There's no need for a StackVisitor::Status and a VMInspector::FunctorStatus which
represent the same idea.

• API/JSContextRef.cpp:

(BacktraceFunctor::operator() const):

• bytecode/CodeBlock.cpp:

(JSC::RecursionCheckFunctor::operator() const):

• debugger/DebuggerCallFrame.cpp:

(JSC::LineAndColumnFunctor::operator() const):

• inspector/ScriptCallStackFactory.cpp:

(Inspector::CreateScriptCallStackFunctor::operator() const):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::callerSourceOrigin):
(JSC::CallFrame::globalObjectOfClosestCodeBlock):

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

(JSC::GetStackTraceFunctor::operator() const):
(JSC::Interpreter::getStackTrace):
(JSC::GetCatchHandlerFunctor::operator() const):
(JSC::UnwindFunctor::operator() const):

• interpreter/ShadowChicken.cpp:

(JSC::ShadowChicken::update):

• interpreter/StackVisitor.h:

(JSC::StackVisitor::visit):
(JSC::CallerFunctor::operator() const):

• jsc.cpp:

(FunctionJSCStackFunctor::operator() const):
(startTimeoutTimer):

• runtime/Error.cpp:

(JSC::FindFirstCallerFrameWithCodeblockFunctor::operator() const):

• runtime/FunctionPrototype.cpp:

(JSC::RetrieveArgumentsFunctor::operator() const):
(JSC::RetrieveCallerFunctionFunctor::operator() const):

• runtime/JSGlobalObject.cpp:

(JSC::JSC_DEFINE_HOST_FUNCTION):

• runtime/NullSetterFunction.cpp:

(JSC::GetCallerStrictnessFunctor::operator() const):

• tools/HeapVerifier.cpp:

(JSC::HeapVerifier::checkIfRecorded):

• tools/JSDollarVM.cpp:

(JSC::CallerFrameJITTypeFunctor::operator() const):
(JSC::JSC_DEFINE_HOST_FUNCTION):

• tools/VMInspector.cpp:

(JSC::VMInspector::forEachVM):
(JSC::VMInspector::isValidExecutableMemory):
(JSC::VMInspector::codeBlockForMachinePC):
(JSC::VMInspector::codeBlockForFrame):
(JSC::DumpFrameFunctor::operator() const):
(JSC::VMInspector::dumpRegisters):

• tools/VMInspector.h:

(JSC::VMInspector::WTF_REQUIRES_LOCK):

Source/WebCore:

• bindings/js/JSDOMGlobalObject.cpp:

(WebCore::callerGlobalObject):

• testing/Internals.cpp:

(WebCore::GetCallerCodeBlockFunctor::operator() const):

File:

• trunk/Source/JavaScriptCore/tools/JSDollarVM.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/tools/JSDollarVM.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2015-2021 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2022 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -172 +172 @@
 
             if (frameIndex++ != requestedFrameIndex)
-                return StackVisitor::Continue;
+                return IterationStatus::Continue;
 
             addProperty(vm, "name"_s, jsString(vm, visitor->functionName()));
@@ -187 +187 @@
             isValid = true;
 
-            return StackVisitor::Done;
+            return IterationStatus::Done;
         });
 
@@ -2315 +2315 @@
     }
 
-    StackVisitor::Status operator()(StackVisitor& visitor) const
+    IterationStatus operator()(StackVisitor& visitor) const
     {
         unsigned index = m_currentFrame++;
@@ -2322 +2322 @@
             if (visitor->codeBlock())
                 m_jitType = visitor->codeBlock()->jitType();
-            return StackVisitor::Done;
+            return IterationStatus::Done;
         }
-        return StackVisitor::Continue;
+        return IterationStatus::Continue;
     }
     
@@ -2619 +2619 @@
         DollarVMAssertScope assertScope;
         if (frameIndex++ != requestedFrameIndex)
-            return StackVisitor::Continue;
+            return IterationStatus::Continue;
         VMInspector::dumpRegisters(visitor->callFrame());
-        return StackVisitor::Done;
+        return IterationStatus::Done;
     });
 
@@ -3252 +3252 @@
     JSArray* result = constructEmptyArray(globalObject, nullptr);
     RETURN_IF_EXCEPTION(scope, { });
-    StackVisitor::visit(callFrame, vm, [&] (StackVisitor& visitor) -> StackVisitor::Status {
+    StackVisitor::visit(callFrame, vm, [&] (StackVisitor& visitor) -> IterationStatus {
         DollarVMAssertScope assertScope;
         if (visitor->isInlinedFrame())
-            return StackVisitor::Continue;
+            return IterationStatus::Continue;
         if (visitor->isWasmFrame())
-            return StackVisitor::Continue;
+            return IterationStatus::Continue;
         result->push(globalObject, jsCast<JSObject*>(visitor->callee().asCell()));
         scope.releaseAssertNoException(); // This function is only called from tests.
-        return StackVisitor::Continue;
+        return IterationStatus::Continue;
     });
     RETURN_IF_EXCEPTION(scope, { });