<!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>[189760] 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/189760">189760</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 16:44:33 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/189751">r189751</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/189752">r189752</a>, and <a href="http://trac.webkit.org/projects/webkit/changeset/189754">r189754</a>.
https://bugs.webkit.org/show_bug.cgi?id=149143
caused crashes everywhere (Requested by alexchristensen on
#webkit).
Reverted changesets:
"LLInt get/put inline caches shouldn't use tons of opcodes"
https://bugs.webkit.org/show_bug.cgi?id=149106
http://trac.webkit.org/changeset/189751
"Unreviewed, fix non-x86 LLInt build."
http://trac.webkit.org/changeset/189752
"Unreviewed, really fix non-x86 LLInt build without also
breaking everything else."
http://trac.webkit.org/changeset/189754</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="#trunkSourceJavaScriptCorebytecodeBytecodeListjson">trunk/Source/JavaScriptCore/bytecode/BytecodeList.json</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeBytecodeUseDefh">trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockcpp">trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeCodeBlockh">trunk/Source/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp">trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeInstructionh">trunk/Source/JavaScriptCore/bytecode/Instruction.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePutByIdStatuscpp">trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh">trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp">trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGCapabilitiescpp">trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITcpp">trunk/Source/JavaScriptCore/jit/JIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLLIntSlowPathscpp">trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorebytecodePutByIdFlagscpp">trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodePutByIdFlagsh">trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.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 (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> bytecode/PolymorphicAccess.cpp
</span><span class="cx"> bytecode/PreciseJumpTargets.cpp
</span><span class="cx"> bytecode/PropertyCondition.cpp
</span><del>- bytecode/PutByIdFlags.cpp
</del><span class="cx"> bytecode/PutByIdStatus.cpp
</span><span class="cx"> bytecode/PutByIdVariant.cpp
</span><span class="cx"> bytecode/ReduceWhitespace.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-09-14 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r189751, r189752, and r189754.
+ https://bugs.webkit.org/show_bug.cgi?id=149143
+
+ caused crashes everywhere (Requested by alexchristensen on
+ #webkit).
+
+ Reverted changesets:
+
+ "LLInt get/put inline caches shouldn't use tons of opcodes"
+ https://bugs.webkit.org/show_bug.cgi?id=149106
+ http://trac.webkit.org/changeset/189751
+
+ "Unreviewed, fix non-x86 LLInt build."
+ http://trac.webkit.org/changeset/189752
+
+ "Unreviewed, really fix non-x86 LLInt build without also
+ breaking everything else."
+ http://trac.webkit.org/changeset/189754
+
</ins><span class="cx"> 2015-09-14 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, really fix non-x86 LLInt build without also breaking everything else.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -346,7 +346,6 @@
</span><span class="cx"> <ClCompile Include="..\bytecode\PolymorphicAccess.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\PreciseJumpTargets.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\PropertyCondition.cpp" />
</span><del>- <ClCompile Include="..\bytecode\PutByIdFlags.cpp" />
</del><span class="cx"> <ClCompile Include="..\bytecode\PutByIdStatus.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\PutByIdVariant.cpp" />
</span><span class="cx"> <ClCompile Include="..\bytecode\ReduceWhitespace.cpp" />
</span><span class="lines">@@ -1047,7 +1046,6 @@
</span><span class="cx"> <ClInclude Include="..\bytecode\PolymorphicAccess.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\PreciseJumpTargets.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\PropertyCondition.h" />
</span><del>- <ClInclude Include="..\bytecode\PutByIdFlags.h" />
</del><span class="cx"> <ClInclude Include="..\bytecode\PutByIdStatus.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\PutByIdVariant.h" />
</span><span class="cx"> <ClInclude Include="..\bytecode\PutKind.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -201,9 +201,6 @@
</span><span class="cx"> <ClCompile Include="..\bytecode\PolymorphicAccess.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bytecode\PutByIdFlags.cpp">
- <Filter>bytecode</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bytecode\PutByIdStatus.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -2097,9 +2094,6 @@
</span><span class="cx"> <ClInclude Include="..\bytecode\PolymorphicAccess.h">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\bytecode\PutByIdFlags.h">
- <Filter>bytecode</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\bytecode\PutByIdStatus.h">
</span><span class="cx"> <Filter>bytecode</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 (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -105,8 +105,6 @@
</span><span class="cx"> 0F13912B16771C3A009CCB07 /* ProfilerProfiledBytecodes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F13912616771C30009CCB07 /* ProfilerProfiledBytecodes.cpp */; };
</span><span class="cx"> 0F13912C16771C3D009CCB07 /* ProfilerProfiledBytecodes.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F13912716771C30009CCB07 /* ProfilerProfiledBytecodes.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F13E04E16164A1F00DC8DE7 /* IndexingType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F13E04C16164A1B00DC8DE7 /* IndexingType.cpp */; };
</span><del>- 0F15CD221BA5F9860031FFD3 /* PutByIdFlags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F15CD201BA5F9860031FFD3 /* PutByIdFlags.cpp */; };
- 0F15CD231BA5F9860031FFD3 /* PutByIdFlags.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15CD211BA5F9860031FFD3 /* PutByIdFlags.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 0F15F15F14B7A73E005DE37D /* CommonSlowPaths.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0F1725FF1B48719A00AC3A55 /* DFGMinifiedGraph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F1725FE1B48719A00AC3A55 /* DFGMinifiedGraph.cpp */; };
</span><span class="cx"> 0F18D3CF1B55A6E0002C5C9F /* DFGAdaptiveStructureWatchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0F18D3CD1B55A6E0002C5C9F /* DFGAdaptiveStructureWatchpoint.cpp */; };
</span><span class="lines">@@ -1934,8 +1932,6 @@
</span><span class="cx"> 0F13912616771C30009CCB07 /* ProfilerProfiledBytecodes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProfilerProfiledBytecodes.cpp; path = profiler/ProfilerProfiledBytecodes.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F13912716771C30009CCB07 /* ProfilerProfiledBytecodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProfilerProfiledBytecodes.h; path = profiler/ProfilerProfiledBytecodes.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F13E04C16164A1B00DC8DE7 /* IndexingType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = IndexingType.cpp; sourceTree = "<group>"; };
</span><del>- 0F15CD201BA5F9860031FFD3 /* PutByIdFlags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PutByIdFlags.cpp; sourceTree = "<group>"; };
- 0F15CD211BA5F9860031FFD3 /* PutByIdFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PutByIdFlags.h; sourceTree = "<group>"; };
</del><span class="cx"> 0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonSlowPaths.h; sourceTree = "<group>"; };
</span><span class="cx"> 0F1725FE1B48719A00AC3A55 /* DFGMinifiedGraph.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGMinifiedGraph.cpp; path = dfg/DFGMinifiedGraph.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0F18D3CD1B55A6E0002C5C9F /* DFGAdaptiveStructureWatchpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGAdaptiveStructureWatchpoint.cpp; path = dfg/DFGAdaptiveStructureWatchpoint.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -5604,8 +5600,6 @@
</span><span class="cx"> 0F98205E16BFE37F00240D02 /* PreciseJumpTargets.h */,
</span><span class="cx"> 0FD3E4071B618B6600C80E1E /* PropertyCondition.cpp */,
</span><span class="cx"> 0FD3E4081B618B6600C80E1E /* PropertyCondition.h */,
</span><del>- 0F15CD201BA5F9860031FFD3 /* PutByIdFlags.cpp */,
- 0F15CD211BA5F9860031FFD3 /* PutByIdFlags.h */,
</del><span class="cx"> 0F93329914CA7DC10085F3C6 /* PutByIdStatus.cpp */,
</span><span class="cx"> 0F93329A14CA7DC10085F3C6 /* PutByIdStatus.h */,
</span><span class="cx"> 0F93B4A718B92C4D00178A3F /* PutByIdVariant.cpp */,
</span><span class="lines">@@ -6746,7 +6740,6 @@
</span><span class="cx"> 0F682FB319BCB36400FA3BAD /* DFGSSACalculator.h in Headers */,
</span><span class="cx"> 0FB7F39D15ED8E4600F167B2 /* Reject.h in Headers */,
</span><span class="cx"> 0F2D4DEA19832DAC007D4B19 /* TypeLocation.h in Headers */,
</span><del>- 0F15CD231BA5F9860031FFD3 /* PutByIdFlags.h in Headers */,
</del><span class="cx"> A5BA15E8182340B300A82E69 /* RemoteInspector.h in Headers */,
</span><span class="cx"> A5BA15EA182340B400A82E69 /* RemoteInspectorConstants.h in Headers */,
</span><span class="cx"> A5BA15F0182345AF00A82E69 /* RemoteInspectorDebuggable.h in Headers */,
</span><span class="lines">@@ -7479,7 +7472,6 @@
</span><span class="cx"> 0FFFC95914EF90A600C72532 /* DFGCSEPhase.cpp in Sources */,
</span><span class="cx"> 0F2FC77216E12F710038D976 /* DFGDCEPhase.cpp in Sources */,
</span><span class="cx"> 0F8F2B99172F04FF007DBDA5 /* DFGDesiredIdentifiers.cpp in Sources */,
</span><del>- 0F15CD221BA5F9860031FFD3 /* PutByIdFlags.cpp in Sources */,
</del><span class="cx"> C2C0F7CD17BBFC5B00464FE4 /* DFGDesiredTransitions.cpp in Sources */,
</span><span class="cx"> 0FE8534B1723CDA500B618F5 /* DFGDesiredWatchpoints.cpp in Sources */,
</span><span class="cx"> C2981FD817BAEE4B00A3BC98 /* DFGDesiredWeakReferences.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeListjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeList.json (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeList.json 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -57,8 +57,14 @@
</span><span class="cx"> { "name" : "op_is_function", "length" : 3 },
</span><span class="cx"> { "name" : "op_in", "length" : 4 },
</span><span class="cx"> { "name" : "op_get_by_id", "length" : 9 },
</span><ins>+ { "name" : "op_get_by_id_out_of_line", "length" : 9 },
</ins><span class="cx"> { "name" : "op_get_array_length", "length" : 9 },
</span><span class="cx"> { "name" : "op_put_by_id", "length" : 9 },
</span><ins>+ { "name" : "op_put_by_id_out_of_line", "length" : 9 },
+ { "name" : "op_put_by_id_transition_direct", "length" : 9 },
+ { "name" : "op_put_by_id_transition_direct_out_of_line", "length" : 9 },
+ { "name" : "op_put_by_id_transition_normal", "length" : 9 },
+ { "name" : "op_put_by_id_transition_normal_out_of_line", "length" : 9 },
</ins><span class="cx"> { "name" : "op_del_by_id", "length" : 4 },
</span><span class="cx"> { "name" : "op_get_by_val", "length" : 6 },
</span><span class="cx"> { "name" : "op_put_by_val", "length" : 5 },
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeBytecodeUseDefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/BytecodeUseDef.h 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -93,6 +93,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> case op_put_by_index:
</span><ins>+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_normal_out_of_line:
+ case op_put_by_id_out_of_line:
</ins><span class="cx"> case op_put_by_id:
</span><span class="cx"> case op_put_to_scope:
</span><span class="cx"> case op_put_to_arguments: {
</span><span class="lines">@@ -129,6 +134,7 @@
</span><span class="cx"> case op_get_from_scope:
</span><span class="cx"> case op_to_primitive:
</span><span class="cx"> case op_get_by_id:
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length:
</span><span class="cx"> case op_typeof:
</span><span class="cx"> case op_is_undefined:
</span><span class="lines">@@ -271,6 +277,11 @@
</span><span class="cx"> case op_switch_char:
</span><span class="cx"> case op_switch_string:
</span><span class="cx"> case op_put_by_id:
</span><ins>+ case op_put_by_id_out_of_line:
+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_normal_out_of_line:
</ins><span class="cx"> case op_put_getter_by_id:
</span><span class="cx"> case op_put_setter_by_id:
</span><span class="cx"> case op_put_getter_setter:
</span><span class="lines">@@ -317,6 +328,7 @@
</span><span class="cx"> case op_call_eval:
</span><span class="cx"> case op_construct:
</span><span class="cx"> case op_get_by_id:
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length:
</span><span class="cx"> case op_check_has_instance:
</span><span class="cx"> case op_instanceof:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -273,6 +273,9 @@
</span><span class="cx"> case op_get_by_id:
</span><span class="cx"> op = "get_by_id";
</span><span class="cx"> break;
</span><ins>+ case op_get_by_id_out_of_line:
+ op = "get_by_id_out_of_line";
+ break;
</ins><span class="cx"> case op_get_array_length:
</span><span class="cx"> op = "array_length";
</span><span class="cx"> break;
</span><span class="lines">@@ -328,8 +331,7 @@
</span><span class="cx">
</span><span class="cx"> if (exec->interpreter()->getOpcodeID(instruction[0].u.opcode) == op_get_array_length)
</span><span class="cx"> out.printf(" llint(array_length)");
</span><del>- else if (StructureID structureID = instruction[4].u.structureID) {
- Structure* structure = m_vm->heap.structureIDTable().get(structureID);
</del><ins>+ else if (Structure* structure = instruction[4].u.structure.get()) {
</ins><span class="cx"> out.printf(" llint(");
</span><span class="cx"> dumpStructure(out, "struct", structure, ident);
</span><span class="cx"> out.printf(")");
</span><span class="lines">@@ -380,31 +382,42 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CodeBlock::printPutByIdCacheStatus(PrintStream& out, int location, const StubInfoMap& map)
</del><ins>+void CodeBlock::printPutByIdCacheStatus(PrintStream& out, ExecState* exec, int location, const StubInfoMap& map)
</ins><span class="cx"> {
</span><span class="cx"> Instruction* instruction = instructions().begin() + location;
</span><span class="cx">
</span><span class="cx"> const Identifier& ident = identifier(instruction[2].u.operand);
</span><span class="cx">
</span><span class="cx"> UNUSED_PARAM(ident); // tell the compiler to shut up in certain platform configurations.
</span><del>-
- out.print(", ", instruction[8].u.putByIdFlags);
</del><span class="cx">
</span><del>- if (StructureID structureID = instruction[4].u.structureID) {
- Structure* structure = m_vm->heap.structureIDTable().get(structureID);
- out.print(" llint(");
- if (StructureID newStructureID = instruction[6].u.structureID) {
- Structure* newStructure = m_vm->heap.structureIDTable().get(newStructureID);
</del><ins>+ if (Structure* structure = instruction[4].u.structure.get()) {
+ switch (exec->interpreter()->getOpcodeID(instruction[0].u.opcode)) {
+ case op_put_by_id:
+ case op_put_by_id_out_of_line:
+ out.print(" llint(");
+ dumpStructure(out, "struct", structure, ident);
+ out.print(")");
+ break;
+
+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal_out_of_line:
+ out.print(" llint(");
</ins><span class="cx"> dumpStructure(out, "prev", structure, ident);
</span><span class="cx"> out.print(", ");
</span><del>- dumpStructure(out, "next", newStructure, ident);
</del><ins>+ dumpStructure(out, "next", instruction[6].u.structure.get(), ident);
</ins><span class="cx"> if (StructureChain* chain = instruction[7].u.structureChain.get()) {
</span><span class="cx"> out.print(", ");
</span><span class="cx"> dumpChain(out, chain, ident);
</span><span class="cx"> }
</span><del>- } else
- dumpStructure(out, "struct", structure, ident);
- out.print(")");
</del><ins>+ out.print(")");
+ break;
+
+ default:
+ out.print(" llint(unknown)");
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="lines">@@ -988,6 +1001,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case op_get_by_id:
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length: {
</span><span class="cx"> printGetByIdOp(out, exec, location, it);
</span><span class="cx"> printGetByIdCacheStatus(out, exec, location, stubInfos);
</span><span class="lines">@@ -996,9 +1010,34 @@
</span><span class="cx"> }
</span><span class="cx"> case op_put_by_id: {
</span><span class="cx"> printPutByIdOp(out, exec, location, it, "put_by_id");
</span><del>- printPutByIdCacheStatus(out, location, stubInfos);
</del><ins>+ printPutByIdCacheStatus(out, exec, location, stubInfos);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case op_put_by_id_out_of_line: {
+ printPutByIdOp(out, exec, location, it, "put_by_id_out_of_line");
+ printPutByIdCacheStatus(out, exec, location, stubInfos);
+ break;
+ }
+ case op_put_by_id_transition_direct: {
+ printPutByIdOp(out, exec, location, it, "put_by_id_transition_direct");
+ printPutByIdCacheStatus(out, exec, location, stubInfos);
+ break;
+ }
+ case op_put_by_id_transition_direct_out_of_line: {
+ printPutByIdOp(out, exec, location, it, "put_by_id_transition_direct_out_of_line");
+ printPutByIdCacheStatus(out, exec, location, stubInfos);
+ break;
+ }
+ case op_put_by_id_transition_normal: {
+ printPutByIdOp(out, exec, location, it, "put_by_id_transition_normal");
+ printPutByIdCacheStatus(out, exec, location, stubInfos);
+ break;
+ }
+ case op_put_by_id_transition_normal_out_of_line: {
+ printPutByIdOp(out, exec, location, it, "put_by_id_transition_normal_out_of_line");
+ printPutByIdCacheStatus(out, exec, location, stubInfos);
+ break;
+ }
</ins><span class="cx"> case op_put_getter_by_id: {
</span><span class="cx"> int r0 = (++it)->u.operand;
</span><span class="cx"> int id0 = (++it)->u.operand;
</span><span class="lines">@@ -1897,6 +1936,7 @@
</span><span class="cx"> instructions[i + opLength - 1] = profile;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length:
</span><span class="cx"> CRASH();
</span><span class="cx">
</span><span class="lines">@@ -2377,17 +2417,12 @@
</span><span class="cx"> for (size_t i = 0; i < propertyAccessInstructions.size(); ++i) {
</span><span class="cx"> Instruction* instruction = &instructions()[propertyAccessInstructions[i]];
</span><span class="cx"> switch (interpreter->getOpcodeID(instruction[0].u.opcode)) {
</span><del>- case op_put_by_id: {
- StructureID oldStructureID = instruction[4].u.structureID;
- StructureID newStructureID = instruction[6].u.structureID;
- if (!oldStructureID || !newStructureID)
- break;
- Structure* oldStructure =
- m_vm->heap.structureIDTable().get(oldStructureID);
- Structure* newStructure =
- m_vm->heap.structureIDTable().get(newStructureID);
- if (Heap::isMarked(oldStructure))
- visitor.appendUnbarrieredReadOnlyPointer(newStructure);
</del><ins>+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal_out_of_line: {
+ if (Heap::isMarked(instruction[4].u.structure.get()))
+ visitor.append(&instruction[6].u.structure);
</ins><span class="cx"> else
</span><span class="cx"> allAreMarkedSoFar = false;
</span><span class="cx"> break;
</span><span class="lines">@@ -2518,32 +2553,36 @@
</span><span class="cx"> for (size_t size = propertyAccessInstructions.size(), i = 0; i < size; ++i) {
</span><span class="cx"> Instruction* curInstruction = &instructions()[propertyAccessInstructions[i]];
</span><span class="cx"> switch (interpreter->getOpcodeID(curInstruction[0].u.opcode)) {
</span><del>- case op_get_by_id: {
- StructureID oldStructureID = curInstruction[4].u.structureID;
- if (!oldStructureID || Heap::isMarked(m_vm->heap.structureIDTable().get(oldStructureID)))
</del><ins>+ case op_get_by_id:
+ case op_get_by_id_out_of_line:
+ case op_put_by_id:
+ case op_put_by_id_out_of_line:
+ if (!curInstruction[4].u.structure || Heap::isMarked(curInstruction[4].u.structure.get()))
</ins><span class="cx"> break;
</span><span class="cx"> if (Options::verboseOSR())
</span><del>- dataLogF("Clearing LLInt property access.\n");
- curInstruction[4].u.structureID = 0;
</del><ins>+ dataLogF("Clearing LLInt property access with structure %p.\n", curInstruction[4].u.structure.get());
+ curInstruction[4].u.structure.clear();
</ins><span class="cx"> curInstruction[5].u.operand = 0;
</span><span class="cx"> break;
</span><del>- }
- case op_put_by_id: {
- StructureID oldStructureID = curInstruction[4].u.structureID;
- StructureID newStructureID = curInstruction[6].u.structureID;
- StructureChain* chain = curInstruction[7].u.structureChain.get();
- if ((!oldStructureID || Heap::isMarked(m_vm->heap.structureIDTable().get(oldStructureID))) &&
- (!newStructureID || Heap::isMarked(m_vm->heap.structureIDTable().get(newStructureID))) &&
- (!chain || Heap::isMarked(chain)))
</del><ins>+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal_out_of_line:
+ if (Heap::isMarked(curInstruction[4].u.structure.get())
+ && Heap::isMarked(curInstruction[6].u.structure.get())
+ && Heap::isMarked(curInstruction[7].u.structureChain.get()))
</ins><span class="cx"> break;
</span><del>- if (Options::verboseOSR())
- dataLogF("Clearing LLInt put transition.\n");
- curInstruction[4].u.structureID = 0;
- curInstruction[5].u.operand = 0;
- curInstruction[6].u.structureID = 0;
</del><ins>+ if (Options::verboseOSR()) {
+ dataLogF("Clearing LLInt put transition with structures %p -> %p, chain %p.\n",
+ curInstruction[4].u.structure.get(),
+ curInstruction[6].u.structure.get(),
+ curInstruction[7].u.structureChain.get());
+ }
+ curInstruction[4].u.structure.clear();
+ curInstruction[6].u.structure.clear();
</ins><span class="cx"> curInstruction[7].u.structureChain.clear();
</span><ins>+ curInstruction[0].u.opcode = interpreter->getOpcode(op_put_by_id);
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> case op_get_array_length:
</span><span class="cx"> break;
</span><span class="cx"> case op_to_this:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/CodeBlock.h (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/CodeBlock.h 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx"> enum CacheDumpMode { DumpCaches, DontDumpCaches };
</span><span class="cx"> void printCallOp(PrintStream&, ExecState*, int location, const Instruction*&, const char* op, CacheDumpMode, bool& hasPrintedProfiling, const CallLinkInfoMap&);
</span><span class="cx"> void printPutByIdOp(PrintStream&, ExecState*, int location, const Instruction*&, const char* op);
</span><del>- void printPutByIdCacheStatus(PrintStream&, int location, const StubInfoMap&);
</del><ins>+ void printPutByIdCacheStatus(PrintStream&, ExecState*, int location, const StubInfoMap&);
</ins><span class="cx"> void printLocationAndOp(PrintStream&, ExecState*, int location, const Instruction*&, const char* op);
</span><span class="cx"> void printLocationOpAndRegisterOperand(PrintStream&, ExecState*, int location, const Instruction*& it, const char* op, int operand);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeGetByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/GetByIdStatus.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -70,20 +70,15 @@
</span><span class="cx"> UNUSED_PARAM(profiledBlock);
</span><span class="cx"> UNUSED_PARAM(bytecodeIndex);
</span><span class="cx"> UNUSED_PARAM(uid);
</span><del>-
- VM& vm = *profiledBlock->vm();
-
</del><span class="cx"> Instruction* instruction = profiledBlock->instructions().begin() + bytecodeIndex;
</span><span class="cx">
</span><span class="cx"> if (instruction[0].u.opcode == LLInt::getOpcode(op_get_array_length))
</span><span class="cx"> return GetByIdStatus(NoInformation, false);
</span><span class="cx">
</span><del>- StructureID structureID = instruction[4].u.structureID;
- if (!structureID)
</del><ins>+ Structure* structure = instruction[4].u.structure.get();
+ if (!structure)
</ins><span class="cx"> return GetByIdStatus(NoInformation, false);
</span><span class="cx">
</span><del>- Structure* structure = vm.heap.structureIDTable().get(structureID);
-
</del><span class="cx"> if (structure->takesSlowPathInDFGForImpureProperty())
</span><span class="cx"> return GetByIdStatus(NoInformation, false);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeInstructionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/Instruction.h (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/Instruction.h 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/Instruction.h 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "BasicBlockLocation.h"
</span><span class="cx"> #include "MacroAssembler.h"
</span><span class="cx"> #include "Opcode.h"
</span><del>-#include "PutByIdFlags.h"
</del><span class="cx"> #include "SymbolTable.h"
</span><span class="cx"> #include "TypeLocation.h"
</span><span class="cx"> #include "PropertySlot.h"
</span><span class="lines">@@ -76,11 +75,6 @@
</span><span class="cx"> u.operand = operand;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Instruction(PutByIdFlags flags)
- {
- u.putByIdFlags = flags;
- }
-
</del><span class="cx"> Instruction(VM& vm, JSCell* owner, Structure* structure)
</span><span class="cx"> {
</span><span class="cx"> u.structure.clear();
</span><span class="lines">@@ -113,7 +107,6 @@
</span><span class="cx"> Opcode opcode;
</span><span class="cx"> int operand;
</span><span class="cx"> WriteBarrierBase<Structure> structure;
</span><del>- StructureID structureID;
</del><span class="cx"> WriteBarrierBase<SymbolTable> symbolTable;
</span><span class="cx"> WriteBarrierBase<StructureChain> structureChain;
</span><span class="cx"> WriteBarrierBase<JSCell> jsCell;
</span><span class="lines">@@ -132,7 +125,6 @@
</span><span class="cx"> ToThisStatus toThisStatus;
</span><span class="cx"> TypeLocation* location;
</span><span class="cx"> BasicBlockLocation* basicBlockLocation;
</span><del>- PutByIdFlags putByIdFlags;
</del><span class="cx"> } u;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePutByIdFlagscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>-/*
- * 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 "PutByIdFlags.h"
-
-#include <wtf/CommaPrinter.h>
-#include <wtf/PrintStream.h>
-#include <wtf/StringPrintStream.h>
-
-namespace WTF {
-
-using namespace JSC;
-
-void printInternal(PrintStream& out, PutByIdFlags flags) {
- StringPrintStream stringOut;
- CommaPrinter comma("|");
- if (flags & PutByIdIsDirect)
- stringOut.print(comma, "IsDirect");
-
- CString string = stringOut.toCString();
- if (!string.length())
- out.print("None");
- else
- out.print(string);
-}
-
-} // namespace WTF
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePutByIdFlagsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.h (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.h 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/PutByIdFlags.h 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-/*
- * 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 PutByIdFlags_h
-#define PutByIdFlags_h
-
-namespace JSC {
-
-enum PutByIdFlags {
- PutByIdNone = 0,
- PutByIdIsDirect = 1
-};
-
-} // namespace JSC
-
-namespace WTF {
-
-class PrintStream;
-
-void printInternal(PrintStream&, JSC::PutByIdFlags);
-
-} // namespace WTF
-
-#endif // PutByIdFlags_h
-
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodePutByIdStatuscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/PutByIdStatus.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -66,36 +66,37 @@
</span><span class="cx"> UNUSED_PARAM(profiledBlock);
</span><span class="cx"> UNUSED_PARAM(bytecodeIndex);
</span><span class="cx"> UNUSED_PARAM(uid);
</span><del>-
- VM& vm = *profiledBlock->vm();
-
</del><span class="cx"> Instruction* instruction = profiledBlock->instructions().begin() + bytecodeIndex;
</span><span class="cx">
</span><del>- StructureID structureID = instruction[4].u.structureID;
- if (!structureID)
</del><ins>+ Structure* structure = instruction[4].u.structure.get();
+ if (!structure)
</ins><span class="cx"> return PutByIdStatus(NoInformation);
</span><span class="cx">
</span><del>- Structure* structure = vm.heap.structureIDTable().get(structureID);
-
- StructureID newStructureID = instruction[6].u.structureID;
- if (!newStructureID) {
</del><ins>+ if (instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id)
+ || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_out_of_line)) {
</ins><span class="cx"> PropertyOffset offset = structure->getConcurrently(uid);
</span><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return PutByIdStatus(NoInformation);
</span><span class="cx">
</span><span class="cx"> return PutByIdVariant::replace(structure, offset);
</span><span class="cx"> }
</span><del>-
- Structure* newStructure = vm.heap.structureIDTable().get(newStructureID);
</del><span class="cx">
</span><span class="cx"> ASSERT(structure->transitionWatchpointSetHasBeenInvalidated());
</span><span class="cx">
</span><ins>+ ASSERT(instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_direct)
+ || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_normal)
+ || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_direct_out_of_line)
+ || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_normal_out_of_line));
+
+ Structure* newStructure = instruction[6].u.structure.get();
+
</ins><span class="cx"> PropertyOffset offset = newStructure->getConcurrently(uid);
</span><span class="cx"> if (!isValidOffset(offset))
</span><span class="cx"> return PutByIdStatus(NoInformation);
</span><span class="cx">
</span><span class="cx"> ObjectPropertyConditionSet conditionSet;
</span><del>- if (!(instruction[8].u.putByIdFlags & PutByIdIsDirect)) {
</del><ins>+ if (instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_normal)
+ || instruction[0].u.opcode == LLInt::getOpcode(op_put_by_id_transition_normal_out_of_line)) {
</ins><span class="cx"> conditionSet =
</span><span class="cx"> generateConditionsForPropertySetterMissConcurrently(
</span><span class="cx"> *profiledBlock->vm(), profiledBlock->globalObject(), structure, uid);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeUnlinkedCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.h 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "JSCell.h"
</span><span class="cx"> #include "JSString.h"
</span><span class="cx"> #include "ParserModes.h"
</span><del>-#include "PutByIdFlags.h"
</del><span class="cx"> #include "RegExp.h"
</span><span class="cx"> #include "SpecialPointer.h"
</span><span class="cx"> #include "UnlinkedFunctionExecutable.h"
</span><span class="lines">@@ -98,12 +97,10 @@
</span><span class="cx"> UnlinkedInstruction() { u.operand = 0; }
</span><span class="cx"> UnlinkedInstruction(OpcodeID opcode) { u.opcode = opcode; }
</span><span class="cx"> UnlinkedInstruction(int operand) { u.operand = operand; }
</span><del>- UnlinkedInstruction(PutByIdFlags flags) { u.putByIdFlags = flags; }
</del><span class="cx"> union {
</span><span class="cx"> OpcodeID opcode;
</span><span class="cx"> int32_t operand;
</span><span class="cx"> unsigned index;
</span><del>- PutByIdFlags putByIdFlags;
</del><span class="cx"> } u;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -2103,11 +2103,11 @@
</span><span class="cx"> instructions().append(base->index());
</span><span class="cx"> instructions().append(propertyIndex);
</span><span class="cx"> instructions().append(value->index());
</span><del>- instructions().append(0); // old structure
- instructions().append(0); // offset
- instructions().append(0); // new structure
- instructions().append(0); // structure chain
- instructions().append(PutByIdNone); // is not direct
</del><ins>+ instructions().append(0);
+ instructions().append(0);
+ instructions().append(0);
+ instructions().append(0);
+ instructions().append(0);
</ins><span class="cx">
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="lines">@@ -2125,11 +2125,11 @@
</span><span class="cx"> instructions().append(base->index());
</span><span class="cx"> instructions().append(propertyIndex);
</span><span class="cx"> instructions().append(value->index());
</span><del>- instructions().append(0); // old structure
- instructions().append(0); // offset
- instructions().append(0); // new structure
- instructions().append(0); // structure chain (unused if direct)
- instructions().append((putType == PropertyNode::KnownDirect || property != m_vm->propertyNames->underscoreProto) ? PutByIdIsDirect : PutByIdNone);
</del><ins>+ instructions().append(0);
+ instructions().append(0);
+ instructions().append(0);
+ instructions().append(0);
+ instructions().append(putType == PropertyNode::KnownDirect || property != m_vm->propertyNames->underscoreProto);
</ins><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGByteCodeParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -44,7 +44,6 @@
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "JSModuleEnvironment.h"
</span><span class="cx"> #include "PreciseJumpTargets.h"
</span><del>-#include "PutByIdFlags.h"
</del><span class="cx"> #include "PutByIdStatus.h"
</span><span class="cx"> #include "StackAlignment.h"
</span><span class="cx"> #include "StringConstructor.h"
</span><span class="lines">@@ -3514,6 +3513,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> case op_get_by_id:
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length: {
</span><span class="cx"> SpeculatedType prediction = getPrediction();
</span><span class="cx">
</span><span class="lines">@@ -3531,11 +3531,16 @@
</span><span class="cx">
</span><span class="cx"> NEXT_OPCODE(op_get_by_id);
</span><span class="cx"> }
</span><del>- case op_put_by_id: {
</del><ins>+ case op_put_by_id:
+ case op_put_by_id_out_of_line:
+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal_out_of_line: {
</ins><span class="cx"> Node* value = get(VirtualRegister(currentInstruction[3].u.operand));
</span><span class="cx"> Node* base = get(VirtualRegister(currentInstruction[1].u.operand));
</span><span class="cx"> unsigned identifierNumber = m_inlineStackTop->m_identifierRemap[currentInstruction[2].u.operand];
</span><del>- bool direct = currentInstruction[8].u.putByIdFlags & PutByIdIsDirect;
</del><ins>+ bool direct = currentInstruction[8].u.operand;
</ins><span class="cx">
</span><span class="cx"> PutByIdStatus putByIdStatus = PutByIdStatus::computeFor(
</span><span class="cx"> m_inlineStackTop->m_profiledBlock, m_dfgCodeBlock,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGCapabilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/dfg/DFGCapabilities.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -152,8 +152,14 @@
</span><span class="cx"> case op_put_by_val:
</span><span class="cx"> case op_put_by_val_direct:
</span><span class="cx"> case op_get_by_id:
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length:
</span><span class="cx"> case op_put_by_id:
</span><ins>+ case op_put_by_id_out_of_line:
+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_normal_out_of_line:
</ins><span class="cx"> case op_jmp:
</span><span class="cx"> case op_jtrue:
</span><span class="cx"> case op_jfalse:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/jit/JIT.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -217,6 +217,7 @@
</span><span class="cx"> DEFINE_OP(op_load_arrowfunction_this)
</span><span class="cx"> DEFINE_OP(op_eq)
</span><span class="cx"> DEFINE_OP(op_eq_null)
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length:
</span><span class="cx"> DEFINE_OP(op_get_by_id)
</span><span class="cx"> DEFINE_OP(op_get_by_val)
</span><span class="lines">@@ -268,6 +269,11 @@
</span><span class="cx"> DEFINE_OP(op_push_with_scope)
</span><span class="cx"> DEFINE_OP(op_create_lexical_environment)
</span><span class="cx"> DEFINE_OP(op_get_parent_scope)
</span><ins>+ case op_put_by_id_out_of_line:
+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal_out_of_line:
</ins><span class="cx"> DEFINE_OP(op_put_by_id)
</span><span class="cx"> DEFINE_OP(op_put_by_index)
</span><span class="cx"> case op_put_by_val_direct:
</span><span class="lines">@@ -380,6 +386,7 @@
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_create_this)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_div)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_eq)
</span><ins>+ case op_get_by_id_out_of_line:
</ins><span class="cx"> case op_get_array_length:
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_get_by_id)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_get_by_val)
</span><span class="lines">@@ -406,6 +413,11 @@
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_nstricteq)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_dec)
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_inc)
</span><ins>+ case op_put_by_id_out_of_line:
+ case op_put_by_id_transition_direct:
+ case op_put_by_id_transition_normal:
+ case op_put_by_id_transition_direct_out_of_line:
+ case op_put_by_id_transition_normal_out_of_line:
</ins><span class="cx"> DEFINE_SLOWCASE_OP(op_put_by_id)
</span><span class="cx"> case op_put_by_val_direct:
</span><span class="cx"> DEFINE_SLOWCASE_OP(op_put_by_val)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> {
</span><span class="cx"> int baseVReg = currentInstruction[1].u.operand;
</span><span class="cx"> int valueVReg = currentInstruction[3].u.operand;
</span><del>- unsigned direct = currentInstruction[8].u.putByIdFlags & PutByIdIsDirect;
</del><ins>+ unsigned direct = currentInstruction[8].u.operand;
</ins><span class="cx">
</span><span class="cx"> emitWriteBarrier(baseVReg, valueVReg, ShouldFilterBase);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -623,7 +623,7 @@
</span><span class="cx">
</span><span class="cx"> int base = currentInstruction[1].u.operand;
</span><span class="cx"> int value = currentInstruction[3].u.operand;
</span><del>- int direct = currentInstruction[8].u.putByIdFlags & PutByIdIsDirect;
</del><ins>+ int direct = currentInstruction[8].u.operand;
</ins><span class="cx">
</span><span class="cx"> emitWriteBarrier(base, value, ShouldFilterBase);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLLIntSlowPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -570,20 +570,20 @@
</span><span class="cx"> JSCell* baseCell = baseValue.asCell();
</span><span class="cx"> Structure* structure = baseCell->structure();
</span><span class="cx">
</span><del>- // Start out by clearing out the old cache.
- pc[0].u.opcode = LLInt::getOpcode(op_get_by_id);
- pc[4].u.pointer = nullptr; // old structure
- pc[5].u.pointer = nullptr; // offset
-
</del><span class="cx"> if (!structure->isUncacheableDictionary()
</span><span class="cx"> && !structure->typeInfo().prohibitsPropertyCaching()
</span><span class="cx"> && !structure->typeInfo().newImpurePropertyFiresWatchpoints()) {
</span><del>- vm.heap.writeBarrier(codeBlock->ownerExecutable());
-
</del><span class="cx"> ConcurrentJITLocker locker(codeBlock->m_lock);
</span><span class="cx">
</span><del>- pc[4].u.structureID = structure->id();
- pc[5].u.operand = slot.cachedOffset();
</del><ins>+ pc[4].u.structure.set(
+ vm, codeBlock->ownerExecutable(), structure);
+ if (isInlineOffset(slot.cachedOffset())) {
+ pc[0].u.opcode = LLInt::getOpcode(op_get_by_id);
+ pc[5].u.operand = offsetInInlineStorage(slot.cachedOffset()) * sizeof(JSValue) + JSObject::offsetOfInlineStorage();
+ } else {
+ pc[0].u.opcode = LLInt::getOpcode(op_get_by_id_out_of_line);
+ pc[5].u.operand = offsetInButterfly(slot.cachedOffset()) * sizeof(JSValue);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -618,7 +618,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue baseValue = LLINT_OP_C(1).jsValue();
</span><span class="cx"> PutPropertySlot slot(baseValue, codeBlock->isStrictMode(), codeBlock->putByIdContext());
</span><del>- if (pc[8].u.putByIdFlags & PutByIdIsDirect)
</del><ins>+ if (pc[8].u.operand)
</ins><span class="cx"> asObject(baseValue)->putDirect(vm, ident, LLINT_OP_C(3).jsValue(), slot);
</span><span class="cx"> else
</span><span class="cx"> baseValue.put(exec, ident, LLINT_OP_C(3).jsValue(), slot);
</span><span class="lines">@@ -627,12 +627,6 @@
</span><span class="cx"> if (!LLINT_ALWAYS_ACCESS_SLOW
</span><span class="cx"> && baseValue.isCell()
</span><span class="cx"> && slot.isCacheablePut()) {
</span><del>-
- // Start out by clearing out the old cache.
- pc[4].u.pointer = nullptr; // old structure
- pc[5].u.pointer = nullptr; // offset
- pc[6].u.pointer = nullptr; // new structure
- pc[7].u.pointer = nullptr; // structure chain
</del><span class="cx">
</span><span class="cx"> JSCell* baseCell = baseValue.asCell();
</span><span class="cx"> Structure* structure = baseCell->structure();
</span><span class="lines">@@ -640,32 +634,56 @@
</span><span class="cx"> if (!structure->isUncacheableDictionary()
</span><span class="cx"> && !structure->typeInfo().prohibitsPropertyCaching()
</span><span class="cx"> && baseCell == slot.base()) {
</span><del>-
- vm.heap.writeBarrier(codeBlock->ownerExecutable());
</del><span class="cx">
</span><span class="cx"> if (slot.type() == PutPropertySlot::NewProperty) {
</span><span class="cx"> GCSafeConcurrentJITLocker locker(codeBlock->m_lock, vm.heap);
</span><span class="cx">
</span><span class="cx"> if (!structure->isDictionary() && structure->previousID()->outOfLineCapacity() == structure->outOfLineCapacity()) {
</span><span class="cx"> ASSERT(structure->previousID()->transitionWatchpointSetHasBeenInvalidated());
</span><ins>+
+ // This is needed because some of the methods we call
+ // below may GC.
+ pc[0].u.opcode = LLInt::getOpcode(op_put_by_id);
</ins><span class="cx">
</span><span class="cx"> if (normalizePrototypeChain(exec, structure) != InvalidPrototypeChain) {
</span><span class="cx"> ASSERT(structure->previousID()->isObject());
</span><del>- pc[4].u.structureID = structure->previousID()->id();
- pc[5].u.operand = slot.cachedOffset();
- pc[6].u.structureID = structure->id();
- if (!(pc[8].u.putByIdFlags & PutByIdIsDirect)) {
- StructureChain* chain = structure->prototypeChain(exec);
- ASSERT(chain);
- pc[7].u.structureChain.set(
- vm, codeBlock->ownerExecutable(), chain);
</del><ins>+ pc[4].u.structure.set(
+ vm, codeBlock->ownerExecutable(), structure->previousID());
+ if (isInlineOffset(slot.cachedOffset()))
+ pc[5].u.operand = offsetInInlineStorage(slot.cachedOffset()) * sizeof(JSValue) + JSObject::offsetOfInlineStorage();
+ else
+ pc[5].u.operand = offsetInButterfly(slot.cachedOffset()) * sizeof(JSValue);
+ pc[6].u.structure.set(
+ vm, codeBlock->ownerExecutable(), structure);
+ StructureChain* chain = structure->prototypeChain(exec);
+ ASSERT(chain);
+ pc[7].u.structureChain.set(
+ vm, codeBlock->ownerExecutable(), chain);
+
+ if (pc[8].u.operand) {
+ if (isInlineOffset(slot.cachedOffset()))
+ pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_direct);
+ else
+ pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_direct_out_of_line);
+ } else {
+ if (isInlineOffset(slot.cachedOffset()))
+ pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_normal);
+ else
+ pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_transition_normal_out_of_line);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> structure->didCachePropertyReplacement(vm, slot.cachedOffset());
</span><del>- pc[4].u.structureID = structure->id();
- pc[5].u.operand = slot.cachedOffset();
</del><ins>+ pc[4].u.structure.set(
+ vm, codeBlock->ownerExecutable(), structure);
+ if (isInlineOffset(slot.cachedOffset())) {
+ pc[0].u.opcode = LLInt::getOpcode(op_put_by_id);
+ pc[5].u.operand = offsetInInlineStorage(slot.cachedOffset()) * sizeof(JSValue) + JSObject::offsetOfInlineStorage();
+ } else {
+ pc[0].u.opcode = LLInt::getOpcode(op_put_by_id_out_of_line);
+ pc[5].u.operand = offsetInButterfly(slot.cachedOffset()) * sizeof(JSValue);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -1323,25 +1323,39 @@
</span><span class="cx"> # to take fast path on the new cache. At worst we take slow path, which is what
</span><span class="cx"> # we would have been doing anyway.
</span><span class="cx">
</span><del>-_llint_op_get_by_id:
</del><ins>+macro getById(getPropertyStorage)
</ins><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t0
</span><span class="cx"> loadi 16[PC], t1
</span><span class="cx"> loadConstantOrVariablePayload(t0, CellTag, t3, .opGetByIdSlow)
</span><span class="cx"> loadi 20[PC], t2
</span><del>- bineq JSCell::m_structureID[t3], t1, .opGetByIdSlow
- loadPropertyAtVariableOffset(t2, t3, t0, t1)
- loadi 4[PC], t2
- storei t0, TagOffset[cfr, t2, 8]
- storei t1, PayloadOffset[cfr, t2, 8]
- valueProfile(t0, t1, 32, t2)
- dispatch(9)
</del><ins>+ getPropertyStorage(
+ t3,
+ t0,
+ macro (propertyStorage, scratch)
+ bpneq JSCell::m_structureID[t3], t1, .opGetByIdSlow
+ loadi 4[PC], t1
+ loadi TagOffset[propertyStorage, t2], scratch
+ loadi PayloadOffset[propertyStorage, t2], t2
+ storei scratch, TagOffset[cfr, t1, 8]
+ storei t2, PayloadOffset[cfr, t1, 8]
+ valueProfile(scratch, t2, 32, t1)
+ dispatch(9)
+ end)
</ins><span class="cx">
</span><del>-.opGetByIdSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
</del><ins>+ .opGetByIdSlow:
+ callSlowPath(_llint_slow_path_get_by_id)
+ dispatch(9)
+end
</ins><span class="cx">
</span><ins>+_llint_op_get_by_id:
+ getById(withInlineStorage)
</ins><span class="cx">
</span><ins>+
+_llint_op_get_by_id_out_of_line:
+ getById(withOutOfLineStorage)
+
+
</ins><span class="cx"> _llint_op_get_array_length:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t0
</span><span class="lines">@@ -1365,59 +1379,102 @@
</span><span class="cx"> dispatch(9)
</span><span class="cx">
</span><span class="cx">
</span><del>-_llint_op_put_by_id:
</del><ins>+macro putById(getPropertyStorage)
</ins><span class="cx"> traceExecution()
</span><span class="cx"> writeBarrierOnOperands(1, 3)
</span><span class="cx"> loadi 4[PC], t3
</span><ins>+ loadi 16[PC], t1
</ins><span class="cx"> loadConstantOrVariablePayload(t3, CellTag, t0, .opPutByIdSlow)
</span><del>- loadi JSCell::m_structureID[t0], t2
- bineq t2, 16[PC], .opPutByIdSlow
</del><ins>+ loadi 12[PC], t2
+ getPropertyStorage(
+ t0,
+ t3,
+ macro (propertyStorage, scratch)
+ bpneq JSCell::m_structureID[t0], t1, .opPutByIdSlow
+ loadi 20[PC], t1
+ loadConstantOrVariable2Reg(t2, scratch, t2)
+ storei scratch, TagOffset[propertyStorage, t1]
+ storei t2, PayloadOffset[propertyStorage, t1]
+ dispatch(9)
+ end)
</ins><span class="cx">
</span><del>- # At this point, we have:
- # t2 -> currentStructureID
- # t0 -> object base
</del><ins>+ .opPutByIdSlow:
+ callSlowPath(_llint_slow_path_put_by_id)
+ dispatch(9)
+end
</ins><span class="cx">
</span><del>- loadi 24[PC], t1
</del><ins>+_llint_op_put_by_id:
+ putById(withInlineStorage)
</ins><span class="cx">
</span><del>- btiz t1, .opPutByIdNotTransition
</del><span class="cx">
</span><del>- # This is the transition case. t1 holds the new Structure*. t2 holds the old Structure*.
- # If we have a chain, we need to check it. t0 is the base. We may clobber t1 to use it as
- # scratch.
- loadp 28[PC], t3
- btpz t3, .opPutByIdTransitionDirect
</del><ins>+_llint_op_put_by_id_out_of_line:
+ putById(withOutOfLineStorage)
</ins><span class="cx">
</span><del>- loadp StructureChain::m_vector[t3], t3
- assert(macro (ok) btpnz t3, ok end)
</del><span class="cx">
</span><del>- loadp Structure::m_prototype[t2], t2
- btpz t2, .opPutByIdTransitionChainDone
-.opPutByIdTransitionChainLoop:
- loadp [t3], t1
- bpneq t1, JSCell::m_structureID[t2], .opPutByIdSlow
- addp 4, t3
- loadp Structure::m_prototype[t1], t2
- btpnz t2, .opPutByIdTransitionChainLoop
</del><ins>+macro putByIdTransition(additionalChecks, getPropertyStorage)
+ traceExecution()
+ writeBarrierOnOperand(1)
+ loadi 4[PC], t3
+ loadi 16[PC], t1
+ loadConstantOrVariablePayload(t3, CellTag, t0, .opPutByIdSlow)
+ loadi 12[PC], t2
+ bpneq JSCell::m_structureID[t0], t1, .opPutByIdSlow
+ additionalChecks(t1, t3, .opPutByIdSlow)
+ loadi 20[PC], t1
+ getPropertyStorage(
+ t0,
+ t3,
+ macro (propertyStorage, scratch)
+ addp t1, propertyStorage, t3
+ loadConstantOrVariable2Reg(t2, t1, t2)
+ storei t1, TagOffset[t3]
+ loadi 24[PC], t1
+ storei t2, PayloadOffset[t3]
+ storep t1, JSCell::m_structureID[t0]
+ dispatch(9)
+ end)
</ins><span class="cx">
</span><del>-.opPutByIdTransitionChainDone:
- loadi 24[PC], t1
</del><ins>+ .opPutByIdSlow:
+ callSlowPath(_llint_slow_path_put_by_id)
+ dispatch(9)
+end
</ins><span class="cx">
</span><del>-.opPutByIdTransitionDirect:
- storei t1, JSCell::m_structureID[t0]
</del><ins>+macro noAdditionalChecks(oldStructure, scratch, slowPath)
+end
</ins><span class="cx">
</span><del>-.opPutByIdNotTransition:
- # The only thing live right now is t0, which holds the base.
- loadi 12[PC], t1
- loadConstantOrVariable(t1, t2, t3)
- loadi 20[PC], t1
- storePropertyAtVariableOffset(t1, t0, t2, t3)
- dispatch(9)
</del><ins>+macro structureChainChecks(oldStructure, scratch, slowPath)
+ const protoCell = oldStructure # Reusing the oldStructure register for the proto
</ins><span class="cx">
</span><del>-.opPutByIdSlow:
- callSlowPath(_llint_slow_path_put_by_id)
- dispatch(9)
</del><ins>+ loadp 28[PC], scratch
+ assert(macro (ok) btpnz scratch, ok end)
+ loadp StructureChain::m_vector[scratch], scratch
+ assert(macro (ok) btpnz scratch, ok end)
+ bieq Structure::m_prototype + TagOffset[oldStructure], NullTag, .done
+.loop:
+ loadi Structure::m_prototype + PayloadOffset[oldStructure], protoCell
+ loadp JSCell::m_structureID[protoCell], oldStructure
+ bpneq oldStructure, [scratch], slowPath
+ addp 4, scratch
+ bineq Structure::m_prototype + TagOffset[oldStructure], NullTag, .loop
+.done:
+end
</ins><span class="cx">
</span><ins>+_llint_op_put_by_id_transition_direct:
+ putByIdTransition(noAdditionalChecks, withInlineStorage)
</ins><span class="cx">
</span><ins>+
+_llint_op_put_by_id_transition_direct_out_of_line:
+ putByIdTransition(noAdditionalChecks, withOutOfLineStorage)
+
+
+_llint_op_put_by_id_transition_normal:
+ putByIdTransition(structureChainChecks, withInlineStorage)
+
+
+_llint_op_put_by_id_transition_normal_out_of_line:
+ putByIdTransition(structureChainChecks, withOutOfLineStorage)
+
+
</ins><span class="cx"> _llint_op_get_by_val:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadi 8[PC], t2
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (189759 => 189760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-09-14 23:40:07 UTC (rev 189759)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2015-09-14 23:44:33 UTC (rev 189760)
</span><span class="lines">@@ -468,16 +468,15 @@
</span><span class="cx"> storeq value, ValueProfile::m_buckets[scratch]
</span><span class="cx"> end
</span><span class="cx">
</span><del>-macro structureIDToStructureWithScratch(structureIDThenStructure, scratch)
</del><ins>+macro loadStructure(cell, structure)
+end
+
+macro loadStructureWithScratch(cell, structure, scratch)
</ins><span class="cx"> loadp CodeBlock[cfr], scratch
</span><span class="cx"> loadp CodeBlock::m_vm[scratch], scratch
</span><span class="cx"> loadp VM::heap + Heap::m_structureIDTable + StructureIDTable::m_table[scratch], scratch
</span><del>- loadp [scratch, structureIDThenStructure, 8], structureIDThenStructure
-end
-
-macro loadStructureWithScratch(cell, structure, scratch)
</del><span class="cx"> loadi JSCell::m_structureID[cell], structure
</span><del>- structureIDToStructureWithScratch(structure, scratch)
</del><ins>+ loadp [scratch, structure, 8], structure
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> macro loadStructureAndClobberFirstArg(cell, structure)
</span><span class="lines">@@ -1205,25 +1204,43 @@
</span><span class="cx"> storeq value, (firstOutOfLineOffset - 2) * 8[objectAndStorage, propertyOffsetAsInt, 8]
</span><span class="cx"> end
</span><span class="cx">
</span><del>-_llint_op_get_by_id:
</del><ins>+macro getById(getPropertyStorage)
</ins><span class="cx"> traceExecution()
</span><ins>+ # We only do monomorphic get_by_id caching for now, and we do not modify the
+ # opcode. We do, however, allow for the cache to change anytime if fails, since
+ # ping-ponging is free. At best we get lucky and the get_by_id will continue
+ # to take fast path on the new cache. At worst we take slow path, which is what
+ # we would have been doing anyway.
</ins><span class="cx"> loadisFromInstruction(2, t0)
</span><span class="cx"> loadConstantOrVariableCell(t0, t3, .opGetByIdSlow)
</span><del>- loadi JSCell::m_structureID[t3], t1
- loadisFromInstruction(4, t2)
- bineq t2, t1, .opGetByIdSlow
- loadisFromInstruction(5, t1)
- loadisFromInstruction(1, t2)
- loadPropertyAtVariableOffset(t1, t3, t0)
- storeq t0, [cfr, t2, 8]
- valueProfile(t0, 8, t1)
- dispatch(9)
</del><ins>+ loadStructureWithScratch(t3, t2, t1)
+ loadpFromInstruction(4, t1)
+ bpneq t2, t1, .opGetByIdSlow
+ getPropertyStorage(
+ t3,
+ t0,
+ macro (propertyStorage, scratch)
+ loadisFromInstruction(5, t2)
+ loadisFromInstruction(1, t1)
+ loadq [propertyStorage, t2], scratch
+ storeq scratch, [cfr, t1, 8]
+ valueProfile(scratch, 8, t1)
+ dispatch(9)
+ end)
+
+ .opGetByIdSlow:
+ callSlowPath(_llint_slow_path_get_by_id)
+ dispatch(9)
+end
</ins><span class="cx">
</span><del>-.opGetByIdSlow:
- callSlowPath(_llint_slow_path_get_by_id)
- dispatch(9)
</del><ins>+_llint_op_get_by_id:
+ getById(withInlineStorage)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+_llint_op_get_by_id_out_of_line:
+ getById(withOutOfLineStorage)
+
+
</ins><span class="cx"> _llint_op_get_array_length:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(2, t0)
</span><span class="lines">@@ -1247,67 +1264,99 @@
</span><span class="cx"> dispatch(9)
</span><span class="cx">
</span><span class="cx">
</span><del>-_llint_op_put_by_id:
</del><ins>+macro putById(getPropertyStorage)
</ins><span class="cx"> traceExecution()
</span><span class="cx"> writeBarrierOnOperands(1, 3)
</span><span class="cx"> loadisFromInstruction(1, t3)
</span><span class="cx"> loadConstantOrVariableCell(t3, t0, .opPutByIdSlow)
</span><del>- loadi JSCell::m_structureID[t0], t2
- loadisFromInstruction(4, t1)
- bineq t2, t1, .opPutByIdSlow
</del><ins>+ loadStructureWithScratch(t0, t2, t1)
+ loadpFromInstruction(4, t1)
+ bpneq t2, t1, .opPutByIdSlow
+ getPropertyStorage(
+ t0,
+ t3,
+ macro (propertyStorage, scratch)
+ loadisFromInstruction(5, t1)
+ loadisFromInstruction(3, t2)
+ loadConstantOrVariable(t2, scratch)
+ storeq scratch, [propertyStorage, t1]
+ dispatch(9)
+ end)
+end
</ins><span class="cx">
</span><del>- # At this point, we have:
- # t1, t2 -> current structure ID
- # t0 -> object base
</del><ins>+_llint_op_put_by_id:
+ putById(withInlineStorage)
</ins><span class="cx">
</span><del>- loadisFromInstruction(6, t1)
-
- btiz t1, .opPutByIdNotTransition
</del><ins>+.opPutByIdSlow:
+ callSlowPath(_llint_slow_path_put_by_id)
+ dispatch(9)
</ins><span class="cx">
</span><del>- # This is the transition case. t1 holds the new structureID. t2 holds the old structure ID.
- # If we have a chain, we need to check it. t0 is the base. We may clobber t1 to use it as
- # scratch.
- loadpFromInstruction(7, t3)
- btpz t3, .opPutByIdTransitionDirect
</del><span class="cx">
</span><del>- loadp StructureChain::m_vector[t3], t3
- assert(macro (ok) btpnz t3, ok end)
</del><ins>+_llint_op_put_by_id_out_of_line:
+ putById(withOutOfLineStorage)
</ins><span class="cx">
</span><del>- structureIDToStructureWithScratch(t2, t1)
- loadq Structure::m_prototype[t2], t2
- bqeq t2, ValueNull, .opPutByIdTransitionChainDone
-.opPutByIdTransitionChainLoop:
- # At this point, t2 contains a prototye, and [t3] contains the Structure* that we want that
- # prototype to have. We don't want to have to load the Structure* for t2. Instead, we load
- # the Structure* from [t3], and then we compare its id to the id in the header of t2.
- loadp [t3], t1
- loadi JSCell::m_structureID[t2], t2
- # Now, t1 has the Structure* and t2 has the StructureID that we want that Structure* to have.
- bineq t2, Structure::m_blob + StructureIDBlob::u.fields.structureID[t1], .opPutByIdSlow
- addp 8, t3
- loadq Structure::m_prototype[t1], t2
- bqneq t2, ValueNull, .opPutByIdTransitionChainLoop
</del><span class="cx">
</span><del>-.opPutByIdTransitionChainDone:
- # Reload the new structure, since we clobbered it above.
- loadisFromInstruction(6, t1)
</del><ins>+macro putByIdTransition(additionalChecks, getPropertyStorage)
+ traceExecution()
+ writeBarrierOnOperand(1)
+ loadisFromInstruction(1, t3)
+ loadpFromInstruction(4, t1)
+ loadConstantOrVariableCell(t3, t0, .opPutByIdSlow)
+ loadStructureWithScratch(t0, t2, t3)
+ bpneq t2, t1, .opPutByIdSlow
+ additionalChecks(t1, t3, t2)
+ loadisFromInstruction(3, t2)
+ loadisFromInstruction(5, t1)
+ getPropertyStorage(
+ t0,
+ t3,
+ macro (propertyStorage, scratch)
+ addp t1, propertyStorage, t3
+ loadConstantOrVariable(t2, t1)
+ storeq t1, [t3]
+ loadpFromInstruction(6, t1)
+ loadi Structure::m_blob + StructureIDBlob::u.words.word1[t1], t1
+ storei t1, JSCell::m_structureID[t0]
+ dispatch(9)
+ end)
+end
</ins><span class="cx">
</span><del>-.opPutByIdTransitionDirect:
- storei t1, JSCell::m_structureID[t0]
</del><ins>+macro noAdditionalChecks(oldStructure, scratch, scratch2)
+end
</ins><span class="cx">
</span><del>-.opPutByIdNotTransition:
- # The only thing live right now is t0, which holds the base.
- loadisFromInstruction(3, t1)
- loadConstantOrVariable(t1, t2)
- loadisFromInstruction(5, t1)
- storePropertyAtVariableOffset(t1, t0, t2)
- dispatch(9)
</del><ins>+macro structureChainChecks(oldStructure, scratch, scratch2)
+ const protoCell = oldStructure # Reusing the oldStructure register for the proto
+ loadpFromInstruction(7, scratch)
+ assert(macro (ok) btpnz scratch, ok end)
+ loadp StructureChain::m_vector[scratch], scratch
+ assert(macro (ok) btpnz scratch, ok end)
+ bqeq Structure::m_prototype[oldStructure], ValueNull, .done
+.loop:
+ loadq Structure::m_prototype[oldStructure], protoCell
+ loadStructureAndClobberFirstArg(protoCell, scratch2)
+ move scratch2, oldStructure
+ bpneq oldStructure, [scratch], .opPutByIdSlow
+ addp 8, scratch
+ bqneq Structure::m_prototype[oldStructure], ValueNull, .loop
+.done:
+end
</ins><span class="cx">
</span><del>-.opPutByIdSlow:
- callSlowPath(_llint_slow_path_put_by_id)
- dispatch(9)
</del><ins>+_llint_op_put_by_id_transition_direct:
+ putByIdTransition(noAdditionalChecks, withInlineStorage)
</ins><span class="cx">
</span><span class="cx">
</span><ins>+_llint_op_put_by_id_transition_direct_out_of_line:
+ putByIdTransition(noAdditionalChecks, withOutOfLineStorage)
+
+
+_llint_op_put_by_id_transition_normal:
+ putByIdTransition(structureChainChecks, withInlineStorage)
+
+
+_llint_op_put_by_id_transition_normal_out_of_line:
+ putByIdTransition(structureChainChecks, withOutOfLineStorage)
+
+
</ins><span class="cx"> _llint_op_get_by_val:
</span><span class="cx"> traceExecution()
</span><span class="cx"> loadisFromInstruction(2, t2)
</span></span></pre>
</div>
</div>
</body>
</html>