<!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>[37320] trunk/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/37320">37320</a></dd>
<dt>Author</dt> <dd>cwzwarich@webkit.org</dd>
<dt>Date</dt> <dd>2008-10-05 15:47:24 -0700 (Sun, 05 Oct 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-10-05  Cameron Zwarich  &lt;zwarich@apple.com&gt;

        Reviewed by Maciej Stachowiak.

        Bug 21364: Remove the branch in op_ret for OptionalCalleeActivation and OptionalCalleeArguments
        &lt;https://bugs.webkit.org/show_bug.cgi?id=21364&gt;

        This patch does not yet remove the branch, but it does a bit of refactoring
        so that a CodeGenerator now knows whether the associated CodeBlock will need
        a full scope before doing any code generation. This makes it possible to emit
        explicit tear-off instructions before every op_ret.

        * VM/CodeBlock.h:
        (JSC::CodeBlock::CodeBlock):
        * VM/CodeGenerator.cpp:
        (JSC::CodeGenerator::generate):
        (JSC::CodeGenerator::CodeGenerator):
        (JSC::CodeGenerator::emitPushScope):
        (JSC::CodeGenerator::emitPushNewScope):
        * kjs/nodes.h:
        (JSC::ScopeNode::needsActivation):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCoreVMCodeBlockh">trunk/JavaScriptCore/VM/CodeBlock.h</a></li>
<li><a href="#trunkJavaScriptCoreVMCodeGeneratorcpp">trunk/JavaScriptCore/VM/CodeGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCorekjsnodesh">trunk/JavaScriptCore/kjs/nodes.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (37319 => 37320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2008-10-05 21:57:05 UTC (rev 37319)
+++ trunk/JavaScriptCore/ChangeLog        2008-10-05 22:47:24 UTC (rev 37320)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2008-10-05  Cameron Zwarich  &lt;zwarich@apple.com&gt;
+
+        Reviewed by Maciej Stachowiak.
+
+        Bug 21364: Remove the branch in op_ret for OptionalCalleeActivation and OptionalCalleeArguments
+        &lt;https://bugs.webkit.org/show_bug.cgi?id=21364&gt;
+
+        This patch does not yet remove the branch, but it does a bit of refactoring
+        so that a CodeGenerator now knows whether the associated CodeBlock will need
+        a full scope before doing any code generation. This makes it possible to emit
+        explicit tear-off instructions before every op_ret.
+
+        * VM/CodeBlock.h:
+        (JSC::CodeBlock::CodeBlock):
+        * VM/CodeGenerator.cpp:
+        (JSC::CodeGenerator::generate):
+        (JSC::CodeGenerator::CodeGenerator):
+        (JSC::CodeGenerator::emitPushScope):
+        (JSC::CodeGenerator::emitPushNewScope):
+        * kjs/nodes.h:
+        (JSC::ScopeNode::needsActivation):
+
</ins><span class="cx"> 2008-10-05  Gavin Barraclough  &lt;barraclough@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Cameron Zwarich.
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CodeBlock.h (37319 => 37320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CodeBlock.h        2008-10-05 21:57:05 UTC (rev 37319)
+++ trunk/JavaScriptCore/VM/CodeBlock.h        2008-10-05 22:47:24 UTC (rev 37320)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">             , numConstants(0)
</span><span class="cx">             , numVars(0)
</span><span class="cx">             , numParameters(0)
</span><del>-            , needsFullScopeChain(ownerNode_-&gt;usesEval() || ownerNode_-&gt;containsClosures())
</del><ins>+            , needsFullScopeChain(ownerNode_-&gt;needsActivation())
</ins><span class="cx">             , usesEval(ownerNode_-&gt;usesEval())
</span><span class="cx">             , codeType(codeType_)
</span><span class="cx">             , source(source_)
</span></span></pre></div>
<a id="trunkJavaScriptCoreVMCodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/VM/CodeGenerator.cpp (37319 => 37320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/VM/CodeGenerator.cpp        2008-10-05 21:57:05 UTC (rev 37319)
+++ trunk/JavaScriptCore/VM/CodeGenerator.cpp        2008-10-05 22:47:24 UTC (rev 37320)
</span><span class="lines">@@ -131,16 +131,8 @@
</span><span class="cx"> {
</span><span class="cx">     m_codeBlock-&gt;thisRegister = m_thisRegister.index();
</span><span class="cx"> 
</span><del>-    if (m_shouldEmitDebugHooks)
-        m_codeBlock-&gt;needsFullScopeChain = true;
-
</del><span class="cx">     m_scopeNode-&gt;emitCode(*this);
</span><span class="cx"> 
</span><del>-    if (m_codeType == FunctionCode &amp;&amp; m_codeBlock-&gt;needsFullScopeChain) {
-        ASSERT(globalData()-&gt;machine-&gt;getOpcodeID(m_codeBlock-&gt;instructions[0].u.opcode) == op_enter);
-        m_codeBlock-&gt;instructions[0] = globalData()-&gt;machine-&gt;getOpcode(op_enter_with_activation);
-    }
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     if (s_dumpsGeneratedCode) {
</span><span class="cx">         JSGlobalObject* globalObject = m_scopeChain-&gt;globalObject();
</span><span class="lines">@@ -216,6 +208,9 @@
</span><span class="cx">     , m_globalData(&amp;scopeChain.globalObject()-&gt;globalExec()-&gt;globalData())
</span><span class="cx">     , m_lastOpcodeID(op_end)
</span><span class="cx"> {
</span><ins>+    if (m_shouldEmitDebugHooks)
+        m_codeBlock-&gt;needsFullScopeChain = true;
+
</ins><span class="cx">     emitOpcode(op_enter);
</span><span class="cx">     codeBlock-&gt;globalData = m_globalData;
</span><span class="cx"> 
</span><span class="lines">@@ -289,7 +284,14 @@
</span><span class="cx">     , m_globalData(&amp;scopeChain.globalObject()-&gt;globalExec()-&gt;globalData())
</span><span class="cx">     , m_lastOpcodeID(op_end)
</span><span class="cx"> {
</span><del>-    emitOpcode(op_enter);
</del><ins>+    if (m_shouldEmitDebugHooks)
+        m_codeBlock-&gt;needsFullScopeChain = true;
+
+    if (m_codeBlock-&gt;needsFullScopeChain)
+        emitOpcode(op_enter_with_activation);
+    else
+        emitOpcode(op_enter);
+
</ins><span class="cx">     codeBlock-&gt;globalData = m_globalData;
</span><span class="cx"> 
</span><span class="cx">     bool usesArguments = functionBody-&gt;usesArguments();
</span><span class="lines">@@ -347,6 +349,9 @@
</span><span class="cx">     , m_globalData(&amp;scopeChain.globalObject()-&gt;globalExec()-&gt;globalData())
</span><span class="cx">     , m_lastOpcodeID(op_end)
</span><span class="cx"> {
</span><ins>+    if (m_shouldEmitDebugHooks)
+        m_codeBlock-&gt;needsFullScopeChain = true;
+
</ins><span class="cx">     emitOpcode(op_enter);
</span><span class="cx">     codeBlock-&gt;globalData = m_globalData;
</span><span class="cx">     m_codeBlock-&gt;numParameters = 1; // Allocate space for &quot;this&quot;
</span><span class="lines">@@ -1200,7 +1205,6 @@
</span><span class="cx"> 
</span><span class="cx"> RegisterID* CodeGenerator::emitPushScope(RegisterID* scope)
</span><span class="cx"> {
</span><del>-    m_codeBlock-&gt;needsFullScopeChain = true;
</del><span class="cx">     ControlFlowContext context;
</span><span class="cx">     context.isFinallyBlock = false;
</span><span class="cx">     m_scopeContextStack.append(context);
</span><span class="lines">@@ -1416,7 +1420,6 @@
</span><span class="cx"> 
</span><span class="cx"> void CodeGenerator::emitPushNewScope(RegisterID* dst, Identifier&amp; property, RegisterID* value)
</span><span class="cx"> {
</span><del>-    m_codeBlock-&gt;needsFullScopeChain = true;
</del><span class="cx">     ControlFlowContext context;
</span><span class="cx">     context.isFinallyBlock = false;
</span><span class="cx">     m_scopeContextStack.append(context);
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsnodesh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/nodes.h (37319 => 37320)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/nodes.h        2008-10-05 21:57:05 UTC (rev 37319)
+++ trunk/JavaScriptCore/kjs/nodes.h        2008-10-05 22:47:24 UTC (rev 37320)
</span><span class="lines">@@ -2193,6 +2193,7 @@
</span><span class="cx">         bool usesArguments() const { return m_features &amp; ArgumentsFeature; }
</span><span class="cx">         void setUsesArguments() { m_features |= ArgumentsFeature; }
</span><span class="cx">         bool usesThis() const { return m_features &amp; ThisFeature; }
</span><ins>+        bool needsActivation() const { return m_features &amp; (EvalFeature | ClosureFeature | WithFeature | CatchFeature); }
</ins><span class="cx"> 
</span><span class="cx">         VarStack&amp; varStack() { return m_varStack; }
</span><span class="cx">         FunctionStack&amp; functionStack() { return m_functionStack; }
</span></span></pre>
</div>
</div>

</body>
</html>