<!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>[168051] trunk/Source/JavaScriptCore</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/168051">168051</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 15:22:11 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Argument flush formats should not be presumed to be JSValue since 'this' is weird
https://bugs.webkit.org/show_bug.cgi?id=132404
Reviewed by Michael Saboff.
* dfg/DFGSpeculativeJIT.cpp:
(JSC::DFG::SpeculativeJIT::compileCurrentBlock): Don't assume that arguments are flushed as JSValue. Use the logic for locals instead.
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile): SetArgument "changes" the format because before this we wouldn't know we had arguments.
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile): Ditto.
* dfg/DFGValueSource.cpp:
(JSC::DFG::ValueSource::dumpInContext): Make this easier to dump.
* dfg/DFGValueSource.h:
(JSC::DFG::ValueSource::operator!): Make this easier to dump because Operands<T> uses T::operator!().
* ftl/FTLOSREntry.cpp:
(JSC::FTL::prepareOSREntry): This had a useful assertion for everything except 'this'.
* tests/stress/strict-to-this-int.js: Added.
(foo):
(Number.prototype.valueOf):
(test):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGValueSourcecpp">trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGValueSourceh">trunk/Source/JavaScriptCore/dfg/DFGValueSource.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreftlFTLOSREntrycpp">trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressstricttothisintjs">trunk/Source/JavaScriptCore/tests/stress/strict-to-this-int.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (168050 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-30 22:10:06 UTC (rev 168050)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-04-30 Filip Pizlo <fpizlo@apple.com>
+
+ Argument flush formats should not be presumed to be JSValue since 'this' is weird
+ https://bugs.webkit.org/show_bug.cgi?id=132404
+
+ Reviewed by Michael Saboff.
+
+ * dfg/DFGSpeculativeJIT.cpp:
+ (JSC::DFG::SpeculativeJIT::compileCurrentBlock): Don't assume that arguments are flushed as JSValue. Use the logic for locals instead.
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile): SetArgument "changes" the format because before this we wouldn't know we had arguments.
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile): Ditto.
+ * dfg/DFGValueSource.cpp:
+ (JSC::DFG::ValueSource::dumpInContext): Make this easier to dump.
+ * dfg/DFGValueSource.h:
+ (JSC::DFG::ValueSource::operator!): Make this easier to dump because Operands<T> uses T::operator!().
+ * ftl/FTLOSREntry.cpp:
+ (JSC::FTL::prepareOSREntry): This had a useful assertion for everything except 'this'.
+ * tests/stress/strict-to-this-int.js: Added.
+ (foo):
+ (Number.prototype.valueOf):
+ (test):
+
</ins><span class="cx"> 2014-04-29 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't hold on to parameterBindingNodes forever
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (168050 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-04-30 22:10:06 UTC (rev 168050)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -1370,17 +1370,12 @@
</span><span class="cx"> m_jit.jitAssertTagsInPlace();
</span><span class="cx"> m_jit.jitAssertArgumentCountSane();
</span><span class="cx">
</span><del>- for (size_t i = 0; i < m_block->variablesAtHead.numberOfArguments(); ++i) {
- m_stream->appendAndLog(
- VariableEvent::setLocal(
- virtualRegisterForArgument(i), virtualRegisterForArgument(i), DataFormatJS));
- }
-
</del><span class="cx"> m_state.reset();
</span><span class="cx"> m_state.beginBasicBlock(m_block);
</span><span class="cx">
</span><del>- for (size_t i = 0; i < m_block->variablesAtHead.numberOfLocals(); ++i) {
- Node* node = m_block->variablesAtHead.local(i);
</del><ins>+ for (size_t i = m_block->variablesAtHead.size(); i--;) {
+ int operand = m_block->variablesAtHead.operandForIndex(i);
+ Node* node = m_block->variablesAtHead[i];
</ins><span class="cx"> if (!node)
</span><span class="cx"> continue; // No need to record dead SetLocal's.
</span><span class="cx">
</span><span class="lines">@@ -1388,10 +1383,12 @@
</span><span class="cx"> DataFormat format;
</span><span class="cx"> if (!node->refCount())
</span><span class="cx"> continue; // No need to record dead SetLocal's.
</span><del>- else
- format = dataFormatFor(variable->flushFormat());
</del><ins>+ format = dataFormatFor(variable->flushFormat());
</ins><span class="cx"> m_stream->appendAndLog(
</span><del>- VariableEvent::setLocal(virtualRegisterForLocal(i), variable->machineLocal(), format));
</del><ins>+ VariableEvent::setLocal(
+ VirtualRegister(operand),
+ variable->machineLocal(),
+ format));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_codeOriginForExitTarget = CodeOrigin();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (168050 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-04-30 22:10:06 UTC (rev 168050)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -1849,6 +1849,7 @@
</span><span class="cx"> // But it may be profitable to use this as a hook to run speculation checks
</span><span class="cx"> // on arguments, thereby allowing us to trivially eliminate such checks if
</span><span class="cx"> // the argument is not used.
</span><ins>+ recordSetLocal(dataFormatFor(node->variableAccessData()->flushFormat()));
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case BitAnd:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (168050 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-04-30 22:10:06 UTC (rev 168050)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -1952,6 +1952,7 @@
</span><span class="cx"> // But it may be profitable to use this as a hook to run speculation checks
</span><span class="cx"> // on arguments, thereby allowing us to trivially eliminate such checks if
</span><span class="cx"> // the argument is not used.
</span><ins>+ recordSetLocal(dataFormatFor(node->variableAccessData()->flushFormat()));
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case BitAnd:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGValueSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp (168050 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp 2014-04-30 22:10:06 UTC (rev 168050)
+++ trunk/Source/JavaScriptCore/dfg/DFGValueSource.cpp 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -71,6 +71,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ValueSource::dumpInContext(PrintStream& out, DumpContext*) const
+{
+ dump(out);
+}
+
</ins><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGValueSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGValueSource.h (168050 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGValueSource.h 2014-04-30 22:10:06 UTC (rev 168050)
+++ trunk/Source/JavaScriptCore/dfg/DFGValueSource.h 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2011, 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -174,6 +174,8 @@
</span><span class="cx"> return kind() != SourceNotSet;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool operator!() const { return !isSet(); }
+
</ins><span class="cx"> ValueSourceKind kind() const
</span><span class="cx"> {
</span><span class="cx"> return m_kind;
</span><span class="lines">@@ -215,6 +217,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void dump(PrintStream&) const;
</span><ins>+ void dumpInContext(PrintStream&, DumpContext*) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ValueSourceKind m_kind;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreftlFTLOSREntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp (168050 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp 2014-04-30 22:10:06 UTC (rev 168050)
+++ trunk/Source/JavaScriptCore/ftl/FTLOSREntry.cpp 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> for (int argument = values.numberOfArguments(); argument--;) {
</span><span class="cx"> JSValue valueOnStack = exec->r(virtualRegisterForArgument(argument).offset()).jsValue();
</span><span class="cx"> JSValue reconstructedValue = values.argument(argument);
</span><del>- if (valueOnStack == reconstructedValue)
</del><ins>+ if (valueOnStack == reconstructedValue || !argument)
</ins><span class="cx"> continue;
</span><span class="cx"> dataLog("Mismatch between reconstructed values and the the value on the stack for argument arg", argument, " for ", *entryCodeBlock, " at bc#", bytecodeIndex, ":\n");
</span><span class="cx"> dataLog(" Value on stack: ", valueOnStack, "\n");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressstricttothisintjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/strict-to-this-int.js (0 => 168051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/strict-to-this-int.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/strict-to-this-int.js 2014-04-30 22:22:11 UTC (rev 168051)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+function foo(a, b) {
+ var result = a + b;
+ if (result)
+ return (a + b) + result + this;
+ else
+ return this.f;
+}
+
+noInline(foo);
+
+var x;
+Number.prototype.valueOf = function() { return x; };
+
+function test(this_, a, b, x_) {
+ x = x_;
+ var result = foo.call(this_, a, b);
+ if (result != (a + b) * 2 + x_)
+ throw "Error: bad result: " + result;
+}
+
+for (var i = 0; i < 100000; ++i)
+ test(5, 1, 2, 100);
+
+test(5, 2000000000, 2000000000, 1);
+test(5, 1073741774, 1073741774, 1000);
</ins></span></pre>
</div>
</div>
</body>
</html>