Roll V8 back to 3.9.24.31

1 files changed, 14 insertions, 3 deletions

diff --git a/deps/v8/test/mjsunit/debug-evaluate-locals-optimized.js b/deps/v8/test/mjsunit/debug-evaluate-locals-optimized.js
index 9c56a12be..c88a683a8 100644
--- a/deps/v8/test/mjsunit/debug-evaluate-locals-optimized.js
+++ b/deps/v8/test/mjsunit/debug-evaluate-locals-optimized.js
@@ -138,9 +138,20 @@ function listener(event, exec_state, event_data, data) {
           assertFalse(frame.isConstructCall());
         }
 
-        if (i > 4) {
-          assertFalse(frame.isOptimizedFrame());
-          assertFalse(frame.isInlinedFrame());
+        // When function f is optimized (1 means YES, see runtime.cc) we
+        // expect an optimized frame for f with g1, g2 and g3 inlined.
+        if (%GetOptimizationStatus(f) == 1) {
+          if (i == 1 || i == 2 || i == 3) {
+            assertTrue(frame.isOptimizedFrame());
+            assertTrue(frame.isInlinedFrame());
+            assertEquals(4 - i, frame.inlinedFrameIndex());
+          } else if (i == 4) {
+            assertTrue(frame.isOptimizedFrame());
+            assertFalse(frame.isInlinedFrame());
+          } else {
+            assertFalse(frame.isOptimizedFrame());
+            assertFalse(frame.isInlinedFrame());
+          }
         }
       }