<!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>[172598] 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/172598">172598</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-08-14 12:28:55 -0700 (Thu, 14 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update scope resolution to assume that the parent activation is always there
https://bugs.webkit.org/show_bug.cgi?id=135947
Reviewed by Andreas Kling.
Another incremental step in removing the idea of lazily created
activations.
* dfg/DFGSpeculativeJIT32_64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* dfg/DFGSpeculativeJIT64.cpp:
(JSC::DFG::SpeculativeJIT::compile):
* jit/JITPropertyAccess.cpp:
(JSC::JIT::emitResolveClosure):
* jit/JITPropertyAccess32_64.cpp:
(JSC::JIT::emitResolveClosure):
* llint/LowLevelInterpreter32_64.asm:
* llint/LowLevelInterpreter64.asm:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.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="#trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm</a></li>
<li><a href="#trunkSourceJavaScriptCorellintLowLevelInterpreter64asm">trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172597 => 172598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-14 18:54:56 UTC (rev 172597)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-14 19:28:55 UTC (rev 172598)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-08-14 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><ins>+ Update scope resolution to assume that the parent activation is always there
+ https://bugs.webkit.org/show_bug.cgi?id=135947
+
+ Reviewed by Andreas Kling.
+
+ Another incremental step in removing the idea of lazily created
+ activations.
+
+ * dfg/DFGSpeculativeJIT32_64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * dfg/DFGSpeculativeJIT64.cpp:
+ (JSC::DFG::SpeculativeJIT::compile):
+ * jit/JITPropertyAccess.cpp:
+ (JSC::JIT::emitResolveClosure):
+ * jit/JITPropertyAccess32_64.cpp:
+ (JSC::JIT::emitResolveClosure):
+ * llint/LowLevelInterpreter32_64.asm:
+ * llint/LowLevelInterpreter64.asm:
+
+2014-08-14 Oliver Hunt <oliver@apple.com>
+
</ins><span class="cx"> Create activations eagerly
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135942
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (172597 => 172598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-08-14 18:54:56 UTC (rev 172597)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-08-14 19:28:55 UTC (rev 172598)
</span><span class="lines">@@ -3517,13 +3517,7 @@
</span><span class="cx"> GPRTemporary result(this, Reuse, scope);
</span><span class="cx"> GPRReg resultGPR = result.gpr();
</span><span class="cx"> m_jit.move(scope.gpr(), resultGPR);
</span><del>- JITCompiler::Jump activationNotCreated =
- m_jit.branchTestPtr(
- JITCompiler::Zero,
- JITCompiler::payloadFor(
- static_cast<VirtualRegister>(m_jit.graph().machineActivationRegister())));
</del><span class="cx"> m_jit.loadPtr(JITCompiler::Address(resultGPR, JSScope::offsetOfNext()), resultGPR);
</span><del>- activationNotCreated.link(&m_jit);
</del><span class="cx"> cellResult(resultGPR, node);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp (172597 => 172598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-08-14 18:54:56 UTC (rev 172597)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp 2014-08-14 19:28:55 UTC (rev 172598)
</span><span class="lines">@@ -3627,13 +3627,7 @@
</span><span class="cx"> GPRTemporary result(this, Reuse, scope);
</span><span class="cx"> GPRReg resultGPR = result.gpr();
</span><span class="cx"> m_jit.move(scope.gpr(), resultGPR);
</span><del>- JITCompiler::Jump activationNotCreated =
- m_jit.branchTest64(
- JITCompiler::Zero,
- JITCompiler::addressFor(
- static_cast<VirtualRegister>(m_jit.graph().machineActivationRegister())));
</del><span class="cx"> m_jit.loadPtr(JITCompiler::Address(resultGPR, JSScope::offsetOfNext()), resultGPR);
</span><del>- activationNotCreated.link(&m_jit);
</del><span class="cx"> cellResult(resultGPR, node);
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (172597 => 172598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-08-14 18:54:56 UTC (rev 172597)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-08-14 19:28:55 UTC (rev 172598)
</span><span class="lines">@@ -596,9 +596,7 @@
</span><span class="cx"> emitGetVirtualRegister(JSStack::ScopeChain, regT0);
</span><span class="cx"> if (m_codeBlock->needsActivation()) {
</span><span class="cx"> emitGetVirtualRegister(m_codeBlock->activationRegister(), regT1);
</span><del>- Jump noActivation = branchTestPtr(Zero, regT1);
</del><span class="cx"> loadPtr(Address(regT0, JSScope::offsetOfNext()), regT0);
</span><del>- noActivation.link(this);
</del><span class="cx"> }
</span><span class="cx"> for (unsigned i = 0; i < depth; ++i)
</span><span class="cx"> loadPtr(Address(regT0, JSScope::offsetOfNext()), regT0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccess32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp (172597 => 172598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2014-08-14 18:54:56 UTC (rev 172597)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp 2014-08-14 19:28:55 UTC (rev 172598)
</span><span class="lines">@@ -619,9 +619,7 @@
</span><span class="cx"> emitLoadPayload(JSStack::ScopeChain, regT0);
</span><span class="cx"> if (m_codeBlock->needsActivation()) {
</span><span class="cx"> emitLoadPayload(m_codeBlock->activationRegister().offset(), regT2);
</span><del>- Jump noActivation = branchTestPtr(Zero, regT2);
</del><span class="cx"> loadPtr(Address(regT2, JSScope::offsetOfNext()), regT0);
</span><del>- noActivation.link(this);
</del><span class="cx"> }
</span><span class="cx"> for (unsigned i = 0; i < depth; ++i)
</span><span class="cx"> loadPtr(Address(regT0, JSScope::offsetOfNext()), regT0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter32_64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm (172597 => 172598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-08-14 18:54:56 UTC (rev 172597)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-08-14 19:28:55 UTC (rev 172598)
</span><span class="lines">@@ -2170,7 +2170,6 @@
</span><span class="cx"> loadisFromInstruction(4, t2)
</span><span class="cx"> btbz CodeBlock::m_needsActivation[t0], .resolveScopeAfterActivationCheck
</span><span class="cx"> loadis CodeBlock::m_activationRegister[t0], t1
</span><del>- btpz PayloadOffset[cfr, t1, 8], .resolveScopeAfterActivationCheck
</del><span class="cx"> addi 1, t2
</span><span class="cx">
</span><span class="cx"> .resolveScopeAfterActivationCheck:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorellintLowLevelInterpreter64asm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm (172597 => 172598)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-08-14 18:54:56 UTC (rev 172597)
+++ trunk/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-08-14 19:28:55 UTC (rev 172598)
</span><span class="lines">@@ -2043,7 +2043,6 @@
</span><span class="cx"> loadisFromInstruction(4, t2)
</span><span class="cx"> btbz CodeBlock::m_needsActivation[t0], .resolveScopeAfterActivationCheck
</span><span class="cx"> loadis CodeBlock::m_activationRegister[t0], t1
</span><del>- btpz [cfr, t1, 8], .resolveScopeAfterActivationCheck
</del><span class="cx"> addi 1, t2
</span><span class="cx">
</span><span class="cx"> .resolveScopeAfterActivationCheck:
</span></span></pre>
</div>
</div>
</body>
</html>