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

Timestamp:

Apr 16, 2012, 4:37:40 PM (13 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r114309.
​http://trac.webkit.org/changeset/114309
​https://bugs.webkit.org/show_bug.cgi?id=84097

it broke everything (Requested by olliej on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2012-04-16

Source/JavaScriptCore:

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• bytecode/CodeBlock.h:
• dfg/DFGOperations.cpp:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::getStackTrace):
(JSC::Interpreter::throwException):

• interpreter/Interpreter.h:

(Interpreter):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• jsc.cpp:

(functionJSCStack):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::handleHostCall):

• parser/Parser.h:

(JSC::::parse):

• runtime/Error.cpp:

(JSC::addErrorInfo):
(JSC::throwError):

• runtime/Error.h:

(JSC):

LayoutTests:

• fast/js/exception-properties-expected.txt:
• fast/js/script-tests/exception-properties.js:
• fast/js/script-tests/stack-trace.js:

(selfRecursive1):

• fast/js/stack-trace-expected.txt:

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -66 +66 @@
 #include <stdio.h>
 #include <wtf/Threading.h>
-#include <wtf/text/StringBuilder.h>
 
 #if ENABLE(JIT)
@@ -954 +953 @@
 }
 
-void Interpreter::getStackTrace(JSGlobalData* globalData, Vector<StackFrame>& results)
+void Interpreter::getStackTrace(JSGlobalData* globalData, int line, Vector<StackFrame>& results)
 {
-    CallFrame* callFrame = globalData->topCallFrame->removeHostCallFrameFlag();
+    CallFrame* callFrame = globalData->topCallFrame->removeHostCallFrameFlag()->trueCallFrameFromVMCode();
     if (!callFrame || callFrame == CallFrame::noCaller()) 
         return;
-    int line = getLineNumberForCallFrame(globalData, callFrame);
-
-    callFrame = callFrame->trueCallFrameFromVMCode();
+
+    if (line == -1)
+        line = getLineNumberForCallFrame(globalData, callFrame);
 
     while (callFrame && callFrame != CallFrame::noCaller()) {
@@ -977 +976 @@
 }
 
-void Interpreter::addStackTraceIfNecessary(CallFrame* callFrame, JSObject* error)
-{
-    JSGlobalData* globalData = &callFrame->globalData();
-    if (error->hasProperty(callFrame, globalData->propertyNames->stack))
-        return;
-
-    Vector<StackFrame> stackTrace;
-    getStackTrace(&callFrame->globalData(), stackTrace);
-    
-    if (stackTrace.isEmpty())
-        return;
-    
-    JSGlobalObject* globalObject = 0;
-    if (isTerminatedExecutionException(error) || isInterruptedExecutionException(error))
-        globalObject = globalData->dynamicGlobalObject;
-    else
-        globalObject = error->globalObject();
-    StringBuilder builder;
-    for (unsigned i = 0; i < stackTrace.size(); i++) {
-        builder.append(String(stackTrace[i].toString(globalObject->globalExec()).impl()));
-        if (i != stackTrace.size() - 1)
-            builder.append('\n');
-    }
-    
-    error->putDirect(*globalData, globalData->propertyNames->stack, jsString(globalData, UString(builder.toString().impl())), ReadOnly | DontDelete);
-}
-
 NEVER_INLINE HandlerInfo* Interpreter::throwException(CallFrame*& callFrame, JSValue& exceptionValue, unsigned bytecodeOffset)
 {
@@ -1019 +991 @@
         if (codeBlock->hasExpressionInfo() && !hasErrorInfo(callFrame, exception)) {
             ASSERT(codeBlock->hasLineInfo());
+
             // FIXME: should only really be adding these properties to VM generated exceptions,
             // but the inspector currently requires these for all thrown objects.
-            addErrorInfo(callFrame, exception, codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), codeBlock->ownerExecutable()->source());
+            Vector<StackFrame> stackTrace;
+            getStackTrace(&callFrame->globalData(), codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), stackTrace);
+            addErrorInfo(callFrame, exception, codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), codeBlock->ownerExecutable()->source(), stackTrace);
         }