Changeset 180453 in webkit

Timestamp:

Feb 20, 2015 2:21:47 PM (9 years ago)

Author:

msaboff@apple.com

Message:

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):

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• js/script-tests/regress-141098.js (modified) (6 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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):
+
 2015-02-20  Brent Fulgham  <bfulgham@apple.com>
 

trunk/LayoutTests/js/script-tests/regress-141098.js

@@ -1 @@
-//@ skip
-
 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.");
 
@@ -13 +11 @@
     var count = 1;
 
-    if (!maxIterations) {
+    if (!maxIterations)
         var result = eval(lastEvalString);
-    } else {
+    else {
         for (var iter = 0; iter < maxIterations; count *= 4, iter++) {
             var evalString = "\"dummy\".valueOf(";
@@ -27 +25 @@
             evalString +=  ");";
 
-            lastEvalString = evalString;
+            if (maxIterations > 1)
+                lastEvalString = evalString;
             result = eval(evalString);
         }
@@ -35 +34 @@
 }
 
-function probeAndRecurse(depth)
+function probeAndRecurse(depth, reuseEvalString)
 {
     var result;
 
     // Probe stack depth
-    if (depth > 0) {
-        try {
-            result = probeAndRecurse(depth+1);
+    try {
+        result = probeAndRecurse(depth+1, reuseEvalString);
 
-            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);
+        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;
+    }
 
     try {
-        testEval((depth > 0) ? 20 : 0);
+        testEval(reuseEvalString ? 0 : 20);
     } catch (e) {
         testPassed("Exception: " + e);
@@ -69 +65 @@
 }
 
-var depth = probeAndRecurse(1);
+var depth = probeAndRecurse(0, false);
 
 // Tier up the eval'ed code.
@@ -77 +73 @@
     testEval(0);
 
-probeAndRecurse(-depth);
+probeAndRecurse(0, true);