Changeset 155081 in webkit for trunk/Source/JavaScriptCore/runtime

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()):

Location:

trunk/Source/JavaScriptCore/runtime

Files:

• JSFunction.cpp (modified) (3 diffs)
• JSGlobalObjectFunctions.cpp (modified) (3 diffs)
• ObjectConstructor.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

@@ -44 +44 @@
 #include "Parser.h"
 #include "PropertyNameArray.h"
-#include "StackIterator.h"
+#include "StackVisitor.h"
 
 using namespace WTF;
@@ -193 +193 @@
     JSValue result() const { return m_result; }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
-        JSObject* callee = iter->callee();
+        JSObject* callee = visitor->callee();
         if (callee != m_targetCallee)
-            return StackIterator::Continue;
-
-        m_result = JSValue(iter->arguments());
-        return StackIterator::Done;
+            return StackVisitor::Continue;
+
+        m_result = JSValue(visitor->arguments());
+        return StackVisitor::Done;
     }
 
@@ -235 +235 @@
     JSValue result() const { return m_result; }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
-        JSObject* callee = iter->callee();
+        JSObject* callee = visitor->callee();
 
         if (callee && callee->inherits(JSBoundFunction::info()))
-            return StackIterator::Continue;
+            return StackVisitor::Continue;
 
         if (!m_hasFoundFrame && (callee != m_targetCallee))
-            return StackIterator::Continue;
+            return StackVisitor::Continue;
 
         m_hasFoundFrame = true;
         if (!m_hasSkippedToCallerFrame) {
             m_hasSkippedToCallerFrame = true;
-            return StackIterator::Continue;
+            return StackVisitor::Continue;
         }
 
         if (callee)
             m_result = callee;
-        return StackIterator::Done;
+        return StackVisitor::Done;
     }
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -38 +38 @@
 #include "Operations.h"
 #include "Parser.h"
-#include "StackIterator.h"
+#include "StackVisitor.h"
 #include <wtf/dtoa.h>
 #include <stdio.h>
@@ -718 +718 @@
     EncodedJSValue result() { return m_result; }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
         if (!m_hasSkippedFirstFrame) {
             m_hasSkippedFirstFrame = true;
-            return StackIterator::Continue;
-        }
-
-        if (m_thisObject->allowsAccessFrom(iter->callFrame()))
+            return StackVisitor::Continue;
+        }
+
+        if (m_thisObject->allowsAccessFrom(visitor->callFrame()))
             m_result = JSValue::encode(m_thisObject->prototype());
 
-        return StackIterator::Done;
+        return StackVisitor::Done;
     }
 
@@ -760 +760 @@
     bool allowsAccess() const { return m_allowsAccess; }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
         if (!m_hasSkippedFirstFrame) {
             m_hasSkippedFirstFrame = true;
-            return StackIterator::Continue;
-        }
-
-        m_allowsAccess = m_thisObject->allowsAccessFrom(iter->callFrame());
-        return StackIterator::Done;
+            return StackVisitor::Continue;
+        }
+
+        m_allowsAccess = m_thisObject->allowsAccessFrom(visitor->callFrame());
+        return StackVisitor::Done;
     }
 

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -35 +35 @@
 #include "PropertyDescriptor.h"
 #include "PropertyNameArray.h"
-#include "StackIterator.h"
+#include "StackVisitor.h"
 
 namespace JSC {
@@ -143 +143 @@
     EncodedJSValue result() const { return m_result; }
 
-    StackIterator::Status operator()(StackIterator& iter)
+    StackVisitor::Status operator()(StackVisitor& visitor)
     {
         if (!m_hasSkippedFirstFrame) {
             m_hasSkippedFirstFrame = true;
-            return StackIterator::Continue;
+            return StackVisitor::Continue;
         }
 
-    if (m_object->allowsAccessFrom(iter->callFrame()))
+    if (m_object->allowsAccessFrom(visitor->callFrame()))
         m_result = JSValue::encode(m_object->prototype());
-    return StackIterator::Done;
+    return StackVisitor::Done;
 }