<!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>[185566] 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/185566">185566</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-06-15 14:26:08 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>JIT bug - fails when inspector closed, works when open
https://bugs.webkit.org/show_bug.cgi?id=145243
Reviewed by Oliver Hunt.
Source/JavaScriptCore:
We need to provide the Arguments object as the base when creating the HeapLocation for
GetFromArguments and PutToArguments. Otherwise we endup creating a HeapLocation for
any arguments object, not the one we need.
* dfg/DFGClobberize.h:
(JSC::DFG::clobberize):
LayoutTests:
New regression test.
* js/regress-145243-expected.txt: Added.
* js/regress-145243.html: Added.
* js/script-tests/regress-145243.js: Added.
(bar):
(foo):
(test):</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="#trunkSourceJavaScriptCoredfgDFGClobberizeh">trunk/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress145243expectedtxt">trunk/LayoutTests/js/regress-145243-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress145243html">trunk/LayoutTests/js/regress-145243.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress145243js">trunk/LayoutTests/js/script-tests/regress-145243.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185565 => 185566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-15 19:47:47 UTC (rev 185565)
+++ trunk/LayoutTests/ChangeLog 2015-06-15 21:26:08 UTC (rev 185566)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-15 Michael Saboff <msaboff@apple.com>
+
+ JIT bug - fails when inspector closed, works when open
+ https://bugs.webkit.org/show_bug.cgi?id=145243
+
+ Reviewed by Oliver Hunt.
+
+ New regression test.
+
+ * js/regress-145243-expected.txt: Added.
+ * js/regress-145243.html: Added.
+ * js/script-tests/regress-145243.js: Added.
+ (bar):
+ (foo):
+ (test):
+
</ins><span class="cx"> 2015-06-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, gardening for Windows.
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress145243expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-145243-expected.txt (0 => 185566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-145243-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-145243-expected.txt 2015-06-15 21:26:08 UTC (rev 185566)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Verify that we don't use our caller's arguments object in an inlined function.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS Correctly accessed inlined callee's own arguments
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress145243html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-145243.html (0 => 185566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-145243.html (rev 0)
+++ trunk/LayoutTests/js/regress-145243.html 2015-06-15 21:26:08 UTC (rev 185566)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-145243.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress145243js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-145243.js (0 => 185566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-145243.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-145243.js 2015-06-15 21:26:08 UTC (rev 185566)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+description("Verify that we don't use our caller's arguments object in an inlined function.");
+
+function bar(x) {
+ var t = arguments;
+ var a = x;
+ return a;
+}
+
+function foo(x) {
+ var t = arguments;
+ var a = x;
+ return bar(1);
+}
+
+noInline(foo);
+
+function test() {
+ for (var i = 0; i < 10000; ++i) {
+ var result = foo(42);
+ if (result != 1) {
+ testFailed("Expected 1, but got " + result);
+ return false;
+ }
+ }
+ return true;
+}
+
+if (test())
+ testPassed("Correctly accessed inlined callee's own arguments");
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185565 => 185566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-15 19:47:47 UTC (rev 185565)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-15 21:26:08 UTC (rev 185566)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-15 Michael Saboff <msaboff@apple.com>
+
+ JIT bug - fails when inspector closed, works when open
+ https://bugs.webkit.org/show_bug.cgi?id=145243
+
+ Reviewed by Oliver Hunt.
+
+ We need to provide the Arguments object as the base when creating the HeapLocation for
+ GetFromArguments and PutToArguments. Otherwise we endup creating a HeapLocation for
+ any arguments object, not the one we need.
+
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+
</ins><span class="cx"> 2015-06-13 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: console.table() with a list of objects no longer works
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGClobberize.h (185565 => 185566)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-06-15 19:47:47 UTC (rev 185565)
+++ trunk/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-06-15 21:26:08 UTC (rev 185566)
</span><span class="lines">@@ -820,14 +820,14 @@
</span><span class="cx"> case GetFromArguments: {
</span><span class="cx"> AbstractHeap heap(DirectArgumentsProperties, node->capturedArgumentsOffset().offset());
</span><span class="cx"> read(heap);
</span><del>- def(HeapLocation(DirectArgumentsLoc, heap), LazyNode(node));
</del><ins>+ def(HeapLocation(DirectArgumentsLoc, heap, node->child1()), LazyNode(node));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case PutToArguments: {
</span><span class="cx"> AbstractHeap heap(DirectArgumentsProperties, node->capturedArgumentsOffset().offset());
</span><span class="cx"> write(heap);
</span><del>- def(HeapLocation(DirectArgumentsLoc, heap), LazyNode(node->child2().node()));
</del><ins>+ def(HeapLocation(DirectArgumentsLoc, heap, node->child1()), LazyNode(node->child2().node()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>