<!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>[178629] 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/178629">178629</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-01-17 16:20:49 -0800 (Sat, 17 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in JSScope::resolve() on tools.ups.com
https://bugs.webkit.org/show_bug.cgi?id=140579
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
For op_resolve_scope of a global property or variable that needs to check for the var
injection check watchpoint, we need to keep the scope around with a Phantom. The
baseline JIT slowpath for op_resolve_scope needs the scope value if the watchpoint
fired.
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::parseBlock):
LayoutTests:
New regression test.
* js/regress-140579-expected.txt: Added.
* js/regress-140579.html: Added.
* js/script-tests/regress-140579.js: Added.
(Test.this.isString):
(Test.this.test):
(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="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsregress140579expectedtxt">trunk/LayoutTests/js/regress-140579-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsregress140579html">trunk/LayoutTests/js/regress-140579.html</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress140579js">trunk/LayoutTests/js/script-tests/regress-140579.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178628 => 178629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-17 22:51:47 UTC (rev 178628)
+++ trunk/LayoutTests/ChangeLog 2015-01-18 00:20:49 UTC (rev 178629)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-17 Michael Saboff <msaboff@apple.com>
+
+ Crash in JSScope::resolve() on tools.ups.com
+ https://bugs.webkit.org/show_bug.cgi?id=140579
+
+ Reviewed by Geoffrey Garen.
+
+ New regression test.
+
+ * js/regress-140579-expected.txt: Added.
+ * js/regress-140579.html: Added.
+ * js/script-tests/regress-140579.js: Added.
+ (Test.this.isString):
+ (Test.this.test):
+ (Test):
+
</ins><span class="cx"> 2015-01-17 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Converting time, angle and frequency units in CSS calc() function
</span></span></pre></div>
<a id="trunkLayoutTestsjsregress140579expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-140579-expected.txt (0 => 178629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-140579-expected.txt (rev 0)
+++ trunk/LayoutTests/js/regress-140579-expected.txt 2015-01-18 00:20:49 UTC (rev 178629)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Regression test for https://webkit.org/b/140579. This test should run without crashing.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS o.test() == 5000 is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsregress140579html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/regress-140579.html (0 => 178629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/regress-140579.html (rev 0)
+++ trunk/LayoutTests/js/regress-140579.html 2015-01-18 00:20:49 UTC (rev 178629)
</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-140579.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress140579js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/regress-140579.js (0 => 178629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-140579.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/regress-140579.js 2015-01-18 00:20:49 UTC (rev 178629)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+description(
+"Regression test for https://webkit.org/b/140579. This test should run without crashing."
+);
+
+function Test(maxCount)
+{
+ this.dummy = eval("0");
+
+ this.isString = function(v) {
+ return (typeof v == "string" || v instanceof String);
+ };
+
+ this.test = function()
+ {
+ var count = eval("0");
+ var s = "abc";
+
+ for (var i = 0; i < maxCount; i++) {
+ if (i == 4500) {
+ s = new String("xyz"); // Cause a BadType OSR exit in isString()
+ eval("var x = 3;"); // Fire var injection watchpoint
+ }
+
+ if (this.isString(s))
+ count++;
+ }
+
+ return count;
+ };
+}
+
+o = new Test(5000);
+
+shouldBeTrue("o.test() == 5000");
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (178628 => 178629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-01-17 22:51:47 UTC (rev 178628)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-01-18 00:20:49 UTC (rev 178629)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-17 Michael Saboff <msaboff@apple.com>
+
+ Crash in JSScope::resolve() on tools.ups.com
+ https://bugs.webkit.org/show_bug.cgi?id=140579
+
+ Reviewed by Geoffrey Garen.
+
+ For op_resolve_scope of a global property or variable that needs to check for the var
+ injection check watchpoint, we need to keep the scope around with a Phantom. The
+ baseline JIT slowpath for op_resolve_scope needs the scope value if the watchpoint
+ fired.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::parseBlock):
+
</ins><span class="cx"> 2015-01-16 Brian J. Burg <burg@cs.washington.edu>
</span><span class="cx">
</span><span class="cx"> Web Inspector: code generator should introduce typedefs for protocol types that are arrays
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (178628 => 178629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-01-17 22:51:47 UTC (rev 178628)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-01-18 00:20:49 UTC (rev 178629)
</span><span class="lines">@@ -3187,6 +3187,8 @@
</span><span class="cx"> case GlobalPropertyWithVarInjectionChecks:
</span><span class="cx"> case GlobalVarWithVarInjectionChecks:
</span><span class="cx"> set(VirtualRegister(dst), weakJSConstant(m_inlineStackTop->m_codeBlock->globalObject()));
</span><ins>+ if (resolveType == GlobalPropertyWithVarInjectionChecks || resolveType == GlobalVarWithVarInjectionChecks)
+ addToGraph(Phantom, getDirect(m_inlineStackTop->remapOperand(VirtualRegister(currentInstruction[2].u.operand))));
</ins><span class="cx"> break;
</span><span class="cx"> case LocalClosureVar:
</span><span class="cx"> case ClosureVar:
</span></span></pre>
</div>
</div>
</body>
</html>