Changeset 147872 in webkit for trunk/Source/JavaScriptCore/interpreter

Timestamp:

Apr 7, 2013, 11:47:20 AM (12 years ago)

Author:

[email protected]

Message:

Inspector should display information about non-object exceptions
​https://bugs.webkit.org/show_bug.cgi?id=114123

Reviewed by Adele Peterson.

Source/JavaScriptCore:

Make sure we store the right stack information, even when throwing
a primitive.

• interpreter/CallFrame.h:

(JSC::ExecState::clearSupplementaryExceptionInfo):
(ExecState):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::addStackTraceIfNecessary):
(JSC::Interpreter::throwException):

Source/WebCore:

Make use of the stack trace for line information when we're reporting
an exception

• bindings/js/JSDOMBinding.cpp:

(WebCore::reportException):

LayoutTests:

All these tests throw primitives as exceptions, and now they have source
and line number information

• fast/dom/exception-getting-event-handler-expected.txt:
• fast/dom/javascript-url-exception-isolation-expected.txt:
• fast/dom/nested-script-exceptions-expected.txt:
• fast/events/onerror-no-constructor-expected.txt:
• fast/events/window-onerror13-expected.txt:
• fast/events/window-onerror16-expected.txt:
• fast/events/window-onerror2-expected.txt:
• fast/events/window-onerror8-expected.txt:
• fast/js/uncaught-exception-line-number-expected.txt:
• fast/sub-pixel/inline-block-with-padding-expected.txt:
• platform/mac/fast/AppleScript/001-expected.txt:

Location:

trunk/Source/JavaScriptCore/interpreter

Files:

• CallFrame.h (modified) (1 diff)
• Interpreter.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -69 +69 @@
 
         void clearException() { globalData().exception = JSValue(); }
+        void clearSupplementaryExceptionInfo()
+        {
+            globalData().exceptionStack = RefCountedArray<StackFrame>();
+        }
+
         JSValue exception() const { return globalData().exception; }
         bool hadException() const { return globalData().exception; }

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -762 +762 @@
     Vector<StackFrame> stackTrace;
     getStackTrace(&callFrame->globalData(), stackTrace);
-    
+    globalData->exceptionStack = RefCountedArray<StackFrame>(stackTrace);
     if (stackTrace.isEmpty() || !error.isObject())
         return;
+
     JSObject* errorObject = asObject(error);
     JSGlobalObject* globalObject = 0;
@@ -811 +812 @@
 
         isInterrupt = isInterruptedExecutionException(exception) || isTerminatedExecutionException(exception);
+    } else {
+        if (!callFrame->globalData().exceptionStack.size()) {
+            Vector<StackFrame> stack;
+            Interpreter::getStackTrace(&callFrame->globalData(), stack);
+            callFrame->globalData().exceptionStack = RefCountedArray<StackFrame>(stack);
+        }
     }