Revert of Debugger: use FrameInspector in ScopeIterator to find context.

test/mjsunit/es6/debug-blockscopes.js

 // Copyright 2011 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
 //       with the distribution.
 //     * Neither the name of Google Inc. nor the names of its
 //       contributors may be used to endorse or promote products derived
 //       from this software without specific prior written permission.
 //
 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Flags: --expose-debug-as debug --allow-natives-syntax
+// Flags: --expose-debug-as debug
 // The functions used for testing backtraces. They are at the top to make the
 // testing of source line/column easier.
 
 "use strict";
 
 // Get the Debug object exposed from the debug context global object.
 var Debug = debug.Debug;
 
 var test_name;
 var listener_delegate;
@@ skipping 141 matching lines @@
     assertTrue(response.body.object.ref >= 0);
   }
   var found = false;
   for (var i = 0; i < response.refs.length && !found; i++) {
     found = response.refs[i].handle == response.body.object.ref;
   }
   assertTrue(found, "Scope object " + response.body.object.ref + " not found");
 }
 
 
-function assertEqualsUnlessOptimized(expected, value, f) {
-  try {
-    assertEquals(expected, value);
-  } catch (e) {
-    assertOptimized(f);
-  }
-}
-
 // Simple empty block scope in local scope.
 BeginTest("Local block 1");
 
 function local_block_1() {
   {
     debugger;
   }
 }
 
 listener_delegate = function(exec_state) {
@@ skipping 310 matching lines @@
 EndTest();
 
 
 // Block scopes shadowing
 BeginTest("Block scopes shadowing 1");
 function shadowing_1() {
   let i = 0;
   {
     let i = 5;
     debugger;
-    assertEqualsUnlessOptimized(27, i, shadowing_1);
+    assertEquals(27, i);
   }
   assertEquals(0, i);
   debugger;
-  assertEqualsUnlessOptimized(27, i, shadowing_1);
+  assertEquals(27, i);
 }
 
 listener_delegate = function (exec_state) {
   exec_state.frame(0).evaluate("i = 27");
 }
 shadowing_1();
 EndTest();
 
 
 // Block scopes shadowing
 BeginTest("Block scopes shadowing 2");
 function shadowing_2() {
   let i = 0;
   {
     let j = 5;
     debugger;
-    assertEqualsUnlessOptimized(27, j, shadowing_2);
+    assertEquals(27, j);
   }
-  assertEqualsUnlessOptimized(0, i, shadowing_2);
+  assertEquals(0, i);
 }
 
 listener_delegate = function (exec_state) {
   exec_state.frame(0).evaluate("j = 27");
 }
 shadowing_2();
 EndTest();