<!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>[180453] trunk/LayoutTests</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/180453">180453</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 14:21:47 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Layout Test js/regress-141098.html is failing on 32-bit Machines
https://bugs.webkit.org/show_bug.cgi?id=141848
Reviewed by Geoffrey Garen.
It appears that different control flow paths in probeAndRecurse() allowed the second time
through the test to recurse deeper before getting to the point of overflowing the stack.
Restructured the test so that the exact same control flow in probeAndRecurse() is used
both times we call it, including probing the depth of the stack. Now we pass a flag that
indicates whether or not we should try ever expanding eval strings or reuse the most
recent eval string.
* js/script-tests/regress-141098.js:
(testEval):
(probeAndRecurse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsregress141098js">trunk/LayoutTests/js/script-tests/regress-141098.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180452 => 180453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-02-20 21:51:37 UTC (rev 180452)
+++ trunk/LayoutTests/ChangeLog 2015-02-20 22:21:47 UTC (rev 180453)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-02-20 Michael Saboff <msaboff@apple.com>
+
+ Layout Test js/regress-141098.html is failing on 32-bit Machines
+ https://bugs.webkit.org/show_bug.cgi?id=141848
+
+ Reviewed by Geoffrey Garen.
+
+ It appears that different control flow paths in probeAndRecurse() allowed the second time
+ through the test to recurse deeper before getting to the point of overflowing the stack.
+ Restructured the test so that the exact same control flow in probeAndRecurse() is used
+ both times we call it, including probing the depth of the stack. Now we pass a flag that
+ indicates whether or not we should try ever expanding eval strings or reuse the most
+ recent eval string.
+
+ * js/script-tests/regress-141098.js:
+ (testEval):
+ (probeAndRecurse):
+
</ins><span class="cx"> 2015-02-20 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip failing JSC stress test to get bots green.
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsregress141098js"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/regress-141098.js (180452 => 180453)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/regress-141098.js 2015-02-20 21:51:37 UTC (rev 180452)
+++ trunk/LayoutTests/js/script-tests/regress-141098.js 2015-02-20 22:21:47 UTC (rev 180453)
</span><span class="lines">@@ -1,5 +1,3 @@
</span><del>-//@ skip
-
</del><span class="cx"> description("Regression test for https://webkit.org/b/141098. Make sure eval() properly handles running out of stack space. This test should run without crashing.");
</span><span class="cx">
</span><span class="cx"> // The tiering up to test higher levels of optimization will only test the DFG
</span><span class="lines">@@ -12,9 +10,9 @@
</span><span class="cx"> var result;
</span><span class="cx"> var count = 1;
</span><span class="cx">
</span><del>- if (!maxIterations) {
</del><ins>+ if (!maxIterations)
</ins><span class="cx"> var result = eval(lastEvalString);
</span><del>- } else {
</del><ins>+ else {
</ins><span class="cx"> for (var iter = 0; iter < maxIterations; count *= 4, iter++) {
</span><span class="cx"> var evalString = "\"dummy\".valueOf(";
</span><span class="cx">
</span><span class="lines">@@ -26,7 +24,8 @@
</span><span class="cx">
</span><span class="cx"> evalString += ");";
</span><span class="cx">
</span><del>- lastEvalString = evalString;
</del><ins>+ if (maxIterations > 1)
+ lastEvalString = evalString;
</ins><span class="cx"> result = eval(evalString);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -34,33 +33,30 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function probeAndRecurse(depth)
</del><ins>+function probeAndRecurse(depth, reuseEvalString)
</ins><span class="cx"> {
</span><span class="cx"> var result;
</span><span class="cx">
</span><span class="cx"> // Probe stack depth
</span><del>- if (depth > 0) {
- try {
- result = probeAndRecurse(depth+1);
</del><ins>+ try {
+ result = probeAndRecurse(depth+1, reuseEvalString);
</ins><span class="cx">
</span><del>- if (!result) {
- try {
- testEval(1);
- } catch (e) {
- return -49;
- }
- } else
- return result + 1
- } catch (e) {
- // We exceeded stack space, now return up the stack until we can execute a simple eval.
- // Then run an eval test to exceed stack.
- return -49;
- }
- } else if (depth != 0)
- return probeAndRecurse(depth+1);
</del><ins>+ if (!result) {
+ try {
+ testEval(1);
+ } catch (e) {
+ return -49;
+ }
+ } else
+ return result + 1
+ } catch (e) {
+ // We exceeded stack space, now return up the stack until we can execute a simple eval.
+ // Then run an eval test to exceed stack.
+ return -49;
+ }
</ins><span class="cx">
</span><span class="cx"> try {
</span><del>- testEval((depth > 0) ? 20 : 0);
</del><ins>+ testEval(reuseEvalString ? 0 : 20);
</ins><span class="cx"> } catch (e) {
</span><span class="cx"> testPassed("Exception: " + e);
</span><span class="cx"> }
</span><span class="lines">@@ -68,7 +64,7 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-var depth = probeAndRecurse(1);
</del><ins>+var depth = probeAndRecurse(0, false);
</ins><span class="cx">
</span><span class="cx"> // Tier up the eval'ed code.
</span><span class="cx"> // When run with run-jsc-stress-tests and it's agressive options, this low of a count will
</span><span class="lines">@@ -76,4 +72,4 @@
</span><span class="cx"> for (var i = 0; i < 200; i++)
</span><span class="cx"> testEval(0);
</span><span class="cx">
</span><del>-probeAndRecurse(-depth);
</del><ins>+probeAndRecurse(0, true);
</ins></span></pre>
</div>
</div>
</body>
</html>