<!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>[185344] 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/185344">185344</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-08 17:45:59 -0700 (Mon, 08 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>It should be possible to hoist all constants in DFG SSA
https://bugs.webkit.org/show_bug.cgi?id=145769
Reviewed by Geoffrey Garen.
It's sometimes somewhat more efficient, and convenient, to have all constants at the
top of the root block. We don't require this as an IR invariant because too many phases
want to be able to insert constants in weird places. But, this phase will be great for
preparing for https://bugs.webkit.org/show_bug.cgi?id=145768.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.xcodeproj/project.pbxproj:
* dfg/DFGConstantHoistingPhase.cpp: Added.
(JSC::DFG::performConstantHoisting):
* dfg/DFGConstantHoistingPhase.h: Added.
* dfg/DFGPlan.cpp:
(JSC::DFG::Plan::compileInThreadImpl):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPlancpp">trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoredfgDFGConstantHoistingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGConstantHoistingPhaseh">trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (185343 => 185344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-06-09 00:29:13 UTC (rev 185343)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-06-09 00:45:59 UTC (rev 185344)
</span><span class="lines">@@ -154,6 +154,7 @@
</span><span class="cx"> dfg/DFGCompilationKey.cpp
</span><span class="cx"> dfg/DFGCompilationMode.cpp
</span><span class="cx"> dfg/DFGConstantFoldingPhase.cpp
</span><ins>+ dfg/DFGConstantHoistingPhase.cpp
</ins><span class="cx"> dfg/DFGCriticalEdgeBreakingPhase.cpp
</span><span class="cx"> dfg/DFGDCEPhase.cpp
</span><span class="cx"> dfg/DFGDesiredIdentifiers.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (185343 => 185344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-06-09 00:29:13 UTC (rev 185343)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-06-09 00:45:59 UTC (rev 185344)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-06-08 Filip Pizlo <fpizlo@apple.com>
+
+ It should be possible to hoist all constants in DFG SSA
+ https://bugs.webkit.org/show_bug.cgi?id=145769
+
+ Reviewed by Geoffrey Garen.
+
+ It's sometimes somewhat more efficient, and convenient, to have all constants at the
+ top of the root block. We don't require this as an IR invariant because too many phases
+ want to be able to insert constants in weird places. But, this phase will be great for
+ preparing for https://bugs.webkit.org/show_bug.cgi?id=145768.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * dfg/DFGConstantHoistingPhase.cpp: Added.
+ (JSC::DFG::performConstantHoisting):
+ * dfg/DFGConstantHoistingPhase.h: Added.
+ * dfg/DFGPlan.cpp:
+ (JSC::DFG::Plan::compileInThreadImpl):
+
</ins><span class="cx"> 2015-06-07 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> The tiny set magic in StructureSet should be available in WTF
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (185343 => 185344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-06-09 00:29:13 UTC (rev 185343)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-06-09 00:45:59 UTC (rev 185344)
</span><span class="lines">@@ -389,6 +389,7 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGCompilationKey.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGCompilationMode.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGConstantFoldingPhase.cpp" />
</span><ins>+ <ClCompile Include="..\dfg\DFGConstantHoistingPhase.cpp" />
</ins><span class="cx"> <ClCompile Include="..\dfg\DFGCPSRethreadingPhase.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGCriticalEdgeBreakingPhase.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGCSEPhase.cpp" />
</span><span class="lines">@@ -1074,6 +1075,7 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGCompilationKey.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGCompilationMode.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGConstantFoldingPhase.h" />
</span><ins>+ <ClInclude Include="..\dfg\DFGConstantHoistingPhase.h" />
</ins><span class="cx"> <ClInclude Include="..\dfg\DFGCPSRethreadingPhase.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGCriticalEdgeBreakingPhase.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGCSEPhase.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (185343 => 185344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-06-09 00:29:13 UTC (rev 185343)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-06-09 00:45:59 UTC (rev 185344)
</span><span class="lines">@@ -674,6 +674,8 @@
</span><span class="cx"> 0FEA0A33170D40BF00BB722C /* DFGJITCode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEA0A2F170D40BF00BB722C /* DFGJITCode.cpp */; };
</span><span class="cx"> 0FEA0A34170D40BF00BB722C /* DFGJITCode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEA0A30170D40BF00BB722C /* DFGJITCode.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FEB3ECF16237F6C00AB67AD /* MacroAssembler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEB3ECE16237F6700AB67AD /* MacroAssembler.cpp */; };
</span><ins>+ 0FED67B91B26256D0066CE15 /* DFGConstantHoistingPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FED67B71B26256D0066CE15 /* DFGConstantHoistingPhase.cpp */; };
+ 0FED67BA1B26256D0066CE15 /* DFGConstantHoistingPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FED67B81B26256D0066CE15 /* DFGConstantHoistingPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0FEE98411A8865B700754E93 /* SetupVarargsFrame.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FEE98401A8865B600754E93 /* SetupVarargsFrame.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FEE98431A89227500754E93 /* SetupVarargsFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEE98421A89227500754E93 /* SetupVarargsFrame.cpp */; };
</span><span class="cx"> 0FEFC9AA1681A3B300567F53 /* DFGOSRExitJumpPlaceholder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FEFC9A71681A3B000567F53 /* DFGOSRExitJumpPlaceholder.cpp */; };
</span><span class="lines">@@ -2431,6 +2433,8 @@
</span><span class="cx"> 0FEA0A2F170D40BF00BB722C /* DFGJITCode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGJITCode.cpp; path = dfg/DFGJITCode.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FEA0A30170D40BF00BB722C /* DFGJITCode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGJITCode.h; path = dfg/DFGJITCode.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FEB3ECE16237F6700AB67AD /* MacroAssembler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MacroAssembler.cpp; sourceTree = "<group>"; };
</span><ins>+ 0FED67B71B26256D0066CE15 /* DFGConstantHoistingPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGConstantHoistingPhase.cpp; path = dfg/DFGConstantHoistingPhase.cpp; sourceTree = "<group>"; };
+ 0FED67B81B26256D0066CE15 /* DFGConstantHoistingPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGConstantHoistingPhase.h; path = dfg/DFGConstantHoistingPhase.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FEE98401A8865B600754E93 /* SetupVarargsFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SetupVarargsFrame.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FEE98421A89227500754E93 /* SetupVarargsFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SetupVarargsFrame.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FEFC9A71681A3B000567F53 /* DFGOSRExitJumpPlaceholder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGOSRExitJumpPlaceholder.cpp; path = dfg/DFGOSRExitJumpPlaceholder.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4922,6 +4926,8 @@
</span><span class="cx"> 0F38B01617CFE75500B144D3 /* DFGCompilationMode.h */,
</span><span class="cx"> 0F3B3A17153E68EF003ED0FF /* DFGConstantFoldingPhase.cpp */,
</span><span class="cx"> 0F3B3A18153E68EF003ED0FF /* DFGConstantFoldingPhase.h */,
</span><ins>+ 0FED67B71B26256D0066CE15 /* DFGConstantHoistingPhase.cpp */,
+ 0FED67B81B26256D0066CE15 /* DFGConstantHoistingPhase.h */,
</ins><span class="cx"> 0FBE0F6B16C1DB010082C5E8 /* DFGCPSRethreadingPhase.cpp */,
</span><span class="cx"> 0FBE0F6C16C1DB010082C5E8 /* DFGCPSRethreadingPhase.h */,
</span><span class="cx"> A7D89CE617A0B8CC00773AD8 /* DFGCriticalEdgeBreakingPhase.cpp */,
</span><span class="lines">@@ -5982,6 +5988,7 @@
</span><span class="cx"> 0FEA0A241709606900BB722C /* FTLIntrinsicRepository.h in Headers */,
</span><span class="cx"> 0FEA0A0E170513DB00BB722C /* FTLJITCode.h in Headers */,
</span><span class="cx"> A78A9781179738D5009DF744 /* FTLJITFinalizer.h in Headers */,
</span><ins>+ 0FED67BA1B26256D0066CE15 /* DFGConstantHoistingPhase.h in Headers */,
</ins><span class="cx"> 0F6B1CB6185FC9E900845D97 /* FTLJSCall.h in Headers */,
</span><span class="cx"> 0F8F2B96172E04A3007DBDA5 /* FTLLink.h in Headers */,
</span><span class="cx"> 0FCEFAE0180738C000472CE4 /* FTLLocation.h in Headers */,
</span><span class="lines">@@ -7500,6 +7507,7 @@
</span><span class="cx"> 14469DE6107EC7E700650446 /* ObjectPrototype.cpp in Sources */,
</span><span class="cx"> E124A8F80E555775003091F1 /* OpaqueJSString.cpp in Sources */,
</span><span class="cx"> 969A079A0ED1D3AE00F1F681 /* Opcode.cpp in Sources */,
</span><ins>+ 0FED67B91B26256D0066CE15 /* DFGConstantHoistingPhase.cpp in Sources */,
</ins><span class="cx"> 14280850107EC0D70013E7B2 /* Operations.cpp in Sources */,
</span><span class="cx"> 0FE228EE1436AB2C00196C48 /* Options.cpp in Sources */,
</span><span class="cx"> 148F21BC107EC54D0042EC2C /* Parser.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGConstantHoistingPhasecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.cpp (0 => 185344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.cpp (rev 0)
+++ trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.cpp 2015-06-09 00:45:59 UTC (rev 185344)
</span><span class="lines">@@ -0,0 +1,149 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "DFGConstantHoistingPhase.h"
+
+#if ENABLE(DFG_JIT)
+
+#include "DFGGraph.h"
+#include "DFGInsertionSet.h"
+#include "DFGPhase.h"
+#include "DFGPredictionPropagationPhase.h"
+#include "DFGVariableAccessDataDump.h"
+#include "JSCInlines.h"
+
+namespace JSC { namespace DFG {
+
+namespace {
+
+class ConstantHoistingPhase : public Phase {
+public:
+ ConstantHoistingPhase(Graph& graph)
+ : Phase(graph, "constant hoisting")
+ {
+ }
+
+ bool run()
+ {
+ DFG_ASSERT(m_graph, nullptr, m_graph.m_form == SSA);
+
+ m_graph.clearReplacements();
+
+ HashMap<FrozenValue*, Node*> jsValues;
+ HashMap<FrozenValue*, Node*> doubleValues;
+ HashMap<FrozenValue*, Node*> int52Values;
+
+ auto valuesFor = [&] (NodeType op) -> HashMap<FrozenValue*, Node*>& {
+ // Use a roundabout approach because clang thinks that this closure returning a
+ // reference to a stack-allocated value in outer scope is a bug. It's not.
+ HashMap<FrozenValue*, Node*>* result;
+
+ switch (op) {
+ case JSConstant:
+ result = &jsValues;
+ break;
+ case DoubleConstant:
+ result = &doubleValues;
+ break;
+ case Int52Constant:
+ result = &int52Values;
+ break;
+ default:
+ DFG_CRASH(m_graph, nullptr, "Invalid node type in valuesFor()");
+ result = nullptr;
+ break;
+ }
+
+ return *result;
+ };
+
+ Vector<Node*> toFree;
+
+ for (BasicBlock* block : m_graph.blocksInNaturalOrder()) {
+ unsigned sourceIndex = 0;
+ unsigned targetIndex = 0;
+ while (sourceIndex < block->size()) {
+ Node* node = block->at(sourceIndex++);
+ switch (node->op()) {
+ case JSConstant:
+ case DoubleConstant:
+ case Int52Constant: {
+ HashMap<FrozenValue*, Node*>& values = valuesFor(node->op());
+ auto result = values.add(node->constant(), node);
+ if (result.isNewEntry)
+ node->origin = NodeOrigin();
+ else {
+ node->setReplacement(result.iterator->value);
+ toFree.append(node);
+ }
+ break;
+ }
+ default:
+ block->at(targetIndex++) = node;
+ break;
+ }
+ }
+ block->resize(targetIndex);
+ }
+
+ // Insert the constants into the root block.
+ InsertionSet insertionSet(m_graph);
+ auto insertConstants = [&] (const HashMap<FrozenValue*, Node*>& values) {
+ for (auto& entry : values)
+ insertionSet.insert(0, entry.value);
+ };
+ insertConstants(jsValues);
+ insertConstants(doubleValues);
+ insertConstants(int52Values);
+ insertionSet.execute(m_graph.block(0));
+
+ // Perform all of the substitutions. We want all instances of the removed constants to
+ // point at their replacements.
+ for (BasicBlock* block : m_graph.blocksInNaturalOrder()) {
+ for (Node* node : *block)
+ m_graph.performSubstitution(node);
+ }
+
+ // And finally free the constants that we removed.
+ for (Node* node : toFree)
+ m_graph.m_allocator.free(node);
+
+ return true;
+ }
+};
+
+} // anonymous namespace
+
+bool performConstantHoisting(Graph& graph)
+{
+ SamplingRegion samplingRegion("DFG Constant Hoisting Phase");
+ return runPhase<ConstantHoistingPhase>(graph);
+}
+
+} } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)
+
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGConstantHoistingPhaseh"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.h (0 => 185344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.h (rev 0)
+++ trunk/Source/JavaScriptCore/dfg/DFGConstantHoistingPhase.h 2015-06-09 00:45:59 UTC (rev 185344)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DFGConstantHoistingPhase_h
+#define DFGConstantHoistingPhase_h
+
+#if ENABLE(DFG_JIT)
+
+namespace JSC { namespace DFG {
+
+class Graph;
+
+// Hoists all constants to the top of the root block.
+
+bool performConstantHoisting(Graph&);
+
+} } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)
+
+#endif // DFGConstantHoistingPhase_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp (185343 => 185344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-06-09 00:29:13 UTC (rev 185343)
+++ trunk/Source/JavaScriptCore/dfg/DFGPlan.cpp 2015-06-09 00:45:59 UTC (rev 185344)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "DFGCSEPhase.h"
</span><span class="cx"> #include "DFGCleanUpPhase.h"
</span><span class="cx"> #include "DFGConstantFoldingPhase.h"
</span><ins>+#include "DFGConstantHoistingPhase.h"
</ins><span class="cx"> #include "DFGCriticalEdgeBreakingPhase.h"
</span><span class="cx"> #include "DFGDCEPhase.h"
</span><span class="cx"> #include "DFGFailedFinalizer.h"
</span><span class="lines">@@ -353,6 +354,7 @@
</span><span class="cx"> performArgumentsElimination(dfg);
</span><span class="cx"> performPutStackSinking(dfg);
</span><span class="cx">
</span><ins>+ performConstantHoisting(dfg);
</ins><span class="cx"> performGlobalCSE(dfg);
</span><span class="cx"> performLivenessAnalysis(dfg);
</span><span class="cx"> performCFA(dfg);
</span></span></pre>
</div>
</div>
</body>
</html>