Remove unwarranted assumptions about inlining from a debugger test.

test/mjsunit/debug-evaluate-locals-optimized.js

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 28 matching lines @@
   { locals: {a1: 3, b1: 4}, args: { names: ["i", "x1", "y1"], values: [1, 5, 6] } },
   { locals: {a2: 5, b2: 6}, args: { names: ["i"], values: [2] } },
   { locals: {a3: 7, b3: 8}, args: { names: ["i", "x3", "y3", "z3"], values: [3, 9, 10, undefined] } },
   { locals: {a4: 9, b4: 10}, args: { names: ["i", "x4", "y4"], values: [4, 11, 12] } }
 ];
 
 function arraySum(arr) {
   return arr.reduce(function (a, b) { return a + b; }, 0);
 }
 
+function isCurrentlyOptimized(fun) {
+  // See runtime.cc.
+  return (%GetOptimizationStatus(fun) & 1) != 0;
+}
+
 function listener(event, exec_state, event_data, data) {
   try {
     if (event == Debug.DebugEvent.Break)
     {
       assertEquals(6, exec_state.frameCount());
 
       for (var i = 0; i < exec_state.frameCount(); i++) {
         var frame = exec_state.frame(i);
         if (i < exec_state.frameCount() - 1) {
           var expected_args = expected[i].args;
@@ skipping 72 matching lines @@
 
         // Check for construct call.
         if (i == 4) {
           assertEquals(testingConstructCall, frame.isConstructCall());
         } else if (i == 2) {
           assertTrue(frame.isConstructCall());
         } else {
           assertFalse(frame.isConstructCall());
         }
 
-        // 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());
-          }
+        if (i > 4) {
+          assertFalse(frame.isOptimizedFrame());
+          assertFalse(frame.isInlinedFrame());
         }
       }
 
+      // When function f is optimized we expect an optimized frame for f.  We
+      // can't say whether or not the top 3 frames (g1, g2 and g3) are
+      // optimized and inlined.
+      var frame4 = exec_state.frame(4);
+       
+      if (isCurrentlyOptimized(f)) {
+        assertTrue(frame4.isOptimizedFrame());
+        assertFalse(frame4.isInlinedFrame());
+      }
+
       // Indicate that all was processed.
       listenerComplete = true;
     }
   } catch (e) {
     exception = e.toString() + e.stack;
   };
 };
 
 for (var i = 0; i < 4; i++) f(expected.length - 1, 11, 12);
 %OptimizeFunctionOnNextCall(f);
@@ skipping 40 matching lines @@
 new f(expected.length - 1, 11, 12, 0);
 
 // Make sure that the debug event listener was invoked.
 assertFalse(exception, "exception in listener " + exception)
 assertTrue(listenerComplete);
 
 // Throw away type information for next run.
 gc();
 
 Debug.setListener(null);