<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[28545] trunk/JavaScriptCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/28545">28545</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2007-12-07 16:23:31 -0800 (Fri, 07 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Sam Weinig.
        
        Fixed crash seen running layout tests.
        
        Reverted a change I made earlier today. Added a comment to try to
        discourage myself from making this mistake a third time.

        * kjs/function.cpp:
        (KJS::ActivationImp::mark):
        * kjs/function.h:
        (KJS::ActivationImp::ActivationImpData::ActivationImpData):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCorekjsfunctioncpp">trunk/JavaScriptCore/kjs/function.cpp</a></li>
<li><a href="#trunkJavaScriptCorekjsfunctionh">trunk/JavaScriptCore/kjs/function.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (28544 => 28545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2007-12-08 00:22:27 UTC (rev 28544)
+++ trunk/JavaScriptCore/ChangeLog        2007-12-08 00:23:31 UTC (rev 28545)
</span><span class="lines">@@ -2,6 +2,20 @@
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Sam Weinig.
</span><span class="cx">         
</span><ins>+        Fixed crash seen running layout tests.
+        
+        Reverted a change I made earlier today. Added a comment to try to
+        discourage myself from making this mistake a third time.
+
+        * kjs/function.cpp:
+        (KJS::ActivationImp::mark):
+        * kjs/function.h:
+        (KJS::ActivationImp::ActivationImpData::ActivationImpData):
+
+2007-12-07  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
+        Reviewed by Sam Weinig.
+        
</ins><span class="cx">         Refactored parsing of global code: Removed the assumption that 
</span><span class="cx">         ProgramNode inherits from FunctionBodyNode from the parser.
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsfunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/function.cpp (28544 => 28545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/function.cpp        2007-12-08 00:22:27 UTC (rev 28544)
+++ trunk/JavaScriptCore/kjs/function.cpp        2007-12-08 00:23:31 UTC (rev 28545)
</span><span class="lines">@@ -420,6 +420,9 @@
</span><span class="cx"> void ActivationImp::mark()
</span><span class="cx"> {
</span><span class="cx">     JSVariableObject::mark();
</span><ins>+    
+    if (!d()-&gt;function-&gt;marked())
+        d()-&gt;function-&gt;mark();
</ins><span class="cx"> 
</span><span class="cx">     if (d()-&gt;argumentsObject &amp;&amp; !d()-&gt;argumentsObject-&gt;marked())
</span><span class="cx">         d()-&gt;argumentsObject-&gt;mark();
</span></span></pre></div>
<a id="trunkJavaScriptCorekjsfunctionh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/kjs/function.h (28544 => 28545)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/kjs/function.h        2007-12-08 00:22:27 UTC (rev 28544)
+++ trunk/JavaScriptCore/kjs/function.h        2007-12-08 00:23:31 UTC (rev 28545)
</span><span class="lines">@@ -146,11 +146,13 @@
</span><span class="cx">         ActivationImpData(ExecState* e)
</span><span class="cx">             : JSVariableObjectData(&amp;e-&gt;function()-&gt;body-&gt;symbolTable())
</span><span class="cx">             , exec(e)
</span><ins>+            , function(e-&gt;function()) // Store this pointer for marking, to keep our symbol table / scope alive after exec has gone out of scope.
</ins><span class="cx">             , argumentsObject(0)
</span><span class="cx">         {
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         ExecState* exec;
</span><ins>+        FunctionImp* function;
</ins><span class="cx">         Arguments* argumentsObject;
</span><span class="cx">     };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>