[V8] Add name of function for function's closure scope

test/mjsunit/debug-scopes.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
@@ skipping 127 matching lines @@
     }
     var found = false;
     for (var j = 0; j < response.refs.length && !found; j++) {
       found = response.refs[j].handle == response.body.scopes[i].object.ref;
     }
     assertTrue(found, "Scope object " + response.body.scopes[i].object.ref + " not found");
   }
 }
 
 
+// Check that the scope chain contains the expected names of scopes.
+function CheckScopeChainNames(names, exec_state) {
+  var all_scopes = exec_state.frame().allScopes();
+  assertEquals(names.length, exec_state.frame().scopeCount());
+  assertEquals(names.length, all_scopes.length, "FrameMirror.allScopes length");
+  for (var i = 0; i < names.length; i++) {
+    var scope = exec_state.frame().scope(i);
+    assertTrue(scope.isScope());
+    assertScopeMirrorEquals(all_scopes[i], scope);

[yurys, 2015/09/29 08:24:00]

I think we can omit this check here as it is unrelated to the name and already
tested elsewhere. Same for allCopes.length vs. scopeCount since allScopes() is
just a shortcut to get all scopes at once as an array.

[kozy, 2015/09/29 15:15:32]

Done.

+    assertEquals(scope.details().name(), names[i])
+  }
+}
+
+
 // Check that the content of the scope is as expected. For functions just check
 // that there is a function.
 function CheckScopeContent(content, number, exec_state) {
   var scope = exec_state.frame().scope(number);
   var count = 0;
   for (var p in content) {
     var property_mirror = scope.scopeObject().property(p);
     assertFalse(property_mirror.isUndefined(), 'property ' + p + ' not found in scope');
     if (typeof(content[p]) === 'function') {
       assertTrue(property_mirror.value().isFunction());
@@ skipping 352 matching lines @@
   };
   return f;
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({a:1}, 1, exec_state);
+  CheckScopeChainNames([undefined, "closure_1", undefined, undefined], exec_state)
 };
 closure_1(1)();
 EndTest();
 
 
 // Simple closure formed by returning an inner function referering the outer
 // functions arguments. Due to VM optimizations parts of the actual closure is
 // missing from the debugger information.
 BeginTest("Closure 2");
 
 function closure_2(a, b) {
   var x = a + 2;
   var y = b + 2;
   function f() {
     debugger;
     return a + x;
   };
   return f;
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({a:1,x:3}, 1, exec_state);
+  CheckScopeChainNames([undefined, "closure_2", undefined, undefined], exec_state)
 };
 closure_2(1, 2)();
 EndTest();
 
 
 // Simple closure formed by returning an inner function referering the outer
 // functions arguments. Using all arguments and locals from the outer function
 // in the inner function makes these part of the debugger information on the
 // closure.
 BeginTest("Closure 3");
 
 function closure_3(a, b) {
   var x = a + 2;
   var y = b + 2;
   function f() {
     debugger;
     return a + b + x + y;
   };
   return f;
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({a:1,b:2,x:3,y:4}, 1, exec_state);
+  CheckScopeChainNames([undefined, "closure_3", undefined, undefined], exec_state)
 };
 closure_3(1, 2)();
 EndTest();
 
 
 
 // Simple closure formed by returning an inner function referering the outer
 // functions arguments. Using all arguments and locals from the outer function
 // in the inner function makes these part of the debugger information on the
 // closure. Use the inner function as well...
@@ skipping 10 matching lines @@
   };
   return f;
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({a:1,b:2,x:3,y:4,f:function(){}}, 1, exec_state);
+  CheckScopeChainNames([undefined, "closure_4", undefined, undefined], exec_state)
 };
 closure_4(1, 2)();
 EndTest();
 
 
 
 // Simple closure formed by returning an inner function referering the outer
 // functions arguments. In the presence of eval all arguments and locals
 // (including the inner function itself) from the outer function becomes part of
 // the debugger infformation on the closure.
 BeginTest("Closure 5");
 
 function closure_5(a, b) {
   var x = 3;
   var y = 4;
   function f() {
     eval('');
     debugger;
     return 1;
   };
   return f;
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({a:1,b:2,x:3,y:4,f:function(){}}, 1, exec_state);
+  CheckScopeChainNames(["f", "closure_5", undefined, undefined], exec_state)
 };
 closure_5(1, 2)();
 EndTest();
 
 
 // Two closures. Due to optimizations only the parts actually used are provided
 // through the debugger information.
 BeginTest("Closure 6");
 function closure_6(a, b) {
   function f(a, b) {
@@ skipping 11 matching lines @@
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({a:1}, 1, exec_state);
   CheckScopeContent({f:function(){}}, 2, exec_state);
+  CheckScopeChainNames([undefined, "f", "closure_6", undefined, undefined], exec_state)
 };
 closure_6(1, 2)();
 EndTest();
 
 
 // Two closures. In the presence of eval all information is provided as the
 // compiler cannot determine which parts are used.
 BeginTest("Closure 7");
 function closure_7(a, b) {
   var x = 3;
@@ skipping 16 matching lines @@
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({}, 0, exec_state);
   CheckScopeContent({a:1,b:2,x:3,y:4,i:5,j:6}, 1, exec_state);
   CheckScopeContent({a:1,b:2,x:3,y:4,i:5,j:6,f:function(){}}, 2, exec_state);
+  CheckScopeChainNames([undefined, "f", "closure_7", undefined, undefined], exec_state)
 };
 closure_7(1, 2)();
 EndTest();
 
 
 // Closure that may be optimized out.
 BeginTest("Closure 8");
 function closure_8() {
   (function inner(x) {
     debugger;
   })(2);
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({x: 2}, 0, exec_state);
+  CheckScopeChainNames([undefined, undefined, undefined], exec_state)
 };
 closure_8();
 EndTest();
 
 
 BeginTest("Closure 9");
 function closure_9() {
   eval("var y = 1;");
   eval("var z = 1;");
   (function inner(x) {
     y++;
     z++;
     debugger;
   })(2);
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
+  CheckScopeChainNames([undefined, "closure_9", undefined, undefined], exec_state)
 };
 closure_9();
 EndTest();
 
 
 // Test a mixture of scopes.
 BeginTest("The full monty");
 function the_full_monty(a, b) {
   var x = 3;
   var y = 4;
@@ skipping 28 matching lines @@
                    debug.ScopeType.Closure,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({b:16}, 0, exec_state);
   CheckScopeContent({a:15}, 1, exec_state);
   CheckScopeContent({x:14}, 2, exec_state);
   CheckScopeContent({j:13}, 3, exec_state);
   CheckScopeContent({a:1,b:2,x:9,y:10,i:11,j:12}, 4, exec_state);
   CheckScopeContent({a:1,b:2,x:3,y:4,i:5,j:6,f:function(){}}, 5, exec_state);
+  CheckScopeChainNames([undefined, undefined, undefined, "f", "f", "the_full_monty", undefined, undefined], exec_state)
 };
 the_full_monty(1, 2)();
 EndTest();
 
 
 BeginTest("Closure inside With 1");
 function closure_in_with_1() {
   with({x:1}) {
     (function inner(x) {
       debugger;
@@ skipping 27 matching lines @@
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.With,
                    debug.ScopeType.Local,
                    debug.ScopeType.With,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({x: 3}, 0, exec_state);
   CheckScopeContent({x: 2}, 1, exec_state);
   CheckScopeContent({x: 1}, 2, exec_state);
+  CheckScopeChainNames(["inner", "inner", "closure_in_with_2", "closure_in_with_2", undefined, undefined], exec_state)
 };
 closure_in_with_2();
 EndTest();
 
 
 BeginTest("Closure inside With 3");
 function createClosure(a) {
    var b = a + 1;
    return function closure() {
      var c = b;
@@ skipping 10 matching lines @@
   f();
 }
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.With,
                    debug.ScopeType.Local,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Closure,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
+  CheckScopeChainNames(["inner", "inner", "closure", "createClosure", undefined, undefined], exec_state)
 }
 closure_in_with_3();
 EndTest();
 
 
 BeginTest("Closure inside With 4");
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.With,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({x: 2}, 0, exec_state);
   CheckScopeContent({x: 1}, 1, exec_state);
+  CheckScopeChainNames([undefined, undefined, undefined, undefined], exec_state)
 };
 
 with({x:1}) {
   (function(x) {
     debugger;
   })(2);
 }
 EndTest();
 
 
 // Test global scope.
 BeginTest("Global");
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Script, debug.ScopeType.Global], exec_state);
+  CheckScopeChainNames([undefined, undefined], exec_state)
 };
 debugger;
 EndTest();
 
 
 BeginTest("Catch block 1");
 function catch_block_1() {
   try {
     throw 'Exception';
   } catch (e) {
     debugger;
   }
 };
 
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Catch,
                    debug.ScopeType.Local,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({e:'Exception'}, 0, exec_state);
+  CheckScopeChainNames(["catch_block_1", undefined, undefined, undefined], exec_state)
 };
 catch_block_1();
 EndTest();
 
 
 BeginTest("Catch block 2");
 function catch_block_2() {
   try {
     throw 'Exception';
   } catch (e) {
     with({n:10}) {
       debugger;
     }
   }
 };
 
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.With,
                    debug.ScopeType.Catch,
                    debug.ScopeType.Local,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({n:10}, 0, exec_state);
   CheckScopeContent({e:'Exception'}, 1, exec_state);
+  CheckScopeChainNames(["catch_block_2", "catch_block_2", "catch_block_2", undefined, undefined], exec_state)
 };
 catch_block_2();
 EndTest();
 
 
 BeginTest("Catch block 3");
 function catch_block_3() {
   // Do eval to dynamically declare a local variable so that the context's
   // extension slot is initialized with JSContextExtensionObject.
   eval("var y = 78;");
   try {
     throw 'Exception';
   } catch (e) {
     debugger;
   }
 };
 
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Catch,
                    debug.ScopeType.Local,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({e:'Exception'}, 0, exec_state);
   CheckScopeContent({y:78}, 1, exec_state);
+  CheckScopeChainNames(["catch_block_3", "catch_block_3", undefined, undefined], exec_state)
 };
 catch_block_3();
 EndTest();
 
 
 BeginTest("Catch block 4");
 function catch_block_4() {
   // Do eval to dynamically declare a local variable so that the context's
   // extension slot is initialized with JSContextExtensionObject.
   eval("var y = 98;");
   try {
     throw 'Exception';
   } catch (e) {
     with({n:10}) {
       debugger;
     }
   }
 };
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.With,
                    debug.ScopeType.Catch,
                    debug.ScopeType.Local,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({n:10}, 0, exec_state);
   CheckScopeContent({e:'Exception'}, 1, exec_state);
   CheckScopeContent({y:98}, 2, exec_state);
+  CheckScopeChainNames(["catch_block_4", "catch_block_4", "catch_block_4", undefined, undefined], exec_state)
 };
 catch_block_4();
 EndTest();
 
 
 // Test catch in global scope.
 BeginTest("Catch block 5");
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Catch,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({e:'Exception'}, 0, exec_state);
+  CheckScopeChainNames([undefined, undefined, undefined], exec_state)
 };
 
 try {
   throw 'Exception';
 } catch (e) {
   debugger;
 }
 
 EndTest();
 
 
 // Closure inside catch in global code.
 BeginTest("Catch block 6");
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Catch,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({x: 2}, 0, exec_state);
   CheckScopeContent({e:'Exception'}, 1, exec_state);
+  CheckScopeChainNames([undefined, undefined, undefined, undefined], exec_state)
 };
 
 try {
   throw 'Exception';
 } catch (e) {
   (function(x) {
     debugger;
   })(2);
 }
 EndTest();
@@ skipping 10 matching lines @@
   }
 };
 
 
 listener_delegate = function(exec_state) {
   CheckScopeChain([debug.ScopeType.Catch,
                    debug.ScopeType.Local,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({e:'Exception'}, 0, exec_state);
+  CheckScopeChainNames(["catch_block_7", undefined, undefined, undefined], exec_state)
 };
 catch_block_7();
 EndTest();
 
 
 BeginTest("Classes and methods 1");
 
 listener_delegate = function(exec_state) {
   "use strict"
   CheckScopeChain([debug.ScopeType.Local,
                    debug.ScopeType.Script,
                    debug.ScopeType.Global], exec_state);
   CheckScopeContent({}, 1, exec_state);
+  CheckScopeChainNames([undefined, undefined, undefined], exec_state)
 };
 
 (function() {
   "use strict";
   class C1 {
     m() {
       debugger;
     }
   }
   new C1().m();
 })();
 
 EndTest();
 
 
 assertEquals(begin_test_count, break_count,
              'one or more tests did not enter the debugger');
 assertEquals(begin_test_count, end_test_count,
              'one or more tests did not have its result checked');