Stack allocate lexical locals + hoist stack slots

test/mjsunit/es6/debug-function-scopes.js

Index: test/mjsunit/es6/debug-function-scopes.js
diff --git a/test/mjsunit/es6/debug-function-scopes.js b/test/mjsunit/es6/debug-function-scopes.js
index 699bd5343d0ff2c5f8ab06d6b6b53be2b74f50f2..e7049ee3c0a77a5aa7ec9f0ad2dbe332ae02ae7a 100644
--- a/test/mjsunit/es6/debug-function-scopes.js
+++ b/test/mjsunit/es6/debug-function-scopes.js
@@ -107,13 +107,10 @@ var f2 = (function() {
 
 var mirror = Debug.MakeMirror(f2);
 
-assertEquals(6, mirror.scopeCount());
-
-// Implementation artifact: l4 isn't used in closure, but still it is saved.
-CheckScope(mirror.scope(0), { l4: 11 }, ScopeType.Block);
+assertEquals(5, mirror.scopeCount());
 
-CheckScope(mirror.scope(1), { l3: 9 }, ScopeType.Block);
-CheckScope(mirror.scope(2), { l1: 6, l2: 7 }, ScopeType.Block);
-CheckScope(mirror.scope(3), { v1:3, l0: 0, v3: 5, v6: 11 }, ScopeType.Closure);
-CheckScope(mirror.scope(4), { top_level_let: 255 }, ScopeType.Script);
-CheckScope(mirror.scope(5), {}, ScopeType.Global);
+CheckScope(mirror.scope(0), { l3: 9 }, ScopeType.Block);
+CheckScope(mirror.scope(1), { l2: 7 }, ScopeType.Block);
+CheckScope(mirror.scope(2), { v1:3, l0: 0, v3: 5, v6: 11 }, ScopeType.Closure);
+CheckScope(mirror.scope(3), { top_level_let: 255 }, ScopeType.Script);
+CheckScope(mirror.scope(4), {}, ScopeType.Global);