<!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>[187118] 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/187118">187118</a></dd>
<dt>Author</dt> <dd>basile_clement@apple.com</dd>
<dt>Date</dt> <dd>2015-07-21 13:15:54 -0700 (Tue, 21 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Object allocation sinking phase is performing needless HashMap copies
https://bugs.webkit.org/show_bug.cgi?id=147159
Reviewed by Geoffrey Garen.
The points-to analyzer in the object allocation sinking phase is
currently performing copies of its allocation and pointers tables in
several places. While this is not a huge problem since those tables are
usually small and we are in the FTL path anyway, we still shouldn't be
doing such useless copying.
This patch also removes the DFGInsertOSRHintsForUpdate files that are
no longer needed with the new object sinking phase and should have been
removed in <a href="http://trac.webkit.org/projects/webkit/changeset/186795">r186795</a>.
* CMakeLists.txt:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* dfg/DFGInsertOSRHintsForUpdate.cpp: Removed.
(JSC::DFG::insertOSRHintsForUpdate): Deleted.
* dfg/DFGInsertOSRHintsForUpdate.h: Removed.
* dfg/DFGObjectAllocationSinkingPhase.cpp:</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="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoredfgDFGInsertOSRHintsForUpdatecpp">trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGInsertOSRHintsForUpdateh">trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.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 (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -178,7 +178,6 @@
</span><span class="cx"> dfg/DFGGraphSafepoint.cpp
</span><span class="cx"> dfg/DFGHeapLocation.cpp
</span><span class="cx"> dfg/DFGInPlaceAbstractState.cpp
</span><del>- dfg/DFGInsertOSRHintsForUpdate.cpp
</del><span class="cx"> dfg/DFGIntegerCheckCombiningPhase.cpp
</span><span class="cx"> dfg/DFGIntegerRangeOptimizationPhase.cpp
</span><span class="cx"> dfg/DFGInvalidationPointInjectionPhase.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2015-07-21 Basile Clement <basile_clement@apple.com>
+
+ Object allocation sinking phase is performing needless HashMap copies
+ https://bugs.webkit.org/show_bug.cgi?id=147159
+
+ Reviewed by Geoffrey Garen.
+
+ The points-to analyzer in the object allocation sinking phase is
+ currently performing copies of its allocation and pointers tables in
+ several places. While this is not a huge problem since those tables are
+ usually small and we are in the FTL path anyway, we still shouldn't be
+ doing such useless copying.
+
+ This patch also removes the DFGInsertOSRHintsForUpdate files that are
+ no longer needed with the new object sinking phase and should have been
+ removed in r186795.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * dfg/DFGInsertOSRHintsForUpdate.cpp: Removed.
+ (JSC::DFG::insertOSRHintsForUpdate): Deleted.
+ * dfg/DFGInsertOSRHintsForUpdate.h: Removed.
+ * dfg/DFGObjectAllocationSinkingPhase.cpp:
+
</ins><span class="cx"> 2015-07-21 Saam barati <saambarati1@gmail.com>
</span><span class="cx">
</span><span class="cx"> DestructuringPatternNode and DestructuringAssignmentNode should be ParserArenaFreeable
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -416,7 +416,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGGraphSafepoint.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGHeapLocation.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGInPlaceAbstractState.cpp" />
</span><del>- <ClCompile Include="..\dfg\DFGInsertOSRHintsForUpdate.cpp" />
</del><span class="cx"> <ClCompile Include="..\dfg\DFGIntegerCheckCombiningPhase.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGIntegerRangeOptimizationPhase.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGInvalidationPointInjectionPhase.cpp" />
</span><span class="lines">@@ -1110,7 +1109,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGGraphSafepoint.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGHeapLocation.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGInPlaceAbstractState.h" />
</span><del>- <ClInclude Include="..\dfg\DFGInsertOSRHintsForUpdate.h" />
</del><span class="cx"> <ClInclude Include="..\dfg\DFGInsertionSet.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGIntegerCheckCombiningPhase.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGIntegerRangeOptimizationPhase.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -1716,9 +1716,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGBlockWorklist.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dfg\DFGInsertOSRHintsForUpdate.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dfg\DFGNaiveDominators.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -4208,9 +4205,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGBlockWorklist.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGInsertOSRHintsForUpdate.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGNaiveDominators.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -214,8 +214,6 @@
</span><span class="cx"> 0F2B670B17B6B5AB00A7AE3F /* TypedArrayType.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2B66DD17B6B5AB00A7AE3F /* TypedArrayType.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F2B9CE219D0BA7D00B1D1B5 /* DFGAvailabilityMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F2B9CD619D0BA7D00B1D1B5 /* DFGAvailabilityMap.cpp */; };
</span><span class="cx"> 0F2B9CE319D0BA7D00B1D1B5 /* DFGAvailabilityMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2B9CD719D0BA7D00B1D1B5 /* DFGAvailabilityMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 0F2B9CE419D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F2B9CD819D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.cpp */; };
- 0F2B9CE519D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2B9CD919D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 0F2B9CE619D0BA7D00B1D1B5 /* DFGObjectAllocationSinkingPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F2B9CDA19D0BA7D00B1D1B5 /* DFGObjectAllocationSinkingPhase.cpp */; };
</span><span class="cx"> 0F2B9CE719D0BA7D00B1D1B5 /* DFGObjectAllocationSinkingPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F2B9CDB19D0BA7D00B1D1B5 /* DFGObjectAllocationSinkingPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F2B9CE819D0BA7D00B1D1B5 /* DFGObjectMaterializationData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F2B9CDC19D0BA7D00B1D1B5 /* DFGObjectMaterializationData.cpp */; };
</span><span class="lines">@@ -1960,8 +1958,6 @@
</span><span class="cx"> 0F2B66DD17B6B5AB00A7AE3F /* TypedArrayType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypedArrayType.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F2B9CD619D0BA7D00B1D1B5 /* DFGAvailabilityMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGAvailabilityMap.cpp; path = dfg/DFGAvailabilityMap.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F2B9CD719D0BA7D00B1D1B5 /* DFGAvailabilityMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGAvailabilityMap.h; path = dfg/DFGAvailabilityMap.h; sourceTree = "<group>"; };
</span><del>- 0F2B9CD819D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGInsertOSRHintsForUpdate.cpp; path = dfg/DFGInsertOSRHintsForUpdate.cpp; sourceTree = "<group>"; };
- 0F2B9CD919D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGInsertOSRHintsForUpdate.h; path = dfg/DFGInsertOSRHintsForUpdate.h; sourceTree = "<group>"; };
</del><span class="cx"> 0F2B9CDA19D0BA7D00B1D1B5 /* DFGObjectAllocationSinkingPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGObjectAllocationSinkingPhase.cpp; path = dfg/DFGObjectAllocationSinkingPhase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F2B9CDB19D0BA7D00B1D1B5 /* DFGObjectAllocationSinkingPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGObjectAllocationSinkingPhase.h; path = dfg/DFGObjectAllocationSinkingPhase.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F2B9CDC19D0BA7D00B1D1B5 /* DFGObjectMaterializationData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGObjectMaterializationData.cpp; path = dfg/DFGObjectMaterializationData.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4977,8 +4973,6 @@
</span><span class="cx"> A704D90017A0BAA8006BA554 /* DFGInPlaceAbstractState.cpp */,
</span><span class="cx"> A704D90117A0BAA8006BA554 /* DFGInPlaceAbstractState.h */,
</span><span class="cx"> 0F2BDC1F151E803800CD8910 /* DFGInsertionSet.h */,
</span><del>- 0F2B9CD819D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.cpp */,
- 0F2B9CD919D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.h */,
</del><span class="cx"> 0F300B7918AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.cpp */,
</span><span class="cx"> 0F300B7A18AB1B1400A6D72E /* DFGIntegerCheckCombiningPhase.h */,
</span><span class="cx"> 0F898F2F1B27689F0083A33C /* DFGIntegerRangeOptimizationPhase.cpp */,
</span><span class="lines">@@ -5773,7 +5767,6 @@
</span><span class="cx"> 2A68295B1875F80500B6C3E2 /* CopyWriteBarrier.h in Headers */,
</span><span class="cx"> 5DE6E5B30E1728EC00180407 /* create_hash_table in Headers */,
</span><span class="cx"> 0F426A4B1460CD6E00131F8F /* DataFormat.h in Headers */,
</span><del>- 0F2B9CE519D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.h in Headers */,
</del><span class="cx"> 0F2B66DF17B6B5AB00A7AE3F /* DataView.h in Headers */,
</span><span class="cx"> BCD2034A0E17135E002C7E82 /* DateConstructor.h in Headers */,
</span><span class="cx"> 41359CF30FDD89AD00206180 /* DateConversion.h in Headers */,
</span><span class="lines">@@ -7065,7 +7058,6 @@
</span><span class="cx"> 1429D8DD0ED2205B00B89619 /* CallFrame.cpp in Sources */,
</span><span class="cx"> 0F0B83B014BCF71600885B4F /* CallLinkInfo.cpp in Sources */,
</span><span class="cx"> 0F93329D14CA7DC30085F3C6 /* CallLinkStatus.cpp in Sources */,
</span><del>- 0F2B9CE419D0BA7D00B1D1B5 /* DFGInsertOSRHintsForUpdate.cpp in Sources */,
</del><span class="cx"> 969A07960ED1D3AE00F1F681 /* CodeBlock.cpp in Sources */,
</span><span class="cx"> 0F8F94401667633000D61971 /* CodeBlockHash.cpp in Sources */,
</span><span class="cx"> 0FC97F33182020D7002C9B26 /* CodeBlockJettisoningWatchpoint.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGInsertOSRHintsForUpdatecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.cpp (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.cpp 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.cpp 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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 "DFGInsertOSRHintsForUpdate.h"
-
-#if ENABLE(DFG_JIT)
-
-#include "JSCInlines.h"
-
-namespace JSC { namespace DFG {
-
-void insertOSRHintsForUpdate(
- InsertionSet& insertionSet, unsigned nodeIndex, NodeOrigin origin,
- AvailabilityMap& availability, Node* originalNode, Node* newNode)
-{
- for (unsigned i = availability.m_locals.size(); i--;) {
- int operand = availability.m_locals.operandForIndex(i);
-
- if (availability.m_locals[i].hasNode() && availability.m_locals[i].node() == originalNode) {
- insertionSet.insertNode(
- nodeIndex, SpecNone, MovHint, origin, OpInfo(operand),
- newNode->defaultEdge());
- }
- }
-
- for (auto pair : availability.m_heap) {
- if (pair.value.hasNode() && pair.value.node() == originalNode) {
- insertionSet.insert(
- nodeIndex, pair.key.createHint(insertionSet.graph(), origin, newNode));
- }
- }
-}
-
-} } // namespace JSC::DFG
-
-#endif // ENABLE(DFG_JIT)
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGInsertOSRHintsForUpdateh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.h (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.h 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/dfg/DFGInsertOSRHintsForUpdate.h 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 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 DFGInsertOSRHintsForUpdate_h
-#define DFGInsertOSRHintsForUpdate_h
-
-#if ENABLE(DFG_JIT)
-
-#include "DFGAvailabilityMap.h"
-#include "DFGInsertionSet.h"
-
-namespace JSC { namespace DFG {
-
-void insertOSRHintsForUpdate(
- InsertionSet&, unsigned nodeIndex, NodeOrigin, AvailabilityMap&,
- Node* originalNode, Node* newNode);
-
-} } // namespace JSC::DFG
-
-#endif // ENABLE(DFG_JIT)
-
-#endif // DFGInsertOSRHintsForUpdate_h
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGObjectAllocationSinkingPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp (187117 => 187118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-07-21 19:58:02 UTC (rev 187117)
+++ trunk/Source/JavaScriptCore/dfg/DFGObjectAllocationSinkingPhase.cpp 2015-07-21 20:15:54 UTC (rev 187118)
</span><span class="lines">@@ -536,12 +536,12 @@
</span><span class="cx"> return !(*this == other);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const HashMap<Node*, Allocation> allocations() const
</del><ins>+ const HashMap<Node*, Allocation>& allocations() const
</ins><span class="cx"> {
</span><span class="cx"> return m_allocations;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const HashMap<Node*, Node*> pointers() const
</del><ins>+ const HashMap<Node*, Node*>& pointers() const
</ins><span class="cx"> {
</span><span class="cx"> return m_pointers;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>