Allocate block-scoped global bindings to global context.

test/cctest/test-decls.cc

 // Copyright 2007-2008 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 768 matching lines @@
   { SimpleContext context;
     context.Check("var x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("this.x",
                   EXPECT_RESULT, Number::New(1));
   }
 
   { SimpleContext context;
+    context.Check("function x() { return 4 }; x()",
+                  EXPECT_RESULT, Number::New(4));
+    context.Check("x()",
+                  EXPECT_RESULT, Number::New(4));
+    context.Check("this.x()",
+                  EXPECT_RESULT, Number::New(4));
+  }
+
+  { SimpleContext context;
     context.Check("let x = 2; x",
                   EXPECT_RESULT, Number::New(2));
     context.Check("x",
                   EXPECT_RESULT, Number::New(2));
-    context.Check("this.x",
-                  EXPECT_RESULT, Number::New(2));
+    // TODO(rossberg): The current ES6 draft spec does not reflect lexical
+    // bindings on the global object. However, this will probably change, in
+    // which case we reactivate the following test.
+    // context.Check("this.x",
+    //               EXPECT_RESULT, Number::New(2));
   }
 
   { SimpleContext context;
     context.Check("const x = 3; x",
                   EXPECT_RESULT, Number::New(3));
     context.Check("x",
                   EXPECT_RESULT, Number::New(3));
-    context.Check("this.x",
-                  EXPECT_RESULT, Number::New(3));
-  }
-
-  { SimpleContext context;
-    context.Check("function x() { return 4 }; x()",
-                  EXPECT_RESULT, Number::New(4));
-    context.Check("x()",
-                  EXPECT_RESULT, Number::New(4));
-    context.Check("this.x()",
-                  EXPECT_RESULT, Number::New(4));
+    // TODO(rossberg): The current ES6 draft spec does not reflect lexical
+    // bindings on the global object. However, this will probably change, in
+    // which case we reactivate the following test.
+    // context.Check("this.x",
+    //              EXPECT_RESULT, Number::New(3));
   }
 
   // TODO(rossberg): All of the below should actually be errors in Harmony.
 
   { SimpleContext context;
     context.Check("var x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("let x = 2; x",
                   EXPECT_RESULT, Number::New(2));
   }
@@ skipping 16 matching lines @@
     context.Check("function x() { return 1 }; x()",
                   EXPECT_RESULT, Number::New(1));
     context.Check("const x = 2; x",
                   EXPECT_RESULT, Number::New(2));
   }
 
   { SimpleContext context;
     context.Check("let x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("var x = 2; x",
-                  EXPECT_RESULT, Number::New(2));
+                  EXPECT_ERROR);
   }
 
   { SimpleContext context;
     context.Check("let x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("let x = 2; x",
-                  EXPECT_RESULT, Number::New(2));
+                  EXPECT_ERROR);
   }
 
   { SimpleContext context;
     context.Check("let x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("const x = 2; x",
-                  EXPECT_RESULT, Number::New(2));
+                  EXPECT_ERROR);
   }
 
   { SimpleContext context;
     context.Check("let x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("function x() { return 2 }; x()",
-                  EXPECT_RESULT, Number::New(2));
+                  EXPECT_ERROR);
   }
 
   { SimpleContext context;
     context.Check("const x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("var x = 2; x",
-                  EXPECT_RESULT, Number::New(1));
+                  EXPECT_ERROR);
   }
 
   { SimpleContext context;
     context.Check("const x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("let x = 2; x",
-                  EXPECT_EXCEPTION);
+                  EXPECT_ERROR);
   }
 
   { SimpleContext context;
     context.Check("const x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("const x = 2; x",
-                  EXPECT_RESULT, Number::New(1));
+                  EXPECT_ERROR);
   }
 
   { SimpleContext context;
     context.Check("const x = 1; x",
                   EXPECT_RESULT, Number::New(1));
     context.Check("function x() { return 2 }; x()",
-                  EXPECT_EXCEPTION);
+                  EXPECT_ERROR);
   }
 }