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

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.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/interpreter/Interpreter.h

@@ -32 +32 @@
 #include "ArgList.h"
 #include "JSCell.h"
-#include "JSFunction.h"
 #include "JSValue.h"
 #include "JSObject.h"
@@ -44 +43 @@
     class CodeBlock;
     class EvalExecutable;
-    class ExecutableBase;
     class FunctionExecutable;
+    class JSFunction;
     class JSGlobalObject;
     class ProgramExecutable;
@@ -62 +61 @@
         WillLeaveCallFrame,
         WillExecuteStatement
-    };
-
-    enum StackFrameCodeType {
-        StackFrameGlobalCode,
-        StackFrameEvalCode,
-        StackFrameFunctionCode,
-        StackFrameNativeCode
-    };
-
-    struct StackFrame {
-        Strong<JSObject> callee;
-        Strong<CallFrame> callFrame;
-        StackFrameCodeType codeType;
-        Strong<ExecutableBase> executable;
-        int line;
-        UString sourceURL;
-        UString toString() const
-        {
-            bool hasSourceURLInfo = !sourceURL.isNull() && !sourceURL.isEmpty();
-            bool hasLineInfo = line > -1;
-            String traceLine;
-            JSObject* stackFrameCallee = callee.get();
-
-            switch (codeType) {
-            case StackFrameEvalCode:
-                if (hasSourceURLInfo) 
-                    traceLine = hasLineInfo ? String::format("eval at %s:%d", sourceURL.ascii().data(), line) 
-                                            : String::format("eval at %s", sourceURL.ascii().data());
-                else
-                    traceLine = String::format("eval");
-                break;
-            case StackFrameNativeCode:
-                traceLine = "Native code";
-                break;
-            case StackFrameFunctionCode:
-                if (stackFrameCallee && stackFrameCallee->inherits(&JSFunction::s_info)) {
-                    UString functionName = asFunction(stackFrameCallee)->name(callFrame.get());
-                    if (hasSourceURLInfo) 
-                        traceLine = hasLineInfo ? String::format("%s at %s:%d", functionName.ascii().data(), sourceURL.ascii().data(), line)
-                                                : String::format("%s at %s", functionName.ascii().data(), sourceURL.ascii().data());
-                    else
-                        traceLine = String::format("%s\n", functionName.ascii().data());
-                    break;
-                }
-            case StackFrameGlobalCode:
-                traceLine = hasLineInfo ? String::format("at %s:%d", sourceURL.ascii().data(), line)
-                                        : String::format("at %s", sourceURL.ascii().data());
-            }
-            return traceLine.impl();
-        }
     };
 
@@ -180 +129 @@
         NEVER_INLINE HandlerInfo* throwException(CallFrame*&, JSValue&, unsigned bytecodeOffset);
         NEVER_INLINE void debug(CallFrame*, DebugHookID, int firstLine, int lastLine);
-        static const UString getTraceLine(CallFrame*, StackFrameCodeType, const UString&, int);
-        static void getStackTrace(JSGlobalData*, int line, Vector<StackFrame>& results);
 
         void dumpSampleData(ExecState* exec);