<!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>[161393] branches/jsCStack</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/161393">161393</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-06 19:42:30 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/JavaScriptCore: Merge trunk <a href="http://trac.webkit.org/projects/webkit/changeset/160292">r160292</a>.
Tools: Merge trunk <a href="http://trac.webkit.org/projects/webkit/changeset/160292">r160292</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreCMakeListstxt">branches/jsCStack/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreGNUmakefilelistam">branches/jsCStack/Source/JavaScriptCore/GNUmakefile.list.am</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGClobberizeh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGFixupPhasecpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGGraphcpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGGraphh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGNodeh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGNodeTypeh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGNodeType.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGPlancpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGPlan.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGSafeToExecuteh">branches/jsCStack/Source/JavaScriptCore/dfg/DFGSafeToExecute.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJITcpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoredfgDFGWatchpointCollectionPhasecpp">branches/jsCStack/Source/JavaScriptCore/dfg/DFGWatchpointCollectionPhase.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLCapabilitiescpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp">branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCorejsccpp">branches/jsCStack/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeArrayBufferViewh">branches/jsCStack/Source/JavaScriptCore/runtime/ArrayBufferView.h</a></li>
<li><a href="#branchesjsCStackToolsChangeLog">branches/jsCStack/Tools/ChangeLog</a></li>
<li><a href="#branchesjsCStackToolsScriptsrunjavascriptcoretests">branches/jsCStack/Tools/Scripts/run-javascriptcore-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/CMakeLists.txt (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/CMakeLists.txt 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/CMakeLists.txt 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -166,6 +166,7 @@
</span><span class="cx"> dfg/DFGSpeculativeJIT32_64.cpp
</span><span class="cx"> dfg/DFGSpeculativeJIT64.cpp
</span><span class="cx"> dfg/DFGStackLayoutPhase.cpp
</span><ins>+ dfg/DFGStrengthReductionPhase.cpp
</ins><span class="cx"> dfg/DFGThunks.cpp
</span><span class="cx"> dfg/DFGTierUpCheckInjectionPhase.cpp
</span><span class="cx"> dfg/DFGTypeCheckHoistingPhase.cpp
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> 2014-01-06 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ Merge trunk r160292.
+
+2014-01-06 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> Merge trunk r160238, r160242, r160246, r160252, r160257.
</span><span class="cx">
</span><span class="cx"> 2014-01-06 Michael Saboff <msaboff@apple.com>
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreGNUmakefilelistam"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/GNUmakefile.list.am (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/GNUmakefile.list.am 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/GNUmakefile.list.am 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -380,6 +380,8 @@
</span><span class="cx"> Source/JavaScriptCore/dfg/DFGSSAConversionPhase.h \
</span><span class="cx"> Source/JavaScriptCore/dfg/DFGStackLayoutPhase.cpp \
</span><span class="cx"> Source/JavaScriptCore/dfg/DFGStackLayoutPhase.h \
</span><ins>+ Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.cpp \
+ Source/JavaScriptCore/dfg/DFGStrengthReductionPhase.h \
</ins><span class="cx"> Source/JavaScriptCore/dfg/DFGStructureAbstractValue.h \
</span><span class="cx"> Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.cpp \
</span><span class="cx"> Source/JavaScriptCore/dfg/DFGTierUpCheckInjectionPhase.h \
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -412,6 +412,7 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGSpeculativeJIT64.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGSSAConversionPhase.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGStackLayoutPhase.cpp" />
</span><ins>+ <ClCompile Include="..\dfg\DFGStrengthReductionPhase.cpp" />
</ins><span class="cx"> <ClCompile Include="..\dfg\DFGThunks.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGTierUpCheckInjectionPhase.cpp" />
</span><span class="cx"> <ClCompile Include="..\dfg\DFGToFTLDeferredCompilationCallback.cpp" />
</span><span class="lines">@@ -919,6 +920,7 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGSpeculativeJIT.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGSSAConversionPhase.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGStackLayoutPhase.h" />
</span><ins>+ <ClInclude Include="..\dfg\DFGStrengthReductionPhase.h" />
</ins><span class="cx"> <ClInclude Include="..\dfg\DFGStructureAbstractValue.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGThunks.h" />
</span><span class="cx"> <ClInclude Include="..\dfg\DFGTierUpCheckInjectionPhase.h" />
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -391,6 +391,8 @@
</span><span class="cx"> 0FC09792146A6F7300CF2442 /* DFGOSRExitCompiler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC0978F146A6F6300CF2442 /* DFGOSRExitCompiler.cpp */; };
</span><span class="cx"> 0FC097A1146B28CA00CF2442 /* DFGThunks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC0979F146B28C700CF2442 /* DFGThunks.cpp */; };
</span><span class="cx"> 0FC097A2146B28CC00CF2442 /* DFGThunks.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC097A0146B28C700CF2442 /* DFGThunks.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ 0FC20CB51852E2C600C9E954 /* DFGStrengthReductionPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC20CB31852E2C600C9E954 /* DFGStrengthReductionPhase.cpp */; };
+ 0FC20CB61852E2C600C9E954 /* DFGStrengthReductionPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC20CB41852E2C600C9E954 /* DFGStrengthReductionPhase.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 0FC314121814559100033232 /* RegisterSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FC314101814559100033232 /* RegisterSet.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FC314131814559100033232 /* TempRegisterSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC314111814559100033232 /* TempRegisterSet.cpp */; };
</span><span class="cx"> 0FC3141518146D7000033232 /* RegisterSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC3141418146D7000033232 /* RegisterSet.cpp */; };
</span><span class="lines">@@ -1725,6 +1727,8 @@
</span><span class="cx"> 0FC0978F146A6F6300CF2442 /* DFGOSRExitCompiler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGOSRExitCompiler.cpp; path = dfg/DFGOSRExitCompiler.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FC0979F146B28C700CF2442 /* DFGThunks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGThunks.cpp; path = dfg/DFGThunks.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FC097A0146B28C700CF2442 /* DFGThunks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGThunks.h; path = dfg/DFGThunks.h; sourceTree = "<group>"; };
</span><ins>+ 0FC20CB31852E2C600C9E954 /* DFGStrengthReductionPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGStrengthReductionPhase.cpp; path = dfg/DFGStrengthReductionPhase.cpp; sourceTree = "<group>"; };
+ 0FC20CB41852E2C600C9E954 /* DFGStrengthReductionPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGStrengthReductionPhase.h; path = dfg/DFGStrengthReductionPhase.h; sourceTree = "<group>"; };
</ins><span class="cx"> 0FC314101814559100033232 /* RegisterSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegisterSet.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FC314111814559100033232 /* TempRegisterSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TempRegisterSet.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FC3141418146D7000033232 /* RegisterSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegisterSet.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3999,6 +4003,8 @@
</span><span class="cx"> A7D89CF117A0B8CC00773AD8 /* DFGSSAConversionPhase.h */,
</span><span class="cx"> 0F9FB4F217FCB91700CB67F8 /* DFGStackLayoutPhase.cpp */,
</span><span class="cx"> 0F9FB4F317FCB91700CB67F8 /* DFGStackLayoutPhase.h */,
</span><ins>+ 0FC20CB31852E2C600C9E954 /* DFGStrengthReductionPhase.cpp */,
+ 0FC20CB41852E2C600C9E954 /* DFGStrengthReductionPhase.h */,
</ins><span class="cx"> 0F63947615DCE347006A597C /* DFGStructureAbstractValue.h */,
</span><span class="cx"> 0FC0979F146B28C700CF2442 /* DFGThunks.cpp */,
</span><span class="cx"> 0FC097A0146B28C700CF2442 /* DFGThunks.h */,
</span><span class="lines">@@ -4625,6 +4631,7 @@
</span><span class="cx"> 0FAF7EFE165BA91F000C8455 /* JITDisassembler.h in Headers */,
</span><span class="cx"> A5BA15F0182345AF00A82E69 /* RemoteInspectorDebuggable.h in Headers */,
</span><span class="cx"> 0F46808214BA572D00BFE272 /* JITExceptions.h in Headers */,
</span><ins>+ 0FC20CB61852E2C600C9E954 /* DFGStrengthReductionPhase.h in Headers */,
</ins><span class="cx"> 0FB14E1F18124ACE009B6B4D /* JITInlineCacheGenerator.h in Headers */,
</span><span class="cx"> 86CC85A10EE79A4700288682 /* JITInlines.h in Headers */,
</span><span class="cx"> 0F6B1CBE1861246A00845D97 /* RegisterPreservationWrapperGenerator.h in Headers */,
</span><span class="lines">@@ -5525,6 +5532,7 @@
</span><span class="cx"> 0F235BEB17178E7300690C7F /* DFGOSRExitBase.cpp in Sources */,
</span><span class="cx"> 0FC09792146A6F7300CF2442 /* DFGOSRExitCompiler.cpp in Sources */,
</span><span class="cx"> 0FC09776146943B000CF2442 /* DFGOSRExitCompiler32_64.cpp in Sources */,
</span><ins>+ 0FC20CB51852E2C600C9E954 /* DFGStrengthReductionPhase.cpp in Sources */,
</ins><span class="cx"> 0FC0977214693AF900CF2442 /* DFGOSRExitCompiler64.cpp in Sources */,
</span><span class="cx"> 0F7025A91714B0FA00382C0E /* DFGOSRExitCompilerCommon.cpp in Sources */,
</span><span class="cx"> 0FEFC9AA1681A3B300567F53 /* DFGOSRExitJumpPlaceholder.cpp in Sources */,
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -1148,6 +1148,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case FunctionReentryWatchpoint:
</span><ins>+ case TypedArrayWatchpoint:
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case CreateArguments:
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGClobberize.h (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGClobberize.h 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -144,7 +144,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> case VariableWatchpoint:
</span><ins>+ case TypedArrayWatchpoint:
</ins><span class="cx"> read(Watchpoint_fire);
</span><ins>+ write(SideState);
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> case NotifyWrite:
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGFixupPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGFixupPhase.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -95,17 +95,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case BitOr: {
</span><del>- // Optimize X|0 -> X.
- if (node->child2()->isConstant()) {
- JSValue C2 = m_graph.valueOfJSConstant(node->child2().node());
- if (C2.isInt32() && !C2.asInt32()) {
- m_insertionSet.insertNode(m_indexInBlock, SpecNone, Phantom, node->codeOrigin,
- Edge(node->child2().node(), KnownInt32Use));
- node->children.removeEdge(1);
- node->convertToIdentity();
- break;
- }
- }
</del><span class="cx"> fixIntEdge(node->child1());
</span><span class="cx"> fixIntEdge(node->child2());
</span><span class="cx"> break;
</span><span class="lines">@@ -951,6 +940,7 @@
</span><span class="cx"> case ExtractOSREntryLocal:
</span><span class="cx"> case LoopHint:
</span><span class="cx"> case FunctionReentryWatchpoint:
</span><ins>+ case TypedArrayWatchpoint:
</ins><span class="cx"> break;
</span><span class="cx"> #else
</span><span class="cx"> default:
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGGraphcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -749,10 +749,8 @@
</span><span class="cx"> return activation->registers();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-JSArrayBufferView* Graph::tryGetFoldableView(Node* node, ArrayMode arrayMode)
</del><ins>+JSArrayBufferView* Graph::tryGetFoldableView(Node* node)
</ins><span class="cx"> {
</span><del>- if (arrayMode.typedArrayType() == NotTypedArray)
- return 0;
</del><span class="cx"> if (!node->hasConstant())
</span><span class="cx"> return 0;
</span><span class="cx"> JSArrayBufferView* view = jsDynamicCast<JSArrayBufferView*>(valueOfJSConstant(node));
</span><span class="lines">@@ -763,6 +761,18 @@
</span><span class="cx"> return view;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSArrayBufferView* Graph::tryGetFoldableView(Node* node, ArrayMode arrayMode)
+{
+ if (arrayMode.typedArrayType() == NotTypedArray)
+ return 0;
+ return tryGetFoldableView(node);
+}
+
+JSArrayBufferView* Graph::tryGetFoldableViewForChild1(Node* node)
+{
+ return tryGetFoldableView(child(node, 0).node(), node->arrayMode());
+}
+
</ins><span class="cx"> } } // namespace JSC::DFG
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGGraphh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGGraph.h 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -807,7 +807,9 @@
</span><span class="cx"> JSActivation* tryGetActivation(Node*);
</span><span class="cx"> WriteBarrierBase<Unknown>* tryGetRegisters(Node*);
</span><span class="cx">
</span><ins>+ JSArrayBufferView* tryGetFoldableView(Node*);
</ins><span class="cx"> JSArrayBufferView* tryGetFoldableView(Node*, ArrayMode);
</span><ins>+ JSArrayBufferView* tryGetFoldableViewForChild1(Node*);
</ins><span class="cx">
</span><span class="cx"> VM& m_vm;
</span><span class="cx"> Plan& m_plan;
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGNodeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGNode.h 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -972,6 +972,16 @@
</span><span class="cx"> {
</span><span class="cx"> return reinterpret_cast<VariableWatchpointSet*>(m_opInfo);
</span><span class="cx"> }
</span><ins>+
+ bool hasTypedArray()
+ {
+ return op() == TypedArrayWatchpoint;
+ }
+
+ JSArrayBufferView* typedArray()
+ {
+ return reinterpret_cast<JSArrayBufferView*>(m_opInfo);
+ }
</ins><span class="cx">
</span><span class="cx"> bool hasStructureTransitionData()
</span><span class="cx"> {
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGNodeTypeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGNodeType.h (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGNodeType.h 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGNodeType.h 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -171,6 +171,7 @@
</span><span class="cx"> macro(Arrayify, NodeMustGenerate) \
</span><span class="cx"> macro(ArrayifyToStructure, NodeMustGenerate) \
</span><span class="cx"> macro(GetIndexedPropertyStorage, NodeResultStorage) \
</span><ins>+ macro(TypedArrayWatchpoint, NodeMustGenerate) \
</ins><span class="cx"> macro(GetByOffset, NodeResultJS) \
</span><span class="cx"> macro(PutByOffset, NodeMustGenerate) \
</span><span class="cx"> macro(GetArrayLength, NodeResultInt32) \
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGPlancpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGPlan.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGPlan.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGPlan.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> #include "DFGResurrectionForValidationPhase.h"
</span><span class="cx"> #include "DFGSSAConversionPhase.h"
</span><span class="cx"> #include "DFGStackLayoutPhase.h"
</span><ins>+#include "DFGStrengthReductionPhase.h"
</ins><span class="cx"> #include "DFGTierUpCheckInjectionPhase.h"
</span><span class="cx"> #include "DFGTypeCheckHoistingPhase.h"
</span><span class="cx"> #include "DFGUnificationPhase.h"
</span><span class="lines">@@ -203,6 +204,7 @@
</span><span class="cx"> if (validationEnabled())
</span><span class="cx"> validate(dfg);
</span><span class="cx">
</span><ins>+ changed |= performStrengthReduction(dfg);
</ins><span class="cx"> performCFA(dfg);
</span><span class="cx"> changed |= performConstantFolding(dfg);
</span><span class="cx"> changed |= performArgumentsSimplification(dfg);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -577,6 +577,7 @@
</span><span class="cx"> case LoopHint:
</span><span class="cx"> case NotifyWrite:
</span><span class="cx"> case FunctionReentryWatchpoint:
</span><ins>+ case TypedArrayWatchpoint:
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> // This gets ignored because it already has a prediction.
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGSafeToExecuteh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGSafeToExecute.h (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGSafeToExecute.h 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -244,6 +244,7 @@
</span><span class="cx"> case InvalidationPoint:
</span><span class="cx"> case NotifyWrite:
</span><span class="cx"> case FunctionReentryWatchpoint:
</span><ins>+ case TypedArrayWatchpoint:
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> case GetByVal:
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -2331,7 +2331,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (node->op() == PutByValAlias)
</span><span class="cx"> return JITCompiler::Jump();
</span><del>- if (JSArrayBufferView* view = m_jit.graph().tryGetFoldableView(m_jit.graph().child(node, 0).node(), node->arrayMode())) {
</del><ins>+ if (JSArrayBufferView* view = m_jit.graph().tryGetFoldableViewForChild1(node)) {
</ins><span class="cx"> uint32_t length = view->length();
</span><span class="cx"> Node* indexNode = m_jit.graph().child(node, 1).node();
</span><span class="cx"> if (m_jit.graph().isInt32Constant(indexNode) && static_cast<uint32_t>(m_jit.graph().valueOfInt32Constant(indexNode)) < length)
</span><span class="lines">@@ -4046,8 +4046,7 @@
</span><span class="cx">
</span><span class="cx"> bool SpeculativeJIT::compileConstantIndexedPropertyStorage(Node* node)
</span><span class="cx"> {
</span><del>- JSArrayBufferView* view = m_jit.graph().tryGetFoldableView(
- node->child1().node(), node->arrayMode());
</del><ins>+ JSArrayBufferView* view = m_jit.graph().tryGetFoldableViewForChild1(node);
</ins><span class="cx"> if (!view)
</span><span class="cx"> return false;
</span><span class="cx"> if (view->mode() == FastTypedArray)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -3591,7 +3591,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case AllocationProfileWatchpoint: {
</del><ins>+ case AllocationProfileWatchpoint:
+ case TypedArrayWatchpoint: {
</ins><span class="cx"> noResult(node);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -3886,7 +3886,8 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- case AllocationProfileWatchpoint: {
</del><ins>+ case AllocationProfileWatchpoint:
+ case TypedArrayWatchpoint: {
</ins><span class="cx"> noResult(node);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoredfgDFGWatchpointCollectionPhasecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/dfg/DFGWatchpointCollectionPhase.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/dfg/DFGWatchpointCollectionPhase.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/dfg/DFGWatchpointCollectionPhase.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -95,20 +95,15 @@
</span><span class="cx"> if (m_node->arrayMode().type() == Array::String)
</span><span class="cx"> handleStringGetByVal();
</span><span class="cx">
</span><del>- if (JSArrayBufferView* view = m_graph.tryGetFoldableView(m_node->child1().node(), m_node->arrayMode()))
</del><ins>+ if (JSArrayBufferView* view = m_graph.tryGetFoldableViewForChild1(m_node))
</ins><span class="cx"> addLazily(view);
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case PutByVal:
</span><del>- if (JSArrayBufferView* view = m_graph.tryGetFoldableView(m_graph.varArgChild(m_node, 0).node(), m_node->arrayMode()))
</del><ins>+ if (JSArrayBufferView* view = m_graph.tryGetFoldableViewForChild1(m_node))
</ins><span class="cx"> addLazily(view);
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- case GetArrayLength:
- if (JSArrayBufferView* view = m_graph.tryGetFoldableView(m_node->child1().node(), m_node->arrayMode()))
- addLazily(view);
- break;
-
</del><span class="cx"> case StringCharAt:
</span><span class="cx"> handleStringGetByVal();
</span><span class="cx"> break;
</span><span class="lines">@@ -144,7 +139,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case GetIndexedPropertyStorage:
</span><del>- if (JSArrayBufferView* view = m_graph.tryGetFoldableView(m_node->child1().node(), m_node->arrayMode())) {
</del><ins>+ if (JSArrayBufferView* view = m_graph.tryGetFoldableViewForChild1(m_node)) {
</ins><span class="cx"> // FIXME: It would be awesome to be able to fold the property storage for
</span><span class="cx"> // these GC-allocated typed arrays. For now it doesn't matter because the
</span><span class="cx"> // most common use-cases for constant typed arrays involve large arrays with
</span><span class="lines">@@ -155,6 +150,10 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><ins>+ case TypedArrayWatchpoint:
+ addLazily(m_node->typedArray());
+ break;
+
</ins><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLCapabilities.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -101,6 +101,7 @@
</span><span class="cx"> case StringCharCodeAt:
</span><span class="cx"> case AllocatePropertyStorage:
</span><span class="cx"> case FunctionReentryWatchpoint:
</span><ins>+ case TypedArrayWatchpoint:
</ins><span class="cx"> case VariableWatchpoint:
</span><span class="cx"> case NotifyWrite:
</span><span class="cx"> case Call:
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreftlFTLLowerDFGToLLVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -291,11 +291,6 @@
</span><span class="cx"> case Phantom:
</span><span class="cx"> compilePhantom();
</span><span class="cx"> break;
</span><del>- case Flush:
- case PhantomLocal:
- case SetArgument:
- case LoopHint:
- break;
</del><span class="cx"> case ArithAdd:
</span><span class="cx"> case ValueAdd:
</span><span class="cx"> compileAddSub();
</span><span class="lines">@@ -423,10 +418,6 @@
</span><span class="cx"> case NotifyWrite:
</span><span class="cx"> compileNotifyWrite();
</span><span class="cx"> break;
</span><del>- case VariableWatchpoint:
- break;
- case FunctionReentryWatchpoint:
- break;
</del><span class="cx"> case GetMyScope:
</span><span class="cx"> compileGetMyScope();
</span><span class="cx"> break;
</span><span class="lines">@@ -497,6 +488,14 @@
</span><span class="cx"> case Int52ToValue:
</span><span class="cx"> compileInt52ToValue();
</span><span class="cx"> break;
</span><ins>+ case Flush:
+ case PhantomLocal:
+ case SetArgument:
+ case LoopHint:
+ case VariableWatchpoint:
+ case FunctionReentryWatchpoint:
+ case TypedArrayWatchpoint:
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> break;
</span><span class="lines">@@ -1452,7 +1451,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (JSArrayBufferView* view = m_graph.tryGetFoldableView(m_node->child1().node(), m_node->arrayMode())) {
</del><ins>+ if (JSArrayBufferView* view = m_graph.tryGetFoldableView(m_node)) {
</ins><span class="cx"> if (view->mode() != FastTypedArray) {
</span><span class="cx"> setStorage(m_out.constIntPtr(view->vector()));
</span><span class="cx"> return;
</span><span class="lines">@@ -1825,7 +1824,7 @@
</span><span class="cx"> OutOfBounds, noValue(), 0,
</span><span class="cx"> m_out.aboveOrEqual(
</span><span class="cx"> index,
</span><del>- typedArrayLength(child1.node(), m_node->arrayMode(), base)));
</del><ins>+ typedArrayLength(child1, m_node->arrayMode(), base)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TypedPointer pointer = TypedPointer(
</span><span class="lines">@@ -2973,16 +2972,16 @@
</span><span class="cx"> m_out.phi(m_out.intPtr, fastButterfly, slowButterfly));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LValue typedArrayLength(Node* baseNode, ArrayMode arrayMode, LValue base)
</del><ins>+ LValue typedArrayLength(Edge baseEdge, ArrayMode arrayMode, LValue base)
</ins><span class="cx"> {
</span><del>- if (JSArrayBufferView* view = m_graph.tryGetFoldableView(baseNode, arrayMode))
</del><ins>+ if (JSArrayBufferView* view = m_graph.tryGetFoldableView(baseEdge.node(), arrayMode))
</ins><span class="cx"> return m_out.constInt32(view->length());
</span><span class="cx"> return m_out.load32(base, m_heaps.JSArrayBufferView_length);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LValue typedArrayLength(Edge baseEdge, ArrayMode arrayMode)
</span><span class="cx"> {
</span><del>- return typedArrayLength(baseEdge.node(), arrayMode, lowCell(baseEdge));
</del><ins>+ return typedArrayLength(baseEdge, arrayMode, lowCell(baseEdge));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LValue boolify(Edge edge)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/jsc.cpp (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/jsc.cpp 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/jsc.cpp 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "InitializeThreading.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSArray.h"
</span><ins>+#include "JSArrayBuffer.h"
</ins><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSLock.h"
</span><span class="cx"> #include "JSProxy.h"
</span><span class="lines">@@ -114,6 +115,7 @@
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL functionPreciseTime(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL functionNeverInlineFunction(ExecState*);
</span><span class="cx"> static EncodedJSValue JSC_HOST_CALL functionNumberOfDFGCompiles(ExecState*);
</span><ins>+static EncodedJSValue JSC_HOST_CALL functionTransferArrayBuffer(ExecState*);
</ins><span class="cx"> static NO_RETURN_WITH_VALUE EncodedJSValue JSC_HOST_CALL functionQuit(ExecState*);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SAMPLING_FLAGS)
</span><span class="lines">@@ -235,6 +237,7 @@
</span><span class="cx"> addFunction(vm, "neverInlineFunction", functionNeverInlineFunction, 1);
</span><span class="cx"> addFunction(vm, "noInline", functionNeverInlineFunction, 1);
</span><span class="cx"> addFunction(vm, "numberOfDFGCompiles", functionNumberOfDFGCompiles, 1);
</span><ins>+ addFunction(vm, "transferArrayBuffer", functionTransferArrayBuffer, 1);
</ins><span class="cx"> #if ENABLE(SAMPLING_FLAGS)
</span><span class="cx"> addFunction(vm, "setSamplingFlags", functionSetSamplingFlags, 1);
</span><span class="cx"> addFunction(vm, "clearSamplingFlags", functionClearSamplingFlags, 1);
</span><span class="lines">@@ -505,6 +508,21 @@
</span><span class="cx"> return JSValue::encode(numberOfDFGCompiles(exec));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+EncodedJSValue JSC_HOST_CALL functionTransferArrayBuffer(ExecState* exec)
+{
+ if (exec->argumentCount() < 1)
+ return JSValue::encode(exec->vm().throwException(exec, createError(exec, "Not enough arguments")));
+
+ JSArrayBuffer* buffer = jsDynamicCast<JSArrayBuffer*>(exec->argument(0));
+ if (!buffer)
+ return JSValue::encode(exec->vm().throwException(exec, createError(exec, "Expected an array buffer")));
+
+ ArrayBufferContents dummyContents;
+ buffer->impl()->transfer(dummyContents);
+
+ return JSValue::encode(jsUndefined());
+}
+
</ins><span class="cx"> EncodedJSValue JSC_HOST_CALL functionQuit(ExecState*)
</span><span class="cx"> {
</span><span class="cx"> exit(EXIT_SUCCESS);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeArrayBufferViewh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/ArrayBufferView.h (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/ArrayBufferView.h 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/ArrayBufferView.h 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx">
</span><span class="cx"> // Helper to verify that a given sub-range of an ArrayBuffer is
</span><span class="cx"> // within range.
</span><ins>+ // FIXME: This should distinguish between alignment errors and bounds errors.
+ // https://bugs.webkit.org/show_bug.cgi?id=125391
</ins><span class="cx"> template <typename T>
</span><span class="cx"> static bool verifySubRange(
</span><span class="cx"> PassRefPtr<ArrayBuffer> buffer,
</span></span></pre></div>
<a id="branchesjsCStackToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Tools/ChangeLog (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Tools/ChangeLog 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Tools/ChangeLog 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -1,3 +1,7 @@
</span><ins>+2014-01-06 Filip Pizlo <fpizlo@apple.com>
+
+ Merge trunk r160292.
+
</ins><span class="cx"> 2013-12-06 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Transition MiniBrowser to the Cocoa API: load delegate
</span></span></pre></div>
<a id="branchesjsCStackToolsScriptsrunjavascriptcoretests"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Tools/Scripts/run-javascriptcore-tests (161392 => 161393)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Tools/Scripts/run-javascriptcore-tests 2014-01-07 03:17:11 UTC (rev 161392)
+++ branches/jsCStack/Tools/Scripts/run-javascriptcore-tests 2014-01-07 03:42:30 UTC (rev 161393)
</span><span class="lines">@@ -239,6 +239,7 @@
</span><span class="cx"> "PerformanceTests/SunSpider/tests/sunspider-1.0",
</span><span class="cx"> "PerformanceTests/SunSpider/tests/v8-v6",
</span><span class="cx"> "Source/JavaScriptCore/tests/mozilla/mozilla-tests.yaml",
</span><ins>+ "Source/JavaScriptCore/tests/stress",
</ins><span class="cx"> "LayoutTests/js/regress/script-tests",
</span><span class="cx"> "PerformanceTests/SunSpider/profiler-test.yaml",
</span><span class="cx"> "LayoutTests/jsc-layout-tests.yaml"
</span></span></pre>
</div>
</div>
</body>
</html>