<!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>[47519] 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/47519">47519</a></dd>
<dt>Author</dt> <dd>barraclough@apple.com</dd>
<dt>Date</dt> <dd>2009-08-19 12:54:55 -0700 (Wed, 19 Aug 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre> We probably shouldn't be keeping the AST for eval nodes around forevar.
https://bugs.webkit.org/show_bug.cgi?id=28469

Reviewed by Darin Adler.

EvalNodes don't destroyData() (delete their parser data) since they need to hold onto
their varStack.  Copy a list of variable onto EvalCodeBlock, and this can go away.

* bytecode/CodeBlock.h:
(JSC::EvalCodeBlock::variable):
(JSC::EvalCodeBlock::numVariables):
(JSC::EvalCodeBlock::adoptVariables):
* bytecompiler/BytecodeGenerator.cpp:
(JSC::BytecodeGenerator::BytecodeGenerator):
* interpreter/Interpreter.cpp:
(JSC::Interpreter::execute):
* parser/Nodes.h:
* runtime/Executable.cpp:
(JSC::EvalExecutable::generateBytecode):
* runtime/Executable.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorebytecodeCodeBlockh">trunk/JavaScriptCore/bytecode/CodeBlock.h</a></li>
<li><a href="#trunkJavaScriptCorebytecompilerBytecodeGeneratorcpp">trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp</a></li>
<li><a href="#trunkJavaScriptCoreinterpreterInterpretercpp">trunk/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkJavaScriptCoreparserNodesh">trunk/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeExecutablecpp">trunk/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkJavaScriptCoreruntimeExecutableh">trunk/JavaScriptCore/runtime/Executable.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (47518 => 47519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2009-08-19 19:31:33 UTC (rev 47518)
+++ trunk/JavaScriptCore/ChangeLog        2009-08-19 19:54:55 UTC (rev 47519)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2009-08-19  Gavin Barraclough  &lt;barraclough@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+         We probably shouldn't be keeping the AST for eval nodes around forevar.
+        https://bugs.webkit.org/show_bug.cgi?id=28469
+
+        EvalNodes don't destroyData() (delete their parser data) since they need to hold onto
+        their varStack.  Copy a list of variable onto EvalCodeBlock, and this can go away.
+
+        * bytecode/CodeBlock.h:
+        (JSC::EvalCodeBlock::variable):
+        (JSC::EvalCodeBlock::numVariables):
+        (JSC::EvalCodeBlock::adoptVariables):
+        * bytecompiler/BytecodeGenerator.cpp:
+        (JSC::BytecodeGenerator::BytecodeGenerator):
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::execute):
+        * parser/Nodes.h:
+        * runtime/Executable.cpp:
+        (JSC::EvalExecutable::generateBytecode):
+        * runtime/Executable.h:
+
</ins><span class="cx"> 2009-08-19  Jungshik Shin  &lt;jshin@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin Adler.
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecodeCodeBlockh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/bytecode/CodeBlock.h (47518 => 47519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bytecode/CodeBlock.h        2009-08-19 19:31:33 UTC (rev 47518)
+++ trunk/JavaScriptCore/bytecode/CodeBlock.h        2009-08-19 19:54:55 UTC (rev 47519)
</span><span class="lines">@@ -598,8 +598,17 @@
</span><span class="cx"> 
</span><span class="cx">         int baseScopeDepth() const { return m_baseScopeDepth; }
</span><span class="cx"> 
</span><ins>+        const Identifier&amp; variable(unsigned index) { return m_variables[index]; }
+        unsigned numVariables() { return m_variables.size(); }
+        void adoptVariables(Vector&lt;Identifier&gt;&amp; variables)
+        {
+            ASSERT(m_variables.isEmpty());
+            m_variables.swap(variables);
+        }
+
</ins><span class="cx">     private:
</span><span class="cx">         int m_baseScopeDepth;
</span><ins>+        Vector&lt;Identifier&gt; m_variables;
</ins><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     class FunctionCodeBlock : public CodeBlock {
</span></span></pre></div>
<a id="trunkJavaScriptCorebytecompilerBytecodeGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp (47518 => 47519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2009-08-19 19:31:33 UTC (rev 47518)
+++ trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp        2009-08-19 19:54:55 UTC (rev 47519)
</span><span class="lines">@@ -403,6 +403,14 @@
</span><span class="cx">         m_codeBlock-&gt;addFunctionDecl(adoptRef(new FunctionExecutable(function-&gt;ident(), function)));
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    const DeclarationStacks::VarStack&amp; varStack = evalNode-&gt;varStack();
+    unsigned numVariables = varStack.size();
+    Vector&lt;Identifier&gt; variables;
+    variables.reserveCapacity(numVariables);
+    for (size_t i = 0; i &lt; numVariables; ++i)
+        variables.append(varStack[i].first);
+    codeBlock-&gt;adoptVariables(variables);
+
</ins><span class="cx">     preserveLastVar();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/interpreter/Interpreter.cpp (47518 => 47519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/interpreter/Interpreter.cpp        2009-08-19 19:31:33 UTC (rev 47518)
+++ trunk/JavaScriptCore/interpreter/Interpreter.cpp        2009-08-19 19:54:55 UTC (rev 47519)
</span><span class="lines">@@ -836,10 +836,9 @@
</span><span class="cx"> 
</span><span class="cx">         BatchedTransitionOptimizer optimizer(variableObject);
</span><span class="cx"> 
</span><del>-        const DeclarationStacks::VarStack&amp; varStack = static_cast&lt;EvalExecutable*&gt;(codeBlock-&gt;ownerExecutable())-&gt;varStack();
-        DeclarationStacks::VarStack::const_iterator varStackEnd = varStack.end();
-        for (DeclarationStacks::VarStack::const_iterator it = varStack.begin(); it != varStackEnd; ++it) {
-            const Identifier&amp; ident = (*it).first;
</del><ins>+        unsigned numVariables = codeBlock-&gt;numVariables();
+        for (unsigned i = 0; i &lt; numVariables; ++i) {
+            const Identifier&amp; ident = codeBlock-&gt;variable(i);
</ins><span class="cx">             if (!variableObject-&gt;hasProperty(callFrame, ident)) {
</span><span class="cx">                 PutPropertySlot slot;
</span><span class="cx">                 variableObject-&gt;put(callFrame, ident, jsUndefined(), slot);
</span></span></pre></div>
<a id="trunkJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/parser/Nodes.h (47518 => 47519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/parser/Nodes.h        2009-08-19 19:31:33 UTC (rev 47518)
+++ trunk/JavaScriptCore/parser/Nodes.h        2009-08-19 19:54:55 UTC (rev 47519)
</span><span class="lines">@@ -1462,13 +1462,6 @@
</span><span class="cx">     public:
</span><span class="cx">         static PassRefPtr&lt;EvalNode&gt; create(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, const SourceCode&amp;, CodeFeatures, int numConstants);
</span><span class="cx"> 
</span><del>-        void partialDestroyData()
-        {
-            // Eval code needs to hang on to its declaration stacks to keep declaration info alive until Interpreter::execute time,
-            // so the entire ScopeNodeData cannot be destoyed.
-            children().clear();
-        }
-
</del><span class="cx">     private:
</span><span class="cx">         EvalNode(JSGlobalData*, SourceElements*, VarStack*, FunctionStack*, const SourceCode&amp;, CodeFeatures, int numConstants);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Executable.cpp (47518 => 47519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Executable.cpp        2009-08-19 19:31:33 UTC (rev 47518)
+++ trunk/JavaScriptCore/runtime/Executable.cpp        2009-08-19 19:54:55 UTC (rev 47519)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">     OwnPtr&lt;BytecodeGenerator&gt; generator(new BytecodeGenerator(evalNode(), globalObject-&gt;debugger(), scopeChain, &amp;m_evalCodeBlock-&gt;symbolTable(), m_evalCodeBlock));
</span><span class="cx">     generator-&gt;generate();
</span><span class="cx">     
</span><del>-    evalNode()-&gt;partialDestroyData();
</del><ins>+    evalNode()-&gt;destroyData();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ProgramExecutable::generateBytecode(ScopeChainNode* scopeChainNode)
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/Executable.h (47518 => 47519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/Executable.h        2009-08-19 19:31:33 UTC (rev 47518)
+++ trunk/JavaScriptCore/runtime/Executable.h        2009-08-19 19:54:55 UTC (rev 47519)
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx"> 
</span><span class="cx">         virtual ExceptionInfo* reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*) = 0;
</span><span class="cx"> 
</span><del>-        ScopeNode* astNode() { return m_node.get(); }
-
</del><span class="cx">     protected:
</span><span class="cx">         RefPtr&lt;ScopeNode&gt; m_node;
</span><span class="cx">         SourceCode m_source;
</span><span class="lines">@@ -109,8 +107,6 @@
</span><span class="cx">             return *m_evalCodeBlock;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        DeclarationStacks::VarStack&amp; varStack() { return m_node-&gt;varStack(); }
-
</del><span class="cx">         ExceptionInfo* reparseExceptionInfo(JSGlobalData*, ScopeChainNode*, CodeBlock*);
</span><span class="cx"> 
</span><span class="cx">     private:
</span></span></pre>
</div>
</div>

</body>
</html>