<!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>[166510] 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/166510">166510</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 09:50:15 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More validation for FTL inline caches
https://bugs.webkit.org/show_bug.cgi?id=130948
Reviewed by Geoffrey Garen.
Source/JavaScriptCore:
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::handleGetById):
(JSC::DFG::ByteCodeParser::handlePutById):
* runtime/Options.h:
Tools:
* Scripts/run-jsc-stress-tests:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunjscstresstests">trunk/Tools/Scripts/run-jsc-stress-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166509 => 166510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-03-31 16:43:32 UTC (rev 166509)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-03-31 16:50:15 UTC (rev 166510)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-03-31 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ More validation for FTL inline caches
+ https://bugs.webkit.org/show_bug.cgi?id=130948
+
+ Reviewed by Geoffrey Garen.
+
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handleGetById):
+ (JSC::DFG::ByteCodeParser::handlePutById):
+ * runtime/Options.h:
+
+2014-03-31 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> LLVM IR for store barriers should be nicely arranged and they don't need exception checks
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=130950
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (166509 => 166510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-03-31 16:43:32 UTC (rev 166509)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-03-31 16:50:15 UTC (rev 166510)
</span><span class="lines">@@ -1885,7 +1885,7 @@
</span><span class="cx"> int destinationOperand, SpeculatedType prediction, Node* base, unsigned identifierNumber,
</span><span class="cx"> const GetByIdStatus& getByIdStatus)
</span><span class="cx"> {
</span><del>- if (!getByIdStatus.isSimple()) {
</del><ins>+ if (!getByIdStatus.isSimple() || !Options::enableAccessInlining()) {
</ins><span class="cx"> set(VirtualRegister(destinationOperand),
</span><span class="cx"> addToGraph(
</span><span class="cx"> getByIdStatus.makesCalls() ? GetByIdFlush : GetById,
</span><span class="lines">@@ -1971,7 +1971,7 @@
</span><span class="cx"> Node* base, unsigned identifierNumber, Node* value,
</span><span class="cx"> const PutByIdStatus& putByIdStatus, bool isDirect)
</span><span class="cx"> {
</span><del>- if (!putByIdStatus.isSimple()) {
</del><ins>+ if (!putByIdStatus.isSimple() || !Options::enableAccessInlining()) {
</ins><span class="cx"> if (!putByIdStatus.isSet())
</span><span class="cx"> addToGraph(ForceOSRExit);
</span><span class="cx"> emitPutById(base, identifierNumber, value, putByIdStatus, isDirect);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (166509 => 166510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2014-03-31 16:43:32 UTC (rev 166509)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2014-03-31 16:50:15 UTC (rev 166510)
</span><span class="lines">@@ -160,6 +160,7 @@
</span><span class="cx"> v(bool, ftlCrashes, false) /* fool-proof way of checking that you ended up in the FTL. ;-) */\
</span><span class="cx"> v(bool, clobberAllRegsInFTLICSlowPath, !ASSERT_DISABLED) \
</span><span class="cx"> v(bool, assumeAllRegsInFTLICAreLive, true) \
</span><ins>+ v(bool, enableAccessInlining, true) \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, enableConcurrentJIT, true) \
</span><span class="cx"> v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(2, 2) - 1) \
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (166509 => 166510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-03-31 16:43:32 UTC (rev 166509)
+++ trunk/Tools/ChangeLog 2014-03-31 16:50:15 UTC (rev 166510)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-03-31 Filip Pizlo <fpizlo@apple.com>
+
+ More validation for FTL inline caches
+ https://bugs.webkit.org/show_bug.cgi?id=130948
+
+ Reviewed by Geoffrey Garen.
+
+ * Scripts/run-jsc-stress-tests:
+
</ins><span class="cx"> 2014-03-31 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Do not run WebKit1 unit tests by default
</span></span></pre></div>
<a id="trunkToolsScriptsrunjscstresstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-jsc-stress-tests (166509 => 166510)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-jsc-stress-tests 2014-03-31 16:43:32 UTC (rev 166509)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2014-03-31 16:50:15 UTC (rev 166510)
</span><span class="lines">@@ -587,10 +587,18 @@
</span><span class="cx"> run("no-cjit-no-aso", "--enableConcurrentJIT=false", "--enableArchitectureSpecificOptimizations=false")
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def runFTLNoSimpleOpt
- run("ftl-no-simple-opt", "--enableConcurrentJIT=false", "--llvmSimpleOpt=false", *FTL_OPTIONS) if $enableFTL
</del><ins>+def runFTLNoCJITNoSimpleOpt
+ run("ftl-no-cjit-no-simple-opt", "--enableConcurrentJIT=false", "--llvmSimpleOpt=false", *FTL_OPTIONS) if $enableFTL
</ins><span class="cx"> end
</span><span class="cx">
</span><ins>+def runNoCJITNoAccessInlining
+ run("no-cjit-no-access-inlining", "--enableConcurrentJIT=false", "--enableAccessInlining=false")
+end
+
+def runFTLNoCJITNoAccessInlining
+ run("ftl-no-cjit-no-access-inlining", "--enableConcurrentJIT=false", "--enableAccessInlining=false", *FTL_OPTIONS) if $enableFTL
+end
+
</ins><span class="cx"> def defaultRun
</span><span class="cx"> runDefault
</span><span class="cx"> runNoLLInt
</span><span class="lines">@@ -601,10 +609,8 @@
</span><span class="cx"> runDefaultFTL
</span><span class="cx"> runFTLNoCJITValidate
</span><span class="cx"> runFTLNoCJITNoInlineValidate
</span><del>- runFTLNoCJITOSRValidation
</del><span class="cx"> runFTLEager
</span><span class="cx"> runFTLEagerNoCJITValidate
</span><del>- runFTLEagerNoCJITOSRValidation
</del><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def defaultQuickRun
</span><span class="lines">@@ -614,9 +620,12 @@
</span><span class="cx"> runFTLNoCJIT
</span><span class="cx"> end
</span><span class="cx">
</span><del>-def defaultFTLSpotCheck
</del><ins>+def defaultSpotCheck
</ins><span class="cx"> defaultQuickRun
</span><del>- runFTLNoSimpleOpt
</del><ins>+ runFTLNoCJITNoSimpleOpt
+ runFTLNoCJITOSRValidation
+ runNoCJITNoAccessInlining
+ runFTLNoCJITNoAccessInlining
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> # This is expected to not do eager runs because eager runs can have a lot of recompilations
</span></span></pre>
</div>
</div>
</body>
</html>