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

test/mjsunit/es6/debug-blockscopes.js

Index: test/mjsunit/es6/debug-blockscopes.js
diff --git a/test/mjsunit/es6/debug-blockscopes.js b/test/mjsunit/es6/debug-blockscopes.js
index 3f890ebd546d2edba74066f0fd5e5c031ce91ec6..31208d41f43bf3d63a2530624b362bafc4eb5ab5 100644
--- a/test/mjsunit/es6/debug-blockscopes.js
+++ b/test/mjsunit/es6/debug-blockscopes.js
@@ -25,7 +25,7 @@
 // (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.
 
@@ -187,14 +187,6 @@
 }
 
 
-function assertEqualsUnlessOptimized(expected, value, f) {
-  try {
-    assertEquals(expected, value);
-  } catch (e) {
-    assertOptimized(f);
-  }
-}
-
 // Simple empty block scope in local scope.
 BeginTest("Local block 1");
 
@@ -525,11 +517,11 @@
   {
     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) {
@@ -546,9 +538,9 @@
   {
     let j = 5;
     debugger;
-    assertEqualsUnlessOptimized(27, j, shadowing_2);
-  }
-  assertEqualsUnlessOptimized(0, i, shadowing_2);
+    assertEquals(27, j);
+  }
+  assertEquals(0, i);
 }
 
 listener_delegate = function (exec_state) {