Changeset 153825 in webkit

Timestamp:

Aug 8, 2013, 9:57:07 AM (12 years ago)

Author:

mark.lam@apple.com

Message:

Restoring use of StackIterator instead of Interpreter::getStacktrace().
​https://bugs.webkit.org/show_bug.cgi?id=119575.

Reviewed by Oliver Hunt.

Source/JavaScriptCore:

• interpreter/Interpreter.h:
• Made getStackTrace() private.
• interpreter/StackIterator.cpp:

(JSC::StackIterator::StackIterator):
(JSC::StackIterator::numberOfFrames):

• Computes the number of frames by iterating through the whole stack from the starting frame. The iterator will save its current frame position before counting the frames, and then restoring it after the counting.

(JSC::StackIterator::gotoFrameAtIndex):
(JSC::StackIterator::gotoNextFrame):
(JSC::StackIterator::resetIterator):

• Points the iterator to the starting frame.
• interpreter/StackIteratorPrivate.h:

Source/WebCore:

No new tests.

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::createScriptCallStack):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/interpreter/Interpreter.h (modified) (2 diffs)
• JavaScriptCore/interpreter/StackIterator.cpp (modified) (2 diffs)
• JavaScriptCore/interpreter/StackIteratorPrivate.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/ScriptCallStackFactory.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-08-08  Mark Lam  <mark.lam@apple.com>
+
+        Restoring use of StackIterator instead of Interpreter::getStacktrace().
+        https://bugs.webkit.org/show_bug.cgi?id=119575.
+
+        Reviewed by Oliver Hunt.
+
+        * interpreter/Interpreter.h:
+        - Made getStackTrace() private.
+        * interpreter/StackIterator.cpp:
+        (JSC::StackIterator::StackIterator):
+        (JSC::StackIterator::numberOfFrames):
+        - Computes the number of frames by iterating through the whole stack
+          from the starting frame. The iterator will save its current frame
+          position before counting the frames, and then restoring it after
+          the counting.
+        (JSC::StackIterator::gotoFrameAtIndex):
+        (JSC::StackIterator::gotoNextFrame):
+        (JSC::StackIterator::resetIterator):
+        - Points the iterator to the starting frame.
+        * interpreter/StackIteratorPrivate.h:
+
 2013-08-08  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -234 +234 @@
         JS_EXPORT_PRIVATE void dumpCallFrame(CallFrame*);
 
-        JS_EXPORT_PRIVATE void getStackTrace(Vector<StackFrame>& results, size_t maxStackSize = std::numeric_limits<size_t>::max());
-
     private:
         enum ExecutionFlag { Normal, InitializeAndReturn };
@@ -243 +241 @@
         JSValue execute(CallFrameClosure&);
 
+        void getStackTrace(Vector<StackFrame>& results, size_t maxStackSize = std::numeric_limits<size_t>::max());
         NEVER_INLINE bool unwindCallFrame(StackIterator&, JSValue);
 

trunk/Source/JavaScriptCore/interpreter/StackIterator.cpp

@@ -35 +35 @@
 namespace JSC {
 
-StackIterator::StackIterator(CallFrame* frame, StackIterator::FrameFilter filter)
-    : m_filter(filter)
-{
-    ASSERT(frame);
-    m_frame = Frame::create(frame);
-    m_frame = m_frame->logicalFrame();
+StackIterator::StackIterator(CallFrame* startFrame, StackIterator::FrameFilter filter)
+    : m_startFrame(startFrame)
+    , m_filter(filter)
+{
+    ASSERT(startFrame);
+    resetIterator();
+}
+
+size_t StackIterator::numberOfFrames()
+{
+    int savedFrameIndex = m_frameIndex;
+    resetIterator();
+    while (m_frame)
+        gotoNextFrame();
+    size_t numberOfFrames = m_frameIndex;
+
+    resetIterator();
+    gotoFrameAtIndex(savedFrameIndex);
+
+    return numberOfFrames;
+}
+
+void StackIterator::gotoFrameAtIndex(size_t index)
+{
+    while (m_frame && (m_frameIndex != index))
+        gotoNextFrame();
 }
 
@@ -52 +72 @@
     }
     m_frame = frame;
+    m_frameIndex++;
+}
+
+void StackIterator::resetIterator()
+{
+    m_frameIndex = 0;
+    m_frame = Frame::create(m_startFrame);
+    m_frame = m_frame->logicalFrame();
 }
 

trunk/Source/JavaScriptCore/interpreter/StackIteratorPrivate.h

@@ -40 +40 @@
     typedef bool (*FrameFilter)(Frame*);
 
+    JS_EXPORT_PRIVATE size_t numberOfFrames();
+
     Frame& operator*() { return *m_frame; }
     ALWAYS_INLINE Frame* operator->() { return m_frame; }
@@ -52 +54 @@
 
     static Frame* end() { return 0; }
+    void gotoFrameAtIndex(size_t frameIndex);
     JS_EXPORT_PRIVATE void gotoNextFrame();
+    void resetIterator();
 
+    CallFrame* m_startFrame;
+    size_t m_frameIndex;
     Frame* m_frame;
     FrameFilter m_filter;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-08  Mark Lam  <mark.lam@apple.com>
+
+        Restoring use of StackIterator instead of Interpreter::getStacktrace().
+        https://bugs.webkit.org/show_bug.cgi?id=119575.
+
+        Reviewed by Oliver Hunt.
+
+        No new tests.
+
+        * bindings/js/ScriptCallStackFactory.cpp:
+        (WebCore::createScriptCallStack):
+
 2013-08-08  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/bindings/js/ScriptCallStackFactory.cpp

@@ -79 +79 @@
 {
     Vector<ScriptCallFrame> frames;
-    Vector<StackFrame> stackTrace;
-    exec->vm().interpreter->getStackTrace(stackTrace, maxStackSize + 1);
-    for (size_t i = stackTrace.size() == 1 ? 0 : 1; i < stackTrace.size(); i++) {
+    ASSERT(exec);
+    CallFrame* frame = exec->vm().topCallFrame;
+    StackIterator iter = frame->begin();
+    if (iter.numberOfFrames() > 1)
+        ++iter;
+    for (; iter != frame->end() && maxStackSize--; ++iter) {
         // This early exit is necessary to maintain our old behaviour
         // but the stack trace we produce now is complete and handles all
         // ways in which code may be running
-        if (!stackTrace[i].callee && frames.size())
+        if (!iter->callee() && frames.size())
             break;
-
-        String functionName = stackTrace[i].friendlyFunctionName(exec);
         unsigned line;
         unsigned column;
-        stackTrace[i].computeLineAndColumn(line, column);
-        frames.append(ScriptCallFrame(functionName, stackTrace[i].sourceURL, line, column));
+        iter->computeLineAndColumn(line, column);
+        frames.append(ScriptCallFrame(iter->functionName(), iter->sourceURL(), line, column));
     }
-    
     return ScriptCallStack::create(frames);
 }