<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[200617] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/200617">200617</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-09 23:36:42 -0700 (Mon, 09 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: CRASH under JSC::DebuggerCallFrame::thisValue when hitting breakpoint
https://bugs.webkit.org/show_bug.cgi?id=157442
<rdar://problem/24172015>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-05-09
Reviewed by Saam Barati.
Source/JavaScriptCore:
* debugger/DebuggerCallFrame.cpp:
(JSC::DebuggerCallFrame::thisValueForCallFrame):
When the thisValue is JSValue() return undefined and avoid calling
toThisValue which would lead to a crash. Having `this` be an empty
JSValue could happen inside an ES6 class constructor, before
calling super.
LayoutTests:
* inspector/debugger/break-in-constructor-before-super-expected.txt: Added.
* inspector/debugger/break-in-constructor-before-super.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp">trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakinconstructorbeforesuperexpectedtxt">trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordebuggerbreakinconstructorbeforesuperhtml">trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200616 => 200617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-10 06:07:30 UTC (rev 200616)
+++ trunk/LayoutTests/ChangeLog 2016-05-10 06:36:42 UTC (rev 200617)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-05-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CRASH under JSC::DebuggerCallFrame::thisValue when hitting breakpoint
+ https://bugs.webkit.org/show_bug.cgi?id=157442
+ <rdar://problem/24172015>
+
+ Reviewed by Saam Barati.
+
+ * inspector/debugger/break-in-constructor-before-super-expected.txt: Added.
+ * inspector/debugger/break-in-constructor-before-super.html: Added.
+
</ins><span class="cx"> 2016-05-09 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS-scrolling test cleanup.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakinconstructorbeforesuperexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super-expected.txt (0 => 200617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super-expected.txt 2016-05-10 06:36:42 UTC (rev 200617)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+CONSOLE MESSAGE: line 16: before super
+CONSOLE MESSAGE: line 19: after super
+Pause in constructor before super should not crash.
+
+
+== Running test suite: PauseInConstructorBeforeSuper
+-- Running test case: TriggerPauseInConstructorBeforeSuper
+PASS: Paused
+PASS: `this` should be undefined and not cause a crash.
+PASS: Resumed
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectordebuggerbreakinconstructorbeforesuperhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super.html (0 => 200617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super.html (rev 0)
+++ trunk/LayoutTests/inspector/debugger/break-in-constructor-before-super.html 2016-05-10 06:36:42 UTC (rev 200617)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/protocol-test.js"></script>
+<script>
+class Parent {
+ constructor()
+ {
+ this.x = 1;
+ }
+};
+
+class Child extends Parent {
+ constructor()
+ {
+ console.log("before super");
+ debugger;
+ super();
+ console.log("after super");
+ }
+};
+
+function triggerPause() {
+ new Child;
+}
+
+function test()
+{
+ InspectorProtocol.sendCommand("Debugger.enable", {});
+ InspectorProtocol.sendCommand("Debugger.setBreakpointsActive", {active: true});
+
+ let suite = ProtocolTest.createAsyncSuite("PauseInConstructorBeforeSuper");
+
+ suite.addTestCase({
+ name: "TriggerPauseInConstructorBeforeSuper",
+ description: "Trigger a pause in a constructor before calling super should not crash.",
+ test: (resolve, reject) => {
+ ProtocolTest.evaluateInPage("triggerPause()");
+
+ InspectorProtocol.eventHandler["Debugger.paused"] = (messageObject) => {
+ ProtocolTest.pass("Paused");
+
+ let callFrameIdentifier = messageObject.params.callFrames[0].callFrameId;
+ InspectorProtocol.sendCommand("Debugger.evaluateOnCallFrame", {callFrameId: callFrameIdentifier, expression: "this"}, (messageObject) => {
+ ProtocolTest.expectThat(messageObject.result.result.type === "undefined", "`this` should be undefined and not cause a crash.");
+ });
+
+ InspectorProtocol.sendCommand("Debugger.resume");
+ };
+
+ InspectorProtocol.eventHandler["Debugger.resumed"] = (messageObject) => {
+ ProtocolTest.pass("Resumed");
+ resolve();
+ };
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Pause in constructor before super should not crash.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200616 => 200617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-10 06:07:30 UTC (rev 200616)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-10 06:36:42 UTC (rev 200617)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-05-09 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: CRASH under JSC::DebuggerCallFrame::thisValue when hitting breakpoint
+ https://bugs.webkit.org/show_bug.cgi?id=157442
+ <rdar://problem/24172015>
+
+ Reviewed by Saam Barati.
+
+ * debugger/DebuggerCallFrame.cpp:
+ (JSC::DebuggerCallFrame::thisValueForCallFrame):
+ When the thisValue is JSValue() return undefined and avoid calling
+ toThisValue which would lead to a crash. Having `this` be an empty
+ JSValue could happen inside an ES6 class constructor, before
+ calling super.
+
</ins><span class="cx"> 2016-05-09 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, fix cloop.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredebuggerDebuggerCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp (200616 => 200617)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-05-10 06:07:30 UTC (rev 200616)
+++ trunk/Source/JavaScriptCore/debugger/DebuggerCallFrame.cpp 2016-05-10 06:36:42 UTC (rev 200617)
</span><span class="lines">@@ -256,14 +256,17 @@
</span><span class="cx"> JSValue DebuggerCallFrame::thisValueForCallFrame(CallFrame* callFrame)
</span><span class="cx"> {
</span><span class="cx"> if (!callFrame)
</span><del>- return jsNull();
</del><ins>+ return jsUndefined();
</ins><span class="cx">
</span><ins>+ if (!callFrame->thisValue())
+ return jsUndefined();
+
</ins><span class="cx"> ECMAMode ecmaMode = NotStrictMode;
</span><span class="cx"> CodeBlock* codeBlock = callFrame->codeBlock();
</span><span class="cx"> if (codeBlock && codeBlock->isStrictMode())
</span><span class="cx"> ecmaMode = StrictMode;
</span><del>- JSValue thisValue = callFrame->thisValue().toThis(callFrame, ecmaMode);
- return thisValue;
</del><ins>+
+ return callFrame->thisValue().toThis(callFrame, ecmaMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre>
</div>
</div>
</body>
</html>