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

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.h (modified) (1 diff)

trunk/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -223 +223 @@
         NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
         static const UString getTraceLine(CallFrame*, StackFrameCodeType, const UString&, int);
-        JS_EXPORT_PRIVATE static void getStackTrace(JSGlobalData*, Vector<StackFrame>& results);
-        static void addStackTraceIfNecessary(CallFrame*, JSObject* error);
+        JS_EXPORT_PRIVATE static void getStackTrace(JSGlobalData*, int line, Vector<StackFrame>& results);
 
         void dumpSampleData(ExecState* exec);