Changeset 155081 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Sep 4, 2013, 5:40:15 PM (12 years ago)

Author:

[email protected]

Message:

Renamed StackIterator to StackVisitor.
​https://bugs.webkit.org/show_bug.cgi?id=120706.

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Also did some minor refactoring:

• Renamed StackIterator::iterate() to StackVisitor::visit().
• Make StackVisitor::visit() a static method.
• Move the instantiation of the StackVisitor instance into StackVisitor::visit() from CallFrame::iterate().
• Removed StackIterator::resetIterator() and inline its body into the StackVisitor constructor since this is the only remaining caller of it.

• API/JSContextRef.cpp:

(BacktraceFunctor::operator()):

• CMakeLists.txt:
• GNUmakefile.list.am:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
• interpreter/CallFrame.h:

(JSC::ExecState::iterate):

• interpreter/Interpreter.cpp:

(JSC::DumpRegisterFunctor::operator()):
(JSC::unwindCallFrame):
(JSC::getStackFrameCodeType):
(JSC::GetStackTraceFunctor::operator()):
(JSC::UnwindFunctor::operator()):

• interpreter/Interpreter.h:
• interpreter/StackIterator.cpp: Removed.
• interpreter/StackIterator.h: Removed.
• interpreter/StackVisitor.cpp: Copied from Source/JavaScriptCore/interpreter/StackIterator.cpp.

(JSC::StackVisitor::StackVisitor):
(JSC::StackVisitor::gotoNextFrame):
(JSC::StackVisitor::readFrame):
(JSC::StackVisitor::readNonInlinedFrame):
(JSC::StackVisitor::readInlinedFrame):
(JSC::StackVisitor::Frame::codeType):
(JSC::StackVisitor::Frame::functionName):
(JSC::StackVisitor::Frame::sourceURL):
(JSC::StackVisitor::Frame::toString):
(JSC::StackVisitor::Frame::arguments):
(JSC::StackVisitor::Frame::computeLineAndColumn):
(JSC::StackVisitor::Frame::retrieveExpressionInfo):
(JSC::StackVisitor::Frame::setToEnd):
(JSC::StackVisitor::Frame::print):
(DebugPrintFrameFunctor::operator()):

• interpreter/StackVisitor.h: Copied from Source/JavaScriptCore/interpreter/StackIterator.h.

(JSC::StackVisitor::visit):

• jsc.cpp:

(FunctionJSCStackFunctor::operator()):

• profiler/ProfileGenerator.cpp:

(JSC::AddParentForConsoleStartFunctor::operator()):

• runtime/JSFunction.cpp:

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

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::GlobalFuncProtoGetterFunctor::operator()):
(JSC::GlobalFuncProtoSetterFunctor::operator()):

• runtime/ObjectConstructor.cpp:

(JSC::ObjectConstructorGetPrototypeOfFunctor::operator()):

Source/WebCore:

No new tests.

• ForwardingHeaders/interpreter/StackIterator.h: Removed.
• ForwardingHeaders/interpreter/StackVisitor.h: Copied from Source/WebCore/ForwardingHeaders/interpreter/StackIterator.h.
• bindings/js/JSXMLHttpRequestCustom.cpp:

(WebCore::SendFunctor::operator()):

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::CreateScriptCallStackFunctor::operator()):
(WebCore::CreateScriptCallStackForConsoleFunctor::operator()):

File:

• trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (7 diffs)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -64 +64 @@
 #include "Register.h"
 #include "SamplingTool.h"
-#include "StackIterator.h"
+#include "StackVisitor.h"
 #include "StrictEvalActivation.h"
 #include "StrongInlines.h"
@@ -283 +283 @@
     }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
         if (!m_hasSkippedFirstFrame) {
             m_hasSkippedFirstFrame = true;
-            return StackIterator::Continue;
+            return StackVisitor::Continue;
         }
 
         unsigned line = 0;
         unsigned unusedColumn = 0;
-        iter->computeLineAndColumn(line, unusedColumn);
-        dataLogF("[ReturnVPC]                | %10p | %d (line %d)\n", m_it, iter->bytecodeOffset(), line);
+        visitor->computeLineAndColumn(line, unusedColumn);
+        dataLogF("[ReturnVPC]                | %10p | %d (line %d)\n", m_it, visitor->bytecodeOffset(), line);
         ++m_it;
-        return StackIterator::Done;
+        return StackVisitor::Done;
     }
 
@@ -390 +390 @@
 }
 
-static bool unwindCallFrame(StackIterator& iter, JSValue exceptionValue)
-{
-    CallFrame* callFrame = iter->callFrame();
-    CodeBlock* codeBlock = iter->codeBlock();
+static bool unwindCallFrame(StackVisitor& visitor, JSValue exceptionValue)
+{
+    CallFrame* callFrame = visitor->callFrame();
+    CodeBlock* codeBlock = visitor->codeBlock();
     CodeBlock* oldCodeBlock = codeBlock;
     JSScope* scope = callFrame->scope();
@@ -432 +432 @@
 }
 
-static StackFrameCodeType getStackFrameCodeType(StackIterator iter)
-{
-    switch (iter->codeType()) {
-    case StackIterator::Frame::Eval:
+static StackFrameCodeType getStackFrameCodeType(StackVisitor& visitor)
+{
+    switch (visitor->codeType()) {
+    case StackVisitor::Frame::Eval:
         return StackFrameEvalCode;
-    case StackIterator::Frame::Function:
+    case StackVisitor::Frame::Function:
         return StackFrameFunctionCode;
-    case StackIterator::Frame::Global:
+    case StackVisitor::Frame::Global:
         return StackFrameGlobalCode;
-    case StackIterator::Frame::Native:
+    case StackVisitor::Frame::Native:
         ASSERT_NOT_REACHED();
         return StackFrameNativeCode;
@@ -507 +507 @@
     }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
         VM& vm = m_vm;
         if (m_remainingCapacityForFrameCapture) {
-            if (iter->isJSFrame()) {
-                CodeBlock* codeBlock = iter->codeBlock();
+            if (visitor->isJSFrame()) {
+                CodeBlock* codeBlock = visitor->codeBlock();
                 StackFrame s = {
-                    Strong<JSObject>(vm, iter->callee()),
-                    getStackFrameCodeType(iter),
+                    Strong<JSObject>(vm, visitor->callee()),
+                    getStackFrameCodeType(visitor),
                     Strong<ExecutableBase>(vm, codeBlock->ownerExecutable()),
                     Strong<UnlinkedCodeBlock>(vm, codeBlock->unlinkedCodeBlock()),
@@ -522 +522 @@
                     codeBlock->firstLineColumnOffset(),
                     codeBlock->sourceOffset(),
-                    iter->bytecodeOffset(),
-                    iter->sourceURL()
+                    visitor->bytecodeOffset(),
+                    visitor->sourceURL()
                 };
                 m_results.append(s);
             } else {
-                StackFrame s = { Strong<JSObject>(vm, iter->callee()), StackFrameNativeCode, Strong<ExecutableBase>(), Strong<UnlinkedCodeBlock>(), 0, 0, 0, 0, 0, String()};
+                StackFrame s = { Strong<JSObject>(vm, visitor->callee()), StackFrameNativeCode, Strong<ExecutableBase>(), Strong<UnlinkedCodeBlock>(), 0, 0, 0, 0, 0, String()};
                 m_results.append(s);
             }
     
             m_remainingCapacityForFrameCapture--;
-            return StackIterator::Continue;
-        }
-        return StackIterator::Done;
+            return StackVisitor::Continue;
+        }
+        return StackVisitor::Done;
     }
 
@@ -578 +578 @@
     }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
         VM& vm = m_callFrame->vm();
-        m_callFrame = iter->callFrame();
-        m_codeBlock = iter->codeBlock();
-        unsigned bytecodeOffset = iter->bytecodeOffset();
+        m_callFrame = visitor->callFrame();
+        m_codeBlock = visitor->codeBlock();
+        unsigned bytecodeOffset = visitor->bytecodeOffset();
 
         if (m_isTermination || !(m_handler = m_codeBlock->handlerForBytecodeOffset(bytecodeOffset))) {
-        if (!unwindCallFrame(iter, m_exceptionValue)) {
+        if (!unwindCallFrame(visitor, m_exceptionValue)) {
             if (LegacyProfiler* profiler = vm.enabledProfiler())
                 profiler->exceptionUnwind(m_callFrame);
-            return StackIterator::Done;
+            return StackVisitor::Done;
         }
     } else
-        return StackIterator::Done;
-
-    return StackIterator::Continue;
+        return StackVisitor::Done;
+
+    return StackVisitor::Continue;
 }