<!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>[42734] 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/42734">42734</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2009-04-21 17:18:33 -0700 (Tue, 21 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>2009-04-21  Geoffrey Garen  &lt;ggaren@apple.com&gt;

        Reviewed by Cameron Zwarich and Oliver Hunt.
        
        Re-Fixed &lt;rdar://problem/6406045&gt; REGRESSION: Stack overflow on PowerPC on
        fast/workers/use-machine-stack.html (22531)
        
        SunSpider reports no change.
        
        Use a larger recursion limit on the main thread (because we can, and
        there's some evidence that it may improve compatibility), and a smaller
        recursion limit on secondary threads (because they tend to have smaller
        stacks).

        * interpreter/Interpreter.cpp:
        (JSC::Interpreter::execute):
        (JSC::Interpreter::prepareForRepeatCall):
        * interpreter/Interpreter.h:
        (JSC::): Ditto. I wrote the recursion test slightly funny, so that the
        common case remains a simple compare to constant.

        * runtime/ArrayPrototype.cpp:
        (JSC::arrayProtoFuncToString):
        (JSC::arrayProtoFuncToLocaleString):
        (JSC::arrayProtoFuncJoin): Conservatively, set the array recursion limits
        to the lower, secondary thread limit. We can do something fancier if
        compatibility moves us, but this seems sufficient for now.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJavaScriptCoreChangeLog">trunk/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkJavaScriptCoreinterpreterInterpretercpp">trunk/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkJavaScriptCoreinterpreterInterpreterh">trunk/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li><a href="#trunkJavaScriptCoreruntimeArrayPrototypecpp">trunk/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/ChangeLog (42733 => 42734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/ChangeLog        2009-04-22 00:11:59 UTC (rev 42733)
+++ trunk/JavaScriptCore/ChangeLog        2009-04-22 00:18:33 UTC (rev 42734)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2009-04-21  Geoffrey Garen  &lt;ggaren@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Cameron Zwarich and Oliver Hunt.
+        
+        Re-Fixed &lt;rdar://problem/6406045&gt; REGRESSION: Stack overflow on PowerPC on
+        fast/workers/use-machine-stack.html (22531)
+        
+        SunSpider reports no change.
+        
+        Use a larger recursion limit on the main thread (because we can, and
+        there's some evidence that it may improve compatibility), and a smaller
+        recursion limit on secondary threads (because they tend to have smaller
+        stacks).
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::execute):
+        (JSC::Interpreter::prepareForRepeatCall):
+        * interpreter/Interpreter.h:
+        (JSC::): Ditto. I wrote the recursion test slightly funny, so that the
+        common case remains a simple compare to constant.
+
+        * runtime/ArrayPrototype.cpp:
+        (JSC::arrayProtoFuncToString):
+        (JSC::arrayProtoFuncToLocaleString):
+        (JSC::arrayProtoFuncJoin): Conservatively, set the array recursion limits
+        to the lower, secondary thread limit. We can do something fancier if
+        compatibility moves us, but this seems sufficient for now.
+
+2009-04-21  Geoffrey Garen  &lt;ggaren@apple.com&gt;
+
</ins><span class="cx">         Rubber-stamped by Adam Roben.
</span><span class="cx">         
</span><span class="cx">         Disabled one more Mozilla JS test because it fails intermittently on Windows.
</span></span></pre></div>
<a id="trunkJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/interpreter/Interpreter.cpp (42733 => 42734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/interpreter/Interpreter.cpp        2009-04-22 00:11:59 UTC (rev 42733)
+++ trunk/JavaScriptCore/interpreter/Interpreter.cpp        2009-04-22 00:18:33 UTC (rev 42734)
</span><span class="lines">@@ -32,12 +32,14 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;Arguments.h&quot;
</span><span class="cx"> #include &quot;BatchedTransitionOptimizer.h&quot;
</span><ins>+#include &quot;CallFrame.h&quot;
</ins><span class="cx"> #include &quot;CallFrameClosure.h&quot;
</span><span class="cx"> #include &quot;CodeBlock.h&quot;
</span><ins>+#include &quot;Collector.h&quot;
+#include &quot;Debugger.h&quot;
</ins><span class="cx"> #include &quot;DebuggerCallFrame.h&quot;
</span><span class="cx"> #include &quot;EvalCodeCache.h&quot;
</span><span class="cx"> #include &quot;ExceptionHelpers.h&quot;
</span><del>-#include &quot;CallFrame.h&quot;
</del><span class="cx"> #include &quot;GlobalEvalFunction.h&quot;
</span><span class="cx"> #include &quot;JSActivation.h&quot;
</span><span class="cx"> #include &quot;JSArray.h&quot;
</span><span class="lines">@@ -48,16 +50,15 @@
</span><span class="cx"> #include &quot;JSStaticScopeObject.h&quot;
</span><span class="cx"> #include &quot;JSString.h&quot;
</span><span class="cx"> #include &quot;ObjectPrototype.h&quot;
</span><ins>+#include &quot;Operations.h&quot;
</ins><span class="cx"> #include &quot;Parser.h&quot;
</span><span class="cx"> #include &quot;Profiler.h&quot;
</span><span class="cx"> #include &quot;RegExpObject.h&quot;
</span><span class="cx"> #include &quot;RegExpPrototype.h&quot;
</span><span class="cx"> #include &quot;Register.h&quot;
</span><del>-#include &quot;Collector.h&quot;
-#include &quot;Debugger.h&quot;
-#include &quot;Operations.h&quot;
</del><span class="cx"> #include &quot;SamplingTool.h&quot;
</span><span class="cx"> #include &lt;stdio.h&gt;
</span><ins>+#include &lt;wtf/Threading.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx"> #include &quot;JIT.h&quot;
</span><span class="lines">@@ -582,9 +583,11 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!scopeChain-&gt;globalData-&gt;exception);
</span><span class="cx"> 
</span><del>-    if (m_reentryDepth &gt;= MaxReentryDepth) {
-        *exception = createStackOverflowError(callFrame);
-        return jsNull();
</del><ins>+    if (m_reentryDepth &gt;= MaxSecondaryThreadReentryDepth) {
+        if (!isMainThread() || m_reentryDepth &gt;= MaxMainThreadReentryDepth) {
+            *exception = createStackOverflowError(callFrame);
+            return jsNull();
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     CodeBlock* codeBlock = &amp;programNode-&gt;bytecode(scopeChain);
</span><span class="lines">@@ -643,9 +646,11 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!scopeChain-&gt;globalData-&gt;exception);
</span><span class="cx"> 
</span><del>-    if (m_reentryDepth &gt;= MaxReentryDepth) {
-        *exception = createStackOverflowError(callFrame);
-        return jsNull();
</del><ins>+    if (m_reentryDepth &gt;= MaxSecondaryThreadReentryDepth) {
+        if (!isMainThread() || m_reentryDepth &gt;= MaxMainThreadReentryDepth) {
+            *exception = createStackOverflowError(callFrame);
+            return jsNull();
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     Register* oldEnd = m_registerFile.end();
</span><span class="lines">@@ -705,9 +710,11 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!scopeChain-&gt;globalData-&gt;exception);
</span><span class="cx">     
</span><del>-    if (m_reentryDepth &gt;= MaxReentryDepth) {
-        *exception = createStackOverflowError(callFrame);
-        return CallFrameClosure();
</del><ins>+    if (m_reentryDepth &gt;= MaxSecondaryThreadReentryDepth) {
+        if (!isMainThread() || m_reentryDepth &gt;= MaxMainThreadReentryDepth) {
+            *exception = createStackOverflowError(callFrame);
+            return CallFrameClosure();
+        }
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     Register* oldEnd = m_registerFile.end();
</span><span class="lines">@@ -780,9 +787,11 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(!scopeChain-&gt;globalData-&gt;exception);
</span><span class="cx"> 
</span><del>-    if (m_reentryDepth &gt;= MaxReentryDepth) {
-        *exception = createStackOverflowError(callFrame);
-        return jsNull();
</del><ins>+    if (m_reentryDepth &gt;= MaxSecondaryThreadReentryDepth) {
+        if (!isMainThread() || m_reentryDepth &gt;= MaxMainThreadReentryDepth) {
+            *exception = createStackOverflowError(callFrame);
+            return jsNull();
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     DynamicGlobalObjectScope globalObjectScope(callFrame, callFrame-&gt;globalData().dynamicGlobalObject ? callFrame-&gt;globalData().dynamicGlobalObject : scopeChain-&gt;globalObject());
</span></span></pre></div>
<a id="trunkJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/interpreter/Interpreter.h (42733 => 42734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/interpreter/Interpreter.h        2009-04-22 00:11:59 UTC (rev 42733)
+++ trunk/JavaScriptCore/interpreter/Interpreter.h        2009-04-22 00:18:33 UTC (rev 42734)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx">         WillExecuteStatement
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    enum { MaxReentryDepth = 64 };
</del><ins>+    enum { MaxMainThreadReentryDepth = 256, MaxSecondaryThreadReentryDepth = 32 };
</ins><span class="cx"> 
</span><span class="cx">     class Interpreter {
</span><span class="cx">         friend class JIT;
</span></span></pre></div>
<a id="trunkJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/JavaScriptCore/runtime/ArrayPrototype.cpp (42733 => 42734)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JavaScriptCore/runtime/ArrayPrototype.cpp        2009-04-22 00:11:59 UTC (rev 42733)
+++ trunk/JavaScriptCore/runtime/ArrayPrototype.cpp        2009-04-22 00:18:33 UTC (rev 42734)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx">     JSObject* thisObj = asArray(thisValue);
</span><span class="cx"> 
</span><span class="cx">     HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;globalData().arrayVisitedElements;
</span><del>-    if (arrayVisitedElements.size() &gt; MaxReentryDepth)
</del><ins>+    if (arrayVisitedElements.size() &gt; MaxSecondaryThreadReentryDepth)
</ins><span class="cx">         return throwError(exec, RangeError, &quot;Maximum call stack size exceeded.&quot;);
</span><span class="cx"> 
</span><span class="cx">     bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">     JSObject* thisObj = asArray(thisValue);
</span><span class="cx"> 
</span><span class="cx">     HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;globalData().arrayVisitedElements;
</span><del>-    if (arrayVisitedElements.size() &gt; MaxReentryDepth)
</del><ins>+    if (arrayVisitedElements.size() &gt; MaxSecondaryThreadReentryDepth)
</ins><span class="cx">         return throwError(exec, RangeError, &quot;Maximum call stack size exceeded.&quot;);
</span><span class="cx"> 
</span><span class="cx">     bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx">     JSObject* thisObj = thisValue.toThisObject(exec);
</span><span class="cx"> 
</span><span class="cx">     HashSet&lt;JSObject*&gt;&amp; arrayVisitedElements = exec-&gt;globalData().arrayVisitedElements;
</span><del>-    if (arrayVisitedElements.size() &gt; MaxReentryDepth)
</del><ins>+    if (arrayVisitedElements.size() &gt; MaxSecondaryThreadReentryDepth)
</ins><span class="cx">         return throwError(exec, RangeError, &quot;Maximum call stack size exceeded.&quot;);
</span><span class="cx"> 
</span><span class="cx">     bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
</span></span></pre>
</div>
</div>

</body>
</html>