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

Timestamp:

Apr 6, 2013, 11:24:37 AM (12 years ago)

Author:

[email protected]

Message:

Rolled out 147820 and 147818 because they caused plugins tests to ASSERT
​https://bugs.webkit.org/show_bug.cgi?id=114094

Reviewed by Anders Carlsson.

Source/JavaScriptCore:

• API/JSContextRef.cpp:

(JSContextCreateBacktrace):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitDebugHook):

• interpreter/Interpreter.cpp:

(JSC):
(JSC::Interpreter::dumpRegisters):
(JSC::Interpreter::unwindCallFrame):
(JSC::getLineNumberForCallFrame):
(JSC::getCallerInfo):
(JSC::Interpreter::getStackTrace):
(JSC::Interpreter::addStackTraceIfNecessary):
(JSC::Interpreter::retrieveCallerFromVMCode):

• interpreter/Interpreter.h:

(StackFrame):
(JSC::StackFrame::toString):
(JSC::StackFrame::friendlyLineNumber):
(Interpreter):

• runtime/Error.cpp:

(JSC::throwError):

• runtime/JSGlobalData.h:

(JSC):
(JSGlobalData):

• runtime/JSGlobalObject.cpp:

(JSC::DynamicGlobalObjectScope::DynamicGlobalObjectScope):

Source/WebCore:

• bindings/js/ScriptCallStackFactory.cpp:

(WebCore::createScriptCallStack):

• inspector/ScriptCallFrame.cpp:

(WebCore::ScriptCallFrame::isEqual):

• inspector/ScriptCallFrame.h:

(ScriptCallFrame):
(WebCore::ScriptCallFrame::lineNumber):

Tools:

• 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>
@@ -177 +176 @@
     ExecState* exec = toJS(ctx);
     JSLockHolder lock(exec);
+
+    unsigned count = 0;
     StringBuilder builder;
-    Vector<StackFrame> stackTrace;
-    Interpreter::getStackTrace(&exec->globalData(), stackTrace, maxStackSize);
-
-    for (size_t i = 0; i < stackTrace.size(); i++) {
+    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;
         String urlString;
-        String functionName;
-        StackFrame& frame = stackTrace[i];
-        JSValue function = frame.callee.get();
-        if (frame.callee)
-            functionName = frame.friendlyFunctionName(exec);
+        JSValue function;
+
+        exec->interpreter()->retrieveLastCaller(callFrame, signedLineNumber, sourceID, urlString, function);
+
+        if (function)
+            functionName = jsCast<JSFunction*>(function)->name(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 (i)
+            if (count)
                 break;
         }
-        unsigned lineNumber = frame.line();
+        unsigned lineNumber = signedLineNumber >= 0 ? signedLineNumber : 0;
         if (!builder.isEmpty())
             builder.append('\n');
         builder.append('#');
-        builder.appendNumber(i);
+        builder.appendNumber(count);
         builder.append(' ');
         builder.append(functionName);
         builder.appendLiteral("() at ");
         builder.append(urlString);
-        if (frame.codeType != StackFrameNativeCode) {
-            builder.append(':');
-            builder.appendNumber(lineNumber);
-        }
-        if (!function)
+        builder.append(':');
+        builder.appendNumber(lineNumber);
+        if (!function || ++count == maxStackSize)
             break;
+        callFrame = callFrame->callerFrame();
     }
     return OpaqueJSString::create(builder.toString()).leakRef();