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

Timestamp:

Sep 27, 2011, 10:58:55 AM (14 years ago)

Author:

[email protected]

Message:

Implement Error.stack
​https://bugs.webkit.org/show_bug.cgi?id=66994

Patch by Juan Carlos Montemayor Elosua <​[email protected]> on 2011-09-27
Reviewed by Oliver Hunt.

Source/JavaScriptCore:

This patch utilizes topCallFrame to create a stack trace when
an error is thrown. Users will also be able to use the stack()
command in jsc to get arrays with stack trace information.

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

(JSC::getCallerLine):
(JSC::getSourceURLFromCallFrame):
(JSC::getStackFrameCodeType):
(JSC::Interpreter::getStackTrace):
(JSC::Interpreter::throwException):

• interpreter/Interpreter.h:

(JSC::StackFrame::toString):

• jsc.cpp:

(GlobalObject::finishCreation):
(functionJSCStack):

• parser/Parser.h:

(JSC::Parser::parse):

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

(JSC::addErrorInfo):

• runtime/Error.h:

LayoutTests:

Unit tests that contain both normal and special cases for stack trace
generation.

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

(printStack):
(hostThrower):
(callbacker):
(outer):
(inner):
(evaler):
(normalOuter):
(normalInner):
(scripterInner):
(scripterOuter):

• fast/js/stack-trace-expected.txt: Added.
• fast/js/stack-trace.html: Added.
• 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"
@@ -43 +44 @@
     class CodeBlock;
     class EvalExecutable;
+    class ExecutableBase;
     class FunctionExecutable;
-    class JSFunction;
     class JSGlobalObject;
     class ProgramExecutable;
@@ -63 +64 @@
     };
 
+    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();
+        }
+    };
+
     class TopCallFrameSetter {
     public:
@@ -129 +180 @@
         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);