<!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>[207500] 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/207500">207500</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-10-18 16:40:10 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GetByVal to GetById conversion in the DFG is incorrect for getters with control flow
https://bugs.webkit.org/show_bug.cgi?id=163629
Reviewed by Yusuke Suzuki.
JSTests:
* stress/get-by-val-to-id-with-getter.js: Added.
(foo):
(o.get hello):
Source/JavaScriptCore:
This patch fixes a bug in the DFG when attempt to convert a
GetByVal into a GetById. While converting the GetByVal, during
handleGetById in the Bytecode parser, we would mistakenly use the
opcode length of op_get_by_id rather than op_get_by_val. This causes
the new basic block we create to point to the wrong offset. In the
added test this will cause us to infinite loop.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::handleGetById):
(JSC::DFG::ByteCodeParser::parseBlock):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressgetbyvaltoidwithgetterjs">trunk/JSTests/stress/get-by-val-to-id-with-getter.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (207499 => 207500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-18 23:33:22 UTC (rev 207499)
+++ trunk/JSTests/ChangeLog 2016-10-18 23:40:10 UTC (rev 207500)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-10-18 Keith Miller <keith_miller@apple.com>
+
+ GetByVal to GetById conversion in the DFG is incorrect for getters with control flow
+ https://bugs.webkit.org/show_bug.cgi?id=163629
+
+ Reviewed by Yusuke Suzuki.
+
+ * stress/get-by-val-to-id-with-getter.js: Added.
+ (foo):
+ (o.get hello):
+
</ins><span class="cx"> 2016-10-15 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG and FTL should be able to use DirectCall ICs when they proved the callee or its executable
</span></span></pre></div>
<a id="trunkJSTestsstressgetbyvaltoidwithgetterjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/get-by-val-to-id-with-getter.js (0 => 207500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/get-by-val-to-id-with-getter.js (rev 0)
+++ trunk/JSTests/stress/get-by-val-to-id-with-getter.js 2016-10-18 23:40:10 UTC (rev 207500)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+
+// Test GetByVal => GetById conversion works correctly when inlining a getter in the DFG.
+function foo(obj, val) {
+ if (obj[val]) {
+ return 1;
+ }
+ return 0;
+}
+noInline(foo);
+
+
+o = { num: 0,
+ get hello() {
+ if (this.num === 1)
+ return true;
+ return false;
+ }
+ };
+
+for(i = 0; i < 100000; ++i) {
+ let num = i % 2;
+ o.num = num;
+ if (foo(o, "hello") !== num)
+ throw new Error("bad result on iteration: " + i);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207499 => 207500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-18 23:33:22 UTC (rev 207499)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-18 23:40:10 UTC (rev 207500)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-10-18 Keith Miller <keith_miller@apple.com>
+
+ GetByVal to GetById conversion in the DFG is incorrect for getters with control flow
+ https://bugs.webkit.org/show_bug.cgi?id=163629
+
+ Reviewed by Yusuke Suzuki.
+
+ This patch fixes a bug in the DFG when attempt to convert a
+ GetByVal into a GetById. While converting the GetByVal, during
+ handleGetById in the Bytecode parser, we would mistakenly use the
+ opcode length of op_get_by_id rather than op_get_by_val. This causes
+ the new basic block we create to point to the wrong offset. In the
+ added test this will cause us to infinite loop.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleGetById):
+ (JSC::DFG::ByteCodeParser::parseBlock):
+
</ins><span class="cx"> 2016-10-18 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove CSS_SHAPES feature definition. This should always be on.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (207499 => 207500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-10-18 23:33:22 UTC (rev 207499)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2016-10-18 23:40:10 UTC (rev 207500)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> Node* store(Node* base, unsigned identifier, const PutByIdVariant&, Node* value);
</span><span class="cx">
</span><span class="cx"> void handleGetById(
</span><del>- int destinationOperand, SpeculatedType, Node* base, unsigned identifierNumber, GetByIdStatus, AccessType);
</del><ins>+ int destinationOperand, SpeculatedType, Node* base, unsigned identifierNumber, GetByIdStatus, AccessType, unsigned instructionSize);
</ins><span class="cx"> void emitPutById(
</span><span class="cx"> Node* base, unsigned identifierNumber, Node* value, const PutByIdStatus&, bool isDirect);
</span><span class="cx"> void handlePutById(
</span><span class="lines">@@ -3272,7 +3272,7 @@
</span><span class="cx">
</span><span class="cx"> void ByteCodeParser::handleGetById(
</span><span class="cx"> int destinationOperand, SpeculatedType prediction, Node* base, unsigned identifierNumber,
</span><del>- GetByIdStatus getByIdStatus, AccessType type)
</del><ins>+ GetByIdStatus getByIdStatus, AccessType type, unsigned instructionSize)
</ins><span class="cx"> {
</span><span class="cx"> // Attempt to reduce the set of things in the GetByIdStatus.
</span><span class="cx"> if (base->op() == NewObject) {
</span><span class="lines">@@ -3434,7 +3434,7 @@
</span><span class="cx"> addToGraph(ExitOK);
</span><span class="cx">
</span><span class="cx"> handleCall(
</span><del>- destinationOperand, Call, InlineCallFrame::GetterCall, OPCODE_LENGTH(op_get_by_id),
</del><ins>+ destinationOperand, Call, InlineCallFrame::GetterCall, instructionSize,
</ins><span class="cx"> getter, numberOfParameters - 1, registerOffset, *variant.callLinkStatus(), prediction);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4210,7 +4210,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (compiledAsGetById)
</span><del>- handleGetById(currentInstruction[1].u.operand, prediction, base, identifierNumber, getByIdStatus, AccessType::Get);
</del><ins>+ handleGetById(currentInstruction[1].u.operand, prediction, base, identifierNumber, getByIdStatus, AccessType::Get, OPCODE_LENGTH(op_get_by_val));
</ins><span class="cx"> else {
</span><span class="cx"> ArrayMode arrayMode = getArrayMode(currentInstruction[4].u.arrayProfile, Array::Read);
</span><span class="cx"> Node* getByVal = addToGraph(GetByVal, OpInfo(arrayMode.asWord()), OpInfo(prediction), base, property);
</span><span class="lines">@@ -4348,9 +4348,11 @@
</span><span class="cx"> m_inlineStackTop->m_stubInfos, m_dfgStubInfos,
</span><span class="cx"> currentCodeOrigin(), uid);
</span><span class="cx"> AccessType type = op_try_get_by_id == opcodeID ? AccessType::GetPure : AccessType::Get;
</span><del>-
</del><ins>+
+ unsigned opcodeLength = opcodeID == op_try_get_by_id ? OPCODE_LENGTH(op_try_get_by_id) : OPCODE_LENGTH(op_get_by_id);
+
</ins><span class="cx"> handleGetById(
</span><del>- currentInstruction[1].u.operand, prediction, base, identifierNumber, getByIdStatus, type);
</del><ins>+ currentInstruction[1].u.operand, prediction, base, identifierNumber, getByIdStatus, type, opcodeLength);
</ins><span class="cx">
</span><span class="cx"> if (op_try_get_by_id == opcodeID)
</span><span class="cx"> NEXT_OPCODE(op_try_get_by_id); // Opcode's length is different from others in this case.
</span></span></pre>
</div>
</div>
</body>
</html>