Changeset 147818 in webkit for trunk/Source/JavaScriptCore/API/JSContextRef.cpp

Timestamp:

Apr 5, 2013, 4:53:12 PM (12 years ago)

Author:

[email protected]

Message:

Unify the many and varied stack trace mechanisms, and make the result sane.
​https://bugs.webkit.org/show_bug.cgi?id=114072

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

Makes JSC::StackFrame record the bytecode offset and other necessary data
rather than requiring us to perform eager evaluation of the line number, etc.
Then remove most of the users of retrieveLastCaller, as most of them were
using it to create a stack trace in a fairly incomplete and inefficient way.

StackFrame now also has a couple of helpers to get the line and column info.

• API/JSContextRef.cpp:

(JSContextCreateBacktrace):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitDebugHook):

• interpreter/Interpreter.cpp:

(JSC):
(JSC::Interpreter::dumpRegisters):
(JSC::Interpreter::unwindCallFrame):
(JSC::getBytecodeOffsetForCallFrame):
(JSC::getCallerInfo):
(JSC::StackFrame::line):
(JSC::StackFrame::column):
(JSC::StackFrame::expressionInfo):
(JSC::StackFrame::toString):
(JSC::Interpreter::getStackTrace):
(JSC::Interpreter::addStackTraceIfNecessary):
(JSC::Interpreter::retrieveCallerFromVMCode):

• interpreter/Interpreter.h:

(StackFrame):
(Interpreter):

• runtime/Error.cpp:

(JSC::throwError):

• runtime/JSGlobalData.h:

(JSC):
(JSGlobalData):

• runtime/JSGlobalObject.cpp:

(JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope):

Source/WebCore:

Now that we've fleshed out the StackFrames from Interpreter::getStackTrace
WebCore can just ask us for a stack trace rather than implementing its own
stack walking.

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::createScriptCallStack):

• inspector/ScriptCallFrame.cpp:

(WebCore::ScriptCallFrame::isEqual):

• inspector/ScriptCallFrame.h:

(ScriptCallFrame):
(WebCore::ScriptCallFrame::columnNumber):

Tools:

The commandline jsc executable no longer requires arguments, so
I've made run-jsc work without them.

• Scripts/run-jsc:

File:

• trunk/Source/JavaScriptCore/API/JSContextRef.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/JSContextRef.cpp

@@ -37 +37 @@
 #include "JSObject.h"
 #include "Operations.h"
+#include "SourceProvider.h"
 #include <wtf/text/StringBuilder.h>
 #include <wtf/text/StringHash.h>
@@ -176 +177 @@
     ExecState* exec = toJS(ctx);
     JSLockHolder lock(exec);
-
-    unsigned count = 0;
     StringBuilder builder;
-    CallFrame* callFrame = exec;
-    String functionName;
-    if (exec->callee()) {
-        if (asObject(exec->callee())->inherits(&InternalFunction::s_info)) {
-            functionName = asInternalFunction(exec->callee())->name(exec);
-            builder.appendLiteral("#0 ");
-            builder.append(functionName);
-            builder.appendLiteral("() ");
-            count++;
-        }
-    }
-    while (true) {
-        RELEASE_ASSERT(callFrame);
-        int signedLineNumber;
-        intptr_t sourceID;
+    Vector<StackFrame> stackTrace;
+    Interpreter::getStackTrace(&exec->globalData(), stackTrace, maxStackSize);
+
+    for (size_t i = 0; i < stackTrace.size(); i++) {
         String urlString;
-        JSValue function;
-
-        exec->interpreter()->retrieveLastCaller(callFrame, signedLineNumber, sourceID, urlString, function);
-
-        if (function)
-            functionName = jsCast<JSFunction*>(function)->name(exec);
+        String functionName;
+        StackFrame& frame = stackTrace[i];
+        JSValue function = frame.callee.get();
+        if (frame.callee)
+            functionName = frame.friendlyFunctionName(exec);
         else {
             // Caller is unknown, but if frame is empty we should still add the frame, because
             // something called us, and gave us arguments.
-            if (count)
+            if (i)
                 break;
         }
-        unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
+        unsigned lineNumber = frame.line();
         if (!builder.isEmpty())
             builder.append('\n');
         builder.append('#');
-        builder.appendNumber(count);
+        builder.appendNumber(i);
         builder.append(' ');
         builder.append(functionName);
         builder.appendLiteral("() at ");
         builder.append(urlString);
-        builder.append(':');
-        builder.appendNumber(lineNumber);
-        if (!function || ++count == maxStackSize)
+        if (frame.codeType != StackFrameNativeCode) {
+            builder.append(':');
+            builder.appendNumber(lineNumber);
+        }
+        if (!function)
             break;
-        callFrame = callFrame->callerFrame();
     }
     return OpaqueJSString::create(builder.toString()).leakRef();