Title: [210139] trunk/Source/_javascript_Core
Revision
210139
Author
[email protected]
Date
2016-12-23 11:45:46 -0800 (Fri, 23 Dec 2016)

Log Message

Using Option::breakOnThrow() shouldn't crash while printing a null CodeBlock.
https://bugs.webkit.org/show_bug.cgi?id=166466

Reviewed by Keith Miller.

* runtime/VM.cpp:
(JSC::VM::throwException):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (210138 => 210139)


--- trunk/Source/_javascript_Core/ChangeLog	2016-12-23 19:26:21 UTC (rev 210138)
+++ trunk/Source/_javascript_Core/ChangeLog	2016-12-23 19:45:46 UTC (rev 210139)
@@ -1,5 +1,15 @@
 2016-12-23  Mark Lam  <[email protected]>
 
+        Using Option::breakOnThrow() shouldn't crash while printing a null CodeBlock.
+        https://bugs.webkit.org/show_bug.cgi?id=166466
+
+        Reviewed by Keith Miller.
+
+        * runtime/VM.cpp:
+        (JSC::VM::throwException):
+
+2016-12-23  Mark Lam  <[email protected]>
+
         Enhance LLInt tracing to dump the codeBlock signature instead of just a pointer where appropriate.
         https://bugs.webkit.org/show_bug.cgi?id=166465
 

Modified: trunk/Source/_javascript_Core/runtime/VM.cpp (210138 => 210139)


--- trunk/Source/_javascript_Core/runtime/VM.cpp	2016-12-23 19:26:21 UTC (rev 210138)
+++ trunk/Source/_javascript_Core/runtime/VM.cpp	2016-12-23 19:45:46 UTC (rev 210139)
@@ -595,7 +595,12 @@
 void VM::throwException(ExecState* exec, Exception* exception)
 {
     if (Options::breakOnThrow()) {
-        dataLog("In call frame ", RawPointer(exec), " for code block ", *exec->codeBlock(), "\n");
+        CodeBlock* codeBlock = exec->codeBlock();
+        dataLog("Throwing exception in call frame ", RawPointer(exec), " for code block ");
+        if (codeBlock)
+            dataLog(*codeBlock, "\n");
+        else
+            dataLog("<nullptr>\n");
         CRASH();
     }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to