Support for global var shortcuts in script contexts.

test/mjsunit/call-counts.js

Index: test/mjsunit/call-counts.js
diff --git a/test/mjsunit/call-counts.js b/test/mjsunit/call-counts.js
index 628d2251e2b0210b507370fc61675b4afa234e1c..d1488245f118633ff6b91e85ac35f60ab78038ba 100644
--- a/test/mjsunit/call-counts.js
+++ b/test/mjsunit/call-counts.js
@@ -6,35 +6,38 @@
 
 // Locations in the type feedback vector where call counts are maintained for
 // the two calls made from bar();
-const kFooCallExtraIndex = 5;
-const kArrayCallExtraIndex = 9;
-
-function GetCallCount(func, slot) {
-  var vector = %GetTypeFeedbackVector(func);
-  // Call counts are recorded doubled.
-  var value = %FixedArrayGet(vector, slot);
-  return Math.floor(value / 2);
-}
-
-function foo(a) { return a[3] * 16; }
-
-function bar(a) {
-  var result = 0;
-  for (var i = 0; i < 10; i++) {
-    result = foo(a);
-    if (i % 2 === 0) {
-      var r = Array();
-      r[0] = 1;
-      result += r[0];
+
+(function() {
+  const kFooCallExtraIndex = 5;
+  const kArrayCallExtraIndex = 7;
+
+  function GetCallCount(func, slot) {
+    var vector = %GetTypeFeedbackVector(func);
+    // Call counts are recorded doubled.
+    var value = %FixedArrayGet(vector, slot);
+    return Math.floor(value / 2);
+  }
+
+  function foo(a) { return a[3] * 16; }
+
+  function bar(a) {
+    var result = 0;
+    for (var i = 0; i < 10; i++) {
+      result = foo(a);
+      if (i % 2 === 0) {
+        var r = Array();
+        r[0] = 1;
+        result += r[0];
+      }
     }
+    return result;
   }
-  return result;
-}
 
-var a = [1, 2, 3];
-bar(a);
-assertEquals(10, GetCallCount(bar, kFooCallExtraIndex));
-assertEquals(5, GetCallCount(bar, kArrayCallExtraIndex));
+  var a = [1, 2, 3];
+  bar(a);
+  assertEquals(10, GetCallCount(bar, kFooCallExtraIndex));
+  assertEquals(5, GetCallCount(bar, kArrayCallExtraIndex));
 
-%OptimizeFunctionOnNextCall(bar);
-bar(a);
+  %OptimizeFunctionOnNextCall(bar);
+  bar(a);
+})();