<!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>[170090] branches/ftlopt</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/170090">170090</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-06-17 18:16:17 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[ftlopt] DFG put_by_id should inline accesses with a slightly polymorphic base
https://bugs.webkit.org/show_bug.cgi?id=133964
Reviewed by Mark Hahnenberg.
Source/JavaScriptCore:
* bytecode/PutByIdStatus.cpp:
(JSC::PutByIdStatus::appendVariant):
(JSC::PutByIdStatus::computeForStubInfo):
* bytecode/PutByIdVariant.cpp:
(JSC::PutByIdVariant::oldStructureForTransition):
(JSC::PutByIdVariant::writesStructures):
(JSC::PutByIdVariant::reallocatesStorage):
(JSC::PutByIdVariant::attemptToMerge):
(JSC::PutByIdVariant::attemptToMergeTransitionWithReplace):
(JSC::PutByIdVariant::dumpInContext):
* bytecode/PutByIdVariant.h:
(JSC::PutByIdVariant::PutByIdVariant):
(JSC::PutByIdVariant::replace):
(JSC::PutByIdVariant::transition):
(JSC::PutByIdVariant::structure):
(JSC::PutByIdVariant::oldStructure):
* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
* dfg/DFGByteCodeParser.cpp:
(JSC::DFG::ByteCodeParser::handlePutById):
(JSC::DFG::ByteCodeParser::parseBlock):
* dfg/DFGConstantFoldingPhase.cpp:
(JSC::DFG::ConstantFoldingPhase::foldConstants):
(JSC::DFG::ConstantFoldingPhase::emitPutByOffset):
* dfg/DFGGraph.cpp:
(JSC::DFG::Graph::visitChildren):
* dfg/DFGNode.cpp:
(JSC::DFG::MultiPutByOffsetData::writesStructures):
(JSC::DFG::MultiPutByOffsetData::reallocatesStorage):
* ftl/FTLAbbreviations.h:
(JSC::FTL::getLinkage):
* ftl/FTLLowerDFGToLLVM.cpp:
(JSC::FTL::LowerDFGToLLVM::compileMultiPutByOffset):
(JSC::FTL::LowerDFGToLLVM::getModuleByPathForSymbol):
LayoutTests:
* js/regress/put-by-id-replace-and-transition-expected.txt: Added.
* js/regress/put-by-id-replace-and-transition.html: Added.
* js/regress/put-by-id-slightly-polymorphic-expected.txt: Added.
* js/regress/put-by-id-slightly-polymorphic.html: Added.
* js/regress/script-tests/put-by-id-replace-and-transition.js: Added.
* js/regress/script-tests/put-by-id-slightly-polymorphic.js: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesftloptLayoutTestsChangeLog">branches/ftlopt/LayoutTests/ChangeLog</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreChangeLog">branches/ftlopt/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesftloptSourceJavaScriptCorebytecodePutByIdStatuscpp">branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCorebytecodePutByIdVariantcpp">branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCorebytecodePutByIdVarianth">branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">branches/ftlopt/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoredfgDFGByteCodeParsercpp">branches/ftlopt/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp">branches/ftlopt/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoredfgDFGGraphcpp">branches/ftlopt/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoredfgDFGNodecpp">branches/ftlopt/Source/JavaScriptCore/dfg/DFGNode.cpp</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLAbbreviationsh">branches/ftlopt/Source/JavaScriptCore/ftl/FTLAbbreviations.h</a></li>
<li><a href="#branchesftloptSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchesftloptLayoutTestsjsregressputbyidreplaceandtransitionexpectedtxt">branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition-expected.txt</a></li>
<li><a href="#branchesftloptLayoutTestsjsregressputbyidreplaceandtransitionhtml">branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition.html</a></li>
<li><a href="#branchesftloptLayoutTestsjsregressputbyidslightlypolymorphicexpectedtxt">branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic-expected.txt</a></li>
<li><a href="#branchesftloptLayoutTestsjsregressputbyidslightlypolymorphichtml">branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic.html</a></li>
<li><a href="#branchesftloptLayoutTestsjsregressscripttestsputbyidreplaceandtransitionjs">branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-replace-and-transition.js</a></li>
<li><a href="#branchesftloptLayoutTestsjsregressscripttestsputbyidslightlypolymorphicjs">branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-slightly-polymorphic.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesftloptLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/LayoutTests/ChangeLog (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/LayoutTests/ChangeLog 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/LayoutTests/ChangeLog 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-06-17 Filip Pizlo <fpizlo@apple.com>
+
+ [ftlopt] DFG put_by_id should inline accesses with a slightly polymorphic base
+ https://bugs.webkit.org/show_bug.cgi?id=133964
+
+ Reviewed by Mark Hahnenberg.
+
+ * js/regress/put-by-id-replace-and-transition-expected.txt: Added.
+ * js/regress/put-by-id-replace-and-transition.html: Added.
+ * js/regress/put-by-id-slightly-polymorphic-expected.txt: Added.
+ * js/regress/put-by-id-slightly-polymorphic.html: Added.
+ * js/regress/script-tests/put-by-id-replace-and-transition.js: Added.
+ * js/regress/script-tests/put-by-id-slightly-polymorphic.js: Added.
+
</ins><span class="cx"> 2014-06-12 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> [ftlopt] A DFG inlined ById access variant should not speak of a chain, but only of what structures to test the base for, whether to use a constant as an alternate base for the actual access, and what structures to check on what additional cell constants
</span></span></pre></div>
<a id="branchesftloptLayoutTestsjsregressputbyidreplaceandtransitionexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition-expected.txt (0 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition-expected.txt (rev 0)
+++ branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition-expected.txt 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/put-by-id-replace-and-transition
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchesftloptLayoutTestsjsregressputbyidreplaceandtransitionhtml"></a>
<div class="addfile"><h4>Added: branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition.html (0 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition.html (rev 0)
+++ branches/ftlopt/LayoutTests/js/regress/put-by-id-replace-and-transition.html 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/put-by-id-replace-and-transition.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchesftloptLayoutTestsjsregressputbyidslightlypolymorphicexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic-expected.txt (0 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic-expected.txt (rev 0)
+++ branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic-expected.txt 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+JSRegress/put-by-id-slightly-polymorphic
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS no exception thrown
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchesftloptLayoutTestsjsregressputbyidslightlypolymorphichtml"></a>
<div class="addfile"><h4>Added: branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic.html (0 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic.html (rev 0)
+++ branches/ftlopt/LayoutTests/js/regress/put-by-id-slightly-polymorphic.html 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="../../resources/regress-pre.js"></script>
+<script src="script-tests/put-by-id-slightly-polymorphic.js"></script>
+<script src="../../resources/regress-post.js"></script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchesftloptLayoutTestsjsregressscripttestsputbyidreplaceandtransitionjs"></a>
<div class="addfile"><h4>Added: branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-replace-and-transition.js (0 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-replace-and-transition.js (rev 0)
+++ branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-replace-and-transition.js 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+(function() {
+ var o;
+ var n = 1000000;
+ for (var i = 0; i < n; ++i) {
+ if (i & 1)
+ o = {f: 1};
+ else
+ o = {f: 1, g: 2};
+ o.g = i;
+ }
+ if (o.g != n - 1)
+ throw "Error: bad value of o.g: " + o.g;
+})();
</ins></span></pre></div>
<a id="branchesftloptLayoutTestsjsregressscripttestsputbyidslightlypolymorphicjs"></a>
<div class="addfile"><h4>Added: branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-slightly-polymorphic.js (0 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-slightly-polymorphic.js (rev 0)
+++ branches/ftlopt/LayoutTests/js/regress/script-tests/put-by-id-slightly-polymorphic.js 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+(function() {
+ var o = {f: 1, g: 2};
+ var p = {f: 1};
+ var n = 1000000;
+ for (var i = 0; i < n; ++i) {
+ o.f = i;
+ var tmp = o;
+ o = p;
+ p = tmp;
+ }
+ if (o.f != n - 2)
+ throw "Error: bad value of o.f: " + o.f;
+ if (p.f != n - 1)
+ throw "Error: vad value of p.f: " + p.f;
+})();
</ins></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ChangeLog (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/ChangeLog 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2014-06-17 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ [ftlopt] DFG put_by_id should inline accesses with a slightly polymorphic base
+ https://bugs.webkit.org/show_bug.cgi?id=133964
+
+ Reviewed by Mark Hahnenberg.
+
+ * bytecode/PutByIdStatus.cpp:
+ (JSC::PutByIdStatus::appendVariant):
+ (JSC::PutByIdStatus::computeForStubInfo):
+ * bytecode/PutByIdVariant.cpp:
+ (JSC::PutByIdVariant::oldStructureForTransition):
+ (JSC::PutByIdVariant::writesStructures):
+ (JSC::PutByIdVariant::reallocatesStorage):
+ (JSC::PutByIdVariant::attemptToMerge):
+ (JSC::PutByIdVariant::attemptToMergeTransitionWithReplace):
+ (JSC::PutByIdVariant::dumpInContext):
+ * bytecode/PutByIdVariant.h:
+ (JSC::PutByIdVariant::PutByIdVariant):
+ (JSC::PutByIdVariant::replace):
+ (JSC::PutByIdVariant::transition):
+ (JSC::PutByIdVariant::structure):
+ (JSC::PutByIdVariant::oldStructure):
+ * dfg/DFGAbstractInterpreterInlines.h:
+ (JSC::DFG::AbstractInterpreter<AbstractStateType>::executeEffects):
+ * dfg/DFGByteCodeParser.cpp:
+ (JSC::DFG::ByteCodeParser::handlePutById):
+ (JSC::DFG::ByteCodeParser::parseBlock):
+ * dfg/DFGConstantFoldingPhase.cpp:
+ (JSC::DFG::ConstantFoldingPhase::foldConstants):
+ (JSC::DFG::ConstantFoldingPhase::emitPutByOffset):
+ * dfg/DFGGraph.cpp:
+ (JSC::DFG::Graph::visitChildren):
+ * dfg/DFGNode.cpp:
+ (JSC::DFG::MultiPutByOffsetData::writesStructures):
+ (JSC::DFG::MultiPutByOffsetData::reallocatesStorage):
+ * ftl/FTLAbbreviations.h:
+ (JSC::FTL::getLinkage):
+ * ftl/FTLLowerDFGToLLVM.cpp:
+ (JSC::FTL::LowerDFGToLLVM::compileMultiPutByOffset):
+ (JSC::FTL::LowerDFGToLLVM::getModuleByPathForSymbol):
+
+2014-06-17 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> [ftlopt] Fold constant Phis
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133967
</span><span class="cx">
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCorebytecodePutByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -40,7 +40,11 @@
</span><span class="cx"> bool PutByIdStatus::appendVariant(const PutByIdVariant& variant)
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = 0; i < m_variants.size(); ++i) {
</span><del>- if (m_variants[i].oldStructure() == variant.oldStructure())
</del><ins>+ if (m_variants[i].attemptToMerge(variant))
+ return true;
+ }
+ for (unsigned i = 0; i < m_variants.size(); ++i) {
+ if (m_variants[i].oldStructure().overlaps(variant.oldStructure()))
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> m_variants.append(variant);
</span><span class="lines">@@ -194,11 +198,15 @@
</span><span class="cx"> access.newStructure()->getConcurrently(*profiledBlock->vm(), uid);
</span><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return PutByIdStatus(TakesSlowPath);
</span><ins>+ RefPtr<IntendedStructureChain> chain;
+ if (access.chain()) {
+ chain = adoptRef(new IntendedStructureChain(
+ profiledBlock, access.oldStructure(), access.chain()));
+ if (!chain->isStillValid())
+ continue;
+ }
</ins><span class="cx"> bool ok = result.appendVariant(PutByIdVariant::transition(
</span><del>- access.oldStructure(), access.newStructure(),
- access.chain() ? adoptRef(new IntendedStructureChain(
- profiledBlock, access.oldStructure(), access.chain())) : 0,
- offset));
</del><ins>+ access.oldStructure(), access.newStructure(), chain.get(), offset));
</ins><span class="cx"> if (!ok)
</span><span class="cx"> return PutByIdStatus(TakesSlowPath);
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCorebytecodePutByIdVariantcpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.cpp (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.cpp 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.cpp 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -30,6 +30,99 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><ins>+Structure* PutByIdVariant::oldStructureForTransition() const
+{
+ ASSERT(kind() == Transition);
+ ASSERT(m_oldStructure.size() <= 2);
+ for (unsigned i = m_oldStructure.size(); i--;) {
+ Structure* structure = m_oldStructure[i];
+ if (structure != m_newStructure)
+ return structure;
+ }
+ RELEASE_ASSERT_NOT_REACHED();
+}
+
+bool PutByIdVariant::writesStructures() const
+{
+ return kind() == Transition;
+}
+
+bool PutByIdVariant::reallocatesStorage() const
+{
+ if (kind() != Transition)
+ return false;
+
+ if (oldStructureForTransition()->outOfLineCapacity() == newStructure()->outOfLineCapacity())
+ return false;
+
+ return true;
+}
+
+bool PutByIdVariant::attemptToMerge(const PutByIdVariant& other)
+{
+ if (m_offset != other.m_offset)
+ return false;
+
+ switch (m_kind) {
+ case Replace:
+ switch (other.m_kind) {
+ case Replace: {
+ ASSERT(m_constantChecks.isEmpty());
+ ASSERT(other.m_constantChecks.isEmpty());
+
+ m_oldStructure.merge(other.m_oldStructure);
+ return true;
+ }
+
+ case Transition: {
+ PutByIdVariant newVariant = other;
+ if (newVariant.attemptToMergeTransitionWithReplace(*this)) {
+ *this = newVariant;
+ return true;
+ }
+ return false;
+ }
+
+ default:
+ return false;
+ }
+
+ case Transition:
+ switch (other.m_kind) {
+ case Replace:
+ return attemptToMergeTransitionWithReplace(other);
+
+ default:
+ return false;
+ }
+
+ default:
+ return false;
+ }
+}
+
+bool PutByIdVariant::attemptToMergeTransitionWithReplace(const PutByIdVariant& replace)
+{
+ ASSERT(m_kind == Transition);
+ ASSERT(replace.m_kind == Replace);
+ ASSERT(m_offset == replace.m_offset);
+ ASSERT(!replace.writesStructures());
+ ASSERT(!replace.reallocatesStorage());
+
+ // This sort of merging only works when we have one path along which we add a new field which
+ // transitions to structure S while the other path was already on structure S. This doesn't
+ // work if we need to reallocate anything or if the replace path is polymorphic.
+
+ if (reallocatesStorage())
+ return false;
+
+ if (replace.m_oldStructure.onlyStructure() != m_newStructure)
+ return false;
+
+ m_oldStructure.merge(m_newStructure);
+ return true;
+}
+
</ins><span class="cx"> void PutByIdVariant::dump(PrintStream& out) const
</span><span class="cx"> {
</span><span class="cx"> dumpInContext(out, 0);
</span><span class="lines">@@ -44,12 +137,12 @@
</span><span class="cx">
</span><span class="cx"> case Replace:
</span><span class="cx"> out.print(
</span><del>- "<Replace: ", pointerDumpInContext(structure(), context), ", ", offset(), ">");
</del><ins>+ "<Replace: ", inContext(structure(), context), ", ", offset(), ">");
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> case Transition:
</span><span class="cx"> out.print(
</span><del>- "<Transition: ", pointerDumpInContext(oldStructure(), context), " -> ",
</del><ins>+ "<Transition: ", inContext(oldStructure(), context), " -> ",
</ins><span class="cx"> pointerDumpInContext(newStructure(), context), ", [",
</span><span class="cx"> listDumpInContext(constantChecks(), context), "], ", offset(), ">");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCorebytecodePutByIdVarianth"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.h (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.h 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/bytecode/PutByIdVariant.h 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "IntendedStructureChain.h"
</span><span class="cx"> #include "PropertyOffset.h"
</span><ins>+#include "StructureSet.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -41,13 +42,12 @@
</span><span class="cx">
</span><span class="cx"> PutByIdVariant()
</span><span class="cx"> : m_kind(NotSet)
</span><del>- , m_oldStructure(0)
- , m_newStructure(0)
</del><ins>+ , m_newStructure(nullptr)
</ins><span class="cx"> , m_offset(invalidOffset)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PutByIdVariant replace(Structure* structure, PropertyOffset offset)
</del><ins>+ static PutByIdVariant replace(const StructureSet& structure, PropertyOffset offset)
</ins><span class="cx"> {
</span><span class="cx"> PutByIdVariant result;
</span><span class="cx"> result.m_kind = Replace;
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PutByIdVariant transition(
</span><del>- Structure* oldStructure, Structure* newStructure,
</del><ins>+ const StructureSet& oldStructure, Structure* newStructure,
</ins><span class="cx"> PassRefPtr<IntendedStructureChain> structureChain, PropertyOffset offset)
</span><span class="cx"> {
</span><span class="cx"> PutByIdVariant result;
</span><span class="lines">@@ -75,23 +75,28 @@
</span><span class="cx"> bool isSet() const { return kind() != NotSet; }
</span><span class="cx"> bool operator!() const { return !isSet(); }
</span><span class="cx">
</span><del>- Structure* structure() const
</del><ins>+ const StructureSet& structure() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(kind() == Replace);
</span><span class="cx"> return m_oldStructure;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Structure* oldStructure() const
</del><ins>+ const StructureSet& oldStructure() const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(kind() == Transition || kind() == Replace);
</span><span class="cx"> return m_oldStructure;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Structure* oldStructureForTransition() const;
+
</ins><span class="cx"> Structure* newStructure() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(kind() == Transition);
</span><span class="cx"> return m_newStructure;
</span><span class="cx"> }
</span><ins>+
+ bool writesStructures() const;
+ bool reallocatesStorage() const;
</ins><span class="cx">
</span><span class="cx"> const ConstantStructureCheckVector& constantChecks() const
</span><span class="cx"> {
</span><span class="lines">@@ -105,12 +110,16 @@
</span><span class="cx"> return m_offset;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool attemptToMerge(const PutByIdVariant& other);
+
</ins><span class="cx"> void dump(PrintStream&) const;
</span><span class="cx"> void dumpInContext(PrintStream&, DumpContext*) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ bool attemptToMergeTransitionWithReplace(const PutByIdVariant& replace);
+
</ins><span class="cx"> Kind m_kind;
</span><del>- Structure* m_oldStructure;
</del><ins>+ StructureSet m_oldStructure;
</ins><span class="cx"> Structure* m_newStructure;
</span><span class="cx"> ConstantStructureCheckVector m_constantChecks;
</span><span class="cx"> PropertyOffset m_offset;
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -1630,7 +1630,7 @@
</span><span class="cx"> bool done = false;
</span><span class="cx"> for (unsigned i = node->multiPutByOffsetData().variants.size(); i--;) {
</span><span class="cx"> const PutByIdVariant& variant = node->multiPutByOffsetData().variants[i];
</span><del>- if (variant.oldStructure() != structure)
</del><ins>+ if (!variant.oldStructure().contains(structure))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (variant.kind() == PutByIdVariant::Replace) {
</span><span class="lines">@@ -1656,13 +1656,14 @@
</span><span class="cx"> TransitionVector transitions;
</span><span class="cx"> for (unsigned i = node->multiPutByOffsetData().variants.size(); i--;) {
</span><span class="cx"> const PutByIdVariant& variant = node->multiPutByOffsetData().variants[i];
</span><del>- oldSet.add(variant.oldStructure());
</del><ins>+ oldSet.merge(variant.oldStructure());
</ins><span class="cx"> if (variant.kind() == PutByIdVariant::Transition) {
</span><del>- transitions.append(Transition(variant.oldStructure(), variant.newStructure()));
</del><ins>+ transitions.append(
+ Transition(variant.oldStructureForTransition(), variant.newStructure()));
</ins><span class="cx"> newSet.add(variant.newStructure());
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(variant.kind() == PutByIdVariant::Replace);
</span><del>- newSet.add(variant.oldStructure());
</del><ins>+ newSet.merge(variant.oldStructure());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -1868,20 +1868,19 @@
</span><span class="cx"> addToGraph(CheckStructure, OpInfo(m_graph.addStructureSet(variant.oldStructure())), base);
</span><span class="cx"> emitChecks(variant.constantChecks());
</span><span class="cx">
</span><del>- ASSERT(variant.oldStructure()->transitionWatchpointSetHasBeenInvalidated());
</del><ins>+ ASSERT(variant.oldStructureForTransition()->transitionWatchpointSetHasBeenInvalidated());
</ins><span class="cx">
</span><span class="cx"> Node* propertyStorage;
</span><span class="cx"> Transition* transition = m_graph.m_transitions.add(
</span><del>- variant.oldStructure(), variant.newStructure());
</del><ins>+ variant.oldStructureForTransition(), variant.newStructure());
</ins><span class="cx">
</span><del>- if (variant.oldStructure()->outOfLineCapacity()
- != variant.newStructure()->outOfLineCapacity()) {
</del><ins>+ if (variant.reallocatesStorage()) {
</ins><span class="cx">
</span><span class="cx"> // If we're growing the property storage then it must be because we're
</span><span class="cx"> // storing into the out-of-line storage.
</span><span class="cx"> ASSERT(!isInlineOffset(variant.offset()));
</span><span class="cx">
</span><del>- if (!variant.oldStructure()->outOfLineCapacity()) {
</del><ins>+ if (!variant.oldStructureForTransition()->outOfLineCapacity()) {
</ins><span class="cx"> propertyStorage = addToGraph(
</span><span class="cx"> AllocatePropertyStorage, OpInfo(transition), base);
</span><span class="cx"> } else {
</span><span class="lines">@@ -2952,7 +2951,8 @@
</span><span class="cx"> addToGraph(PutById, OpInfo(identifierNumber), get(VirtualRegister(scope)), get(VirtualRegister(value)));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- Node* base = cellConstantWithStructureCheck(globalObject, status[0].structure());
</del><ins>+ ASSERT(status[0].structure().onlyStructure() == structure);
+ Node* base = cellConstantWithStructureCheck(globalObject, structure);
</ins><span class="cx"> addToGraph(Phantom, get(VirtualRegister(scope)));
</span><span class="cx"> handlePutByOffset(base, identifierNumber, static_cast<PropertyOffset>(operand), get(VirtualRegister(value)));
</span><span class="cx"> // Keep scope alive until after put.
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoredfgDFGConstantFoldingPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/dfg/DFGConstantFoldingPhase.cpp 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -181,10 +181,10 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = data.variants.size(); i--;) {
</span><span class="cx"> const PutByIdVariant& variant = data.variants[i];
</span><del>- if (variant.oldStructure() != structure)
</del><ins>+ if (!variant.oldStructure().contains(structure))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- emitPutByOffset(indexInBlock, node, structure, variant, data.identifierNumber);
</del><ins>+ emitPutByOffset(indexInBlock, node, variant, data.identifierNumber);
</ins><span class="cx"> eliminated = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> if (status.numVariants() != 1)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- emitPutByOffset(indexInBlock, node, structure, status[0], identifierNumber);
</del><ins>+ emitPutByOffset(indexInBlock, node, status[0], identifierNumber);
</ins><span class="cx"> eliminated = true;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -381,13 +381,11 @@
</span><span class="cx"> m_graph.m_storageAccessData.append(storageAccessData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void emitPutByOffset(unsigned indexInBlock, Node* node, Structure* structure, const PutByIdVariant& variant, unsigned identifierNumber)
</del><ins>+ void emitPutByOffset(unsigned indexInBlock, Node* node, const PutByIdVariant& variant, unsigned identifierNumber)
</ins><span class="cx"> {
</span><span class="cx"> NodeOrigin origin = node->origin;
</span><span class="cx"> Edge childEdge = node->child1();
</span><span class="cx"> Node* child = childEdge.node();
</span><del>-
- ASSERT(variant.oldStructure() == structure);
</del><span class="cx">
</span><span class="cx"> bool needsCellCheck = m_state.forNode(child).m_type & ~SpecCell;
</span><span class="cx">
</span><span class="lines">@@ -405,7 +403,8 @@
</span><span class="cx">
</span><span class="cx"> Transition* transition = 0;
</span><span class="cx"> if (variant.kind() == PutByIdVariant::Transition) {
</span><del>- transition = m_graph.m_transitions.add(structure, variant.newStructure());
</del><ins>+ transition = m_graph.m_transitions.add(
+ variant.oldStructureForTransition(), variant.newStructure());
</ins><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < variant.constantChecks().size(); ++i) {
</span><span class="cx"> addStructureTransitionCheck(
</span><span class="lines">@@ -419,12 +418,10 @@
</span><span class="cx">
</span><span class="cx"> if (isInlineOffset(variant.offset()))
</span><span class="cx"> propertyStorage = childEdge;
</span><del>- else if (
- variant.kind() == PutByIdVariant::Replace
- || structure->outOfLineCapacity() == variant.newStructure()->outOfLineCapacity()) {
</del><ins>+ else if (!variant.reallocatesStorage()) {
</ins><span class="cx"> propertyStorage = Edge(m_insertionSet.insertNode(
</span><span class="cx"> indexInBlock, SpecNone, GetButterfly, origin, childEdge));
</span><del>- } else if (!structure->outOfLineCapacity()) {
</del><ins>+ } else if (!variant.oldStructureForTransition()->outOfLineCapacity()) {
</ins><span class="cx"> ASSERT(variant.newStructure()->outOfLineCapacity());
</span><span class="cx"> ASSERT(!isInlineOffset(variant.offset()));
</span><span class="cx"> Node* allocatePropertyStorage = m_insertionSet.insertNode(
</span><span class="lines">@@ -433,8 +430,8 @@
</span><span class="cx"> m_insertionSet.insertNode(indexInBlock, SpecNone, StoreBarrier, origin, Edge(node->child1().node(), KnownCellUse));
</span><span class="cx"> propertyStorage = Edge(allocatePropertyStorage);
</span><span class="cx"> } else {
</span><del>- ASSERT(structure->outOfLineCapacity());
- ASSERT(variant.newStructure()->outOfLineCapacity() > structure->outOfLineCapacity());
</del><ins>+ ASSERT(variant.oldStructureForTransition()->outOfLineCapacity());
+ ASSERT(variant.newStructure()->outOfLineCapacity() > variant.oldStructureForTransition()->outOfLineCapacity());
</ins><span class="cx"> ASSERT(!isInlineOffset(variant.offset()));
</span><span class="cx">
</span><span class="cx"> Node* reallocatePropertyStorage = m_insertionSet.insertNode(
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/dfg/DFGGraph.cpp (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -917,7 +917,9 @@
</span><span class="cx"> case MultiPutByOffset:
</span><span class="cx"> for (unsigned i = node->multiPutByOffsetData().variants.size(); i--;) {
</span><span class="cx"> PutByIdVariant& variant = node->multiPutByOffsetData().variants[i];
</span><del>- visitor.appendUnbarrieredReadOnlyPointer(variant.oldStructure());
</del><ins>+ const StructureSet& set = variant.oldStructure();
+ for (unsigned j = set.size(); j--;)
+ visitor.appendUnbarrieredReadOnlyPointer(set[j]);
</ins><span class="cx"> if (variant.kind() == PutByIdVariant::Transition)
</span><span class="cx"> visitor.appendUnbarrieredReadOnlyPointer(variant.newStructure());
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoredfgDFGNodecpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/dfg/DFGNode.cpp (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/dfg/DFGNode.cpp 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/dfg/DFGNode.cpp 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> bool MultiPutByOffsetData::writesStructures() const
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = variants.size(); i--;) {
</span><del>- if (variants[i].kind() == PutByIdVariant::Transition)
</del><ins>+ if (variants[i].writesStructures())
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="lines">@@ -46,14 +46,8 @@
</span><span class="cx"> bool MultiPutByOffsetData::reallocatesStorage() const
</span><span class="cx"> {
</span><span class="cx"> for (unsigned i = variants.size(); i--;) {
</span><del>- if (variants[i].kind() != PutByIdVariant::Transition)
- continue;
-
- if (variants[i].oldStructure()->outOfLineCapacity() ==
- variants[i].newStructure()->outOfLineCapacity())
- continue;
-
- return true;
</del><ins>+ if (variants[i].reallocatesStorage())
+ return true;
</ins><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLAbbreviationsh"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLAbbreviations.h (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLAbbreviations.h 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLAbbreviations.h 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -149,8 +149,7 @@
</span><span class="cx"> static inline void addTargetDependentFunctionAttr(LValue function, const char* key, const char* value) { llvm->AddTargetDependentFunctionAttr(function, key, value); }
</span><span class="cx"> static inline void removeFunctionAttr(LValue function, LLVMAttribute pa) { llvm->RemoveFunctionAttr(function, pa); }
</span><span class="cx">
</span><del>-
-
</del><ins>+static inline LLVMLinkage getLinkage(LValue global) { return llvm->GetLinkage(global); }
</ins><span class="cx"> static inline void setLinkage(LValue global, LLVMLinkage linkage) { llvm->SetLinkage(global, linkage); }
</span><span class="cx"> static inline void setVisibility(LValue global, LLVMVisibility viz) { llvm->SetVisibility(global, viz); }
</span><span class="cx"> static inline LLVMBool isDeclaration(LValue global) { return llvm->IsDeclaration(global); }
</span><span class="lines">@@ -163,10 +162,6 @@
</span><span class="cx"> static inline LValue getFirstGlobal(LModule module) { return llvm->GetFirstGlobal(module); }
</span><span class="cx"> static inline LValue getNextGlobal(LValue global) { return llvm->GetNextGlobal(global); }
</span><span class="cx">
</span><del>-
-
-
-
</del><span class="cx"> static inline LValue addExternFunction(LModule module, const char* name, LType type)
</span><span class="cx"> {
</span><span class="cx"> LValue result = addFunction(module, name, type);
</span></span></pre></div>
<a id="branchesftloptSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (170089 => 170090)</h4>
<pre class="diff"><span>
<span class="info">--- branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-06-18 00:32:03 UTC (rev 170089)
+++ branches/ftlopt/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-06-18 01:16:17 UTC (rev 170090)
</span><span class="lines">@@ -3287,8 +3287,10 @@
</span><span class="cx"> Vector<SwitchCase, 2> cases;
</span><span class="cx"> for (unsigned i = data.variants.size(); i--;) {
</span><span class="cx"> PutByIdVariant variant = data.variants[i];
</span><del>- cases.append(
- SwitchCase(weakStructure(variant.oldStructure()), blocks[i], Weight(1)));
</del><ins>+ for (unsigned j = variant.oldStructure().size(); j--;) {
+ cases.append(
+ SwitchCase(weakStructure(variant.oldStructure()[j]), blocks[i], Weight(1)));
+ }
</ins><span class="cx"> }
</span><span class="cx"> m_out.switchInstruction(
</span><span class="cx"> m_out.load32(base, m_heaps.JSCell_structureID), cases, exit, Weight(0));
</span><span class="lines">@@ -3309,14 +3311,15 @@
</span><span class="cx"> } else {
</span><span class="cx"> m_graph.m_plan.transitions.addLazily(
</span><span class="cx"> codeBlock(), m_node->origin.semantic.codeOriginOwner(),
</span><del>- variant.oldStructure(), variant.newStructure());
</del><ins>+ variant.oldStructureForTransition(), variant.newStructure());
</ins><span class="cx">
</span><span class="cx"> storage = storageForTransition(
</span><del>- base, variant.offset(), variant.oldStructure(), variant.newStructure());
</del><ins>+ base, variant.offset(),
+ variant.oldStructureForTransition(), variant.newStructure());
</ins><span class="cx">
</span><del>- ASSERT(variant.oldStructure()->indexingType() == variant.newStructure()->indexingType());
- ASSERT(variant.oldStructure()->typeInfo().inlineTypeFlags() == variant.newStructure()->typeInfo().inlineTypeFlags());
- ASSERT(variant.oldStructure()->typeInfo().type() == variant.newStructure()->typeInfo().type());
</del><ins>+ ASSERT(variant.oldStructureForTransition()->indexingType() == variant.newStructure()->indexingType());
+ ASSERT(variant.oldStructureForTransition()->typeInfo().inlineTypeFlags() == variant.newStructure()->typeInfo().inlineTypeFlags());
+ ASSERT(variant.oldStructureForTransition()->typeInfo().type() == variant.newStructure()->typeInfo().type());
</ins><span class="cx"> m_out.store32(
</span><span class="cx"> weakStructure(variant.newStructure()), base, m_heaps.JSCell_structureID);
</span><span class="cx"> }
</span><span class="lines">@@ -4092,7 +4095,9 @@
</span><span class="cx">
</span><span class="cx"> for (CString* symbol = namedFunctions.begin(); symbol != namedFunctions.end(); ++symbol) {
</span><span class="cx"> LValue function = getNamedFunction(m_ftlState.module, symbol->data());
</span><del>- setVisibility(function, LLVMHiddenVisibility);
</del><ins>+ LLVMLinkage linkage = getLinkage(function);
+ if (linkage != LLVMInternalLinkage && linkage != LLVMPrivateLinkage)
+ setVisibility(function, LLVMHiddenVisibility);
</ins><span class="cx"> if (!isDeclaration(function)) {
</span><span class="cx"> setLinkage(function, LLVMPrivateLinkage);
</span><span class="cx">
</span><span class="lines">@@ -4103,7 +4108,9 @@
</span><span class="cx">
</span><span class="cx"> for (CString* symbol = namedGlobals.begin(); symbol != namedGlobals.end(); ++symbol) {
</span><span class="cx"> LValue global = getNamedGlobal(m_ftlState.module, symbol->data());
</span><del>- setVisibility(global, LLVMHiddenVisibility);
</del><ins>+ LLVMLinkage linkage = getLinkage(global);
+ if (linkage != LLVMInternalLinkage && linkage != LLVMPrivateLinkage)
+ setVisibility(global, LLVMHiddenVisibility);
</ins><span class="cx"> if (!isDeclaration(global))
</span><span class="cx"> setLinkage(global, LLVMPrivateLinkage);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>