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

Timestamp:

Sep 27, 2011, 1:16:37 PM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r96131.
​http://trac.webkit.org/changeset/96131
​https://bugs.webkit.org/show_bug.cgi?id=68927

It made 18+ tests crash on all platform (Requested by
Ossy_night on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2011-09-27

Source/JavaScriptCore:

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::throwException):

• interpreter/Interpreter.h:
• jsc.cpp:

(GlobalObject::finishCreation):

• parser/Parser.h:

(JSC::Parser::parse):

• runtime/CommonIdentifiers.h:
• runtime/Error.cpp:

(JSC::addErrorInfo):

• runtime/Error.h:

LayoutTests:

• fast/js/exception-properties-expected.txt:
• fast/js/script-tests/exception-properties.js:
• fast/js/script-tests/stack-trace.js: Removed.
• fast/js/stack-trace-expected.txt: Removed.
• fast/js/stack-trace.html: Removed.
• platform/chromium/test_expectations.txt:

File:

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

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -46 +46 @@
 #include "JSArray.h"
 #include "JSByteArray.h"
+#include "JSFunction.h"
 #include "JSNotAnObject.h"
 #include "JSPropertyNameIterator.h"
@@ -687 +688 @@
 }
 
-static void getCallerLine(JSGlobalData* globalData, CallFrame* callFrame, int& lineNumber)
-{
-    (void)globalData;
-    unsigned bytecodeOffset;
-    lineNumber = -1;
-    callFrame = callFrame->removeHostCallFrameFlag();
-
-    if (callFrame->callerFrame() == CallFrame::noCaller() || callFrame->callerFrame()->hasHostCallFrameFlag())
-        return;
-
-    CodeBlock* callerCodeBlock = callFrame->callerFrame()->removeHostCallFrameFlag()->codeBlock();
-
-#if ENABLE(INTERPRETER)
-    if (!globalData->canUseJIT())
-        bytecodeOffset = callerCodeBlock->bytecodeOffset(callFrame->returnVPC());
-#if ENABLE(JIT)
-    else
-        bytecodeOffset = callerCodeBlock->bytecodeOffset(callFrame->returnPC());
-#endif
-#else
-    bytecodeOffset = callerCodeBlock->bytecodeOffset(callFrame->returnPC());
-#endif
-
-    lineNumber = callerCodeBlock->lineNumberForBytecodeOffset(bytecodeOffset - 1);
-}
-
-static ALWAYS_INLINE const UString getSourceURLFromCallFrame(CallFrame* callFrame) 
-{
-    if (callFrame->hasHostCallFrameFlag())
-        return UString();
-#if ENABLE(INTERPRETER)
-    if (!callFrame->globalData().canUseJIT())
-        return callFrame->codeBlock()->source()->url();
-#if ENABLE(JIT)
-    return callFrame->codeBlock()->ownerExecutable()->sourceURL();
-#endif
-#else
-    return callFrame->codeBlock()->ownerExecutable()->sourceURL();
-#endif
-}
-
-static StackFrameCodeType getStackFrameCodeType(CallFrame* callFrame)
-{
-    if (callFrame->hasHostCallFrameFlag()) 
-        return StackFrameNativeCode;
-
-    switch (callFrame->codeBlock()->codeType()) {
-    case EvalCode:
-        return StackFrameEvalCode;
-    case FunctionCode:
-        return StackFrameFunctionCode;
-    case GlobalCode:
-        return StackFrameGlobalCode;
-    }
-    ASSERT_NOT_REACHED();
-    return StackFrameGlobalCode;
-}
-
-void Interpreter::getStackTrace(JSGlobalData* globalData, int line, Vector<StackFrame>& results)
-{
-    int stackLimit = 15;
-    CallFrame* callFrame = globalData->topCallFrame->removeHostCallFrameFlag();
-    if (!callFrame || callFrame == CallFrame::noCaller() || !callFrame->codeBlock()) 
-        return;
-    UString sourceURL;
-    UString traceLevel;
-
-    for (int i = 0; i < stackLimit; ++i) {
-        if (!callFrame || callFrame == CallFrame::noCaller())
-            break;
-        if (callFrame->codeBlock()) {
-            sourceURL = getSourceURLFromCallFrame(callFrame);
-
-            StackFrame s = { Strong<JSObject>(*globalData, callFrame->callee()), Strong<CallFrame>(*globalData, callFrame), getStackFrameCodeType(callFrame), Strong<ExecutableBase>(*globalData, callFrame->codeBlock()->ownerExecutable()), line, sourceURL};
-
-            results.append(s);
-        }
-        getCallerLine(globalData, callFrame, line);
-        callFrame = callFrame->callerFrame()->removeHostCallFrameFlag();
-    }
-}
-
 NEVER_INLINE HandlerInfo* Interpreter::throwException(CallFrame*& callFrame, JSValue& exceptionValue, unsigned bytecodeOffset)
 {
@@ -787 +706 @@
             // FIXME: should only really be adding these properties to VM generated exceptions,
             // but the inspector currently requires these for all thrown objects.
-            Vector<StackFrame> stackTrace;
-            getStackTrace(&callFrame->globalData(), codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), stackTrace);
-            addErrorInfo(callFrame, exception, codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), codeBlock->ownerExecutable()->source(), stackTrace);
+            addErrorInfo(callFrame, exception, codeBlock->lineNumberForBytecodeOffset(bytecodeOffset), codeBlock->ownerExecutable()->source());
         }