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

Timestamp:

Feb 16, 2012, 10:43:23 PM (13 years ago)

Author:

Csaba Osztrogonác

Message:

Unreviewed. Rolling out r107980, because it broke 32 bit platforms.

Source/JavaScriptCore:

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

(JSC::Interpreter::throwException):
(JSC::Interpreter::privateExecute):

• interpreter/Interpreter.h:

(JSC):
(Interpreter):

• jsc.cpp:

(GlobalObject::finishCreation):

• parser/Nodes.h:

(JSC::FunctionBodyNode::setInferredName):

• parser/Parser.h:

(JSC::::parse):

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

(JSC::addErrorInfo):

• 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: Removed.
• fast/js/stack-trace-expected.txt: Removed.
• fast/js/stack-trace.html: Removed.

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;
@@ -64 +63 @@
     };
 
-    enum StackFrameCodeType {
-        StackFrameGlobalCode,
-        StackFrameEvalCode,
-        StackFrameFunctionCode,
-        StackFrameNativeCode
-    };
-
-    struct StackFrame {
-        Strong<JSObject> callee;
-        StackFrameCodeType codeType;
-        Strong<ExecutableBase> executable;
-        int line;
-        UString sourceURL;
-        UString toString(CallFrame* callFrame) 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 code@%s:%d", sourceURL.ascii().data(), line) 
-                                            : String::format("eval code@%s", sourceURL.ascii().data());
-                } else
-                    traceLine = String::format("eval code");
-                break;
-            case StackFrameNativeCode: {
-                if (callee) {
-                    UString functionName = getCalculatedDisplayName(callFrame, stackFrameCallee);
-                    traceLine = String::format("%s@[native code]", functionName.ascii().data());
-                } else
-                    traceLine = "[native code]";
-                break;
-            }
-            case StackFrameFunctionCode: {
-                UString functionName = getCalculatedDisplayName(callFrame, stackFrameCallee);
-                if (hasSourceURLInfo) {
-                    traceLine = hasLineInfo ? String::format("%s@%s:%d", functionName.ascii().data(), sourceURL.ascii().data(), line)
-                                            : String::format("%s@%s", functionName.ascii().data(), sourceURL.ascii().data());
-                } else
-                    traceLine = String::format("%s\n", functionName.ascii().data());
-                break;
-            }
-            case StackFrameGlobalCode:
-                if (hasSourceURLInfo) {
-                    traceLine = hasLineInfo ? String::format("global code@%s:%d", sourceURL.ascii().data(), line)
-                                            : String::format("global code@%s", sourceURL.ascii().data());
-                } else
-                    traceLine = String::format("global code");
-                    
-            }
-            return traceLine.impl();
-        }
-    };
-
     class TopCallFrameSetter {
     public:
@@ -210 +152 @@
         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);
-        JS_EXPORT_PRIVATE static void getStackTrace(JSGlobalData*, int line, Vector<StackFrame>& results);
 
         void dumpSampleData(ExecState* exec);