Rename Context::global to Context::global_object,

src/x64/stub-cache-x64.cc

Index: src/x64/stub-cache-x64.cc
diff --git a/src/x64/stub-cache-x64.cc b/src/x64/stub-cache-x64.cc
index 5c23a1d96f616895cdcd32ff3870ef541723b698..9d4b93e2b67a2a6886f8ed18abed7fc74f03ac84 100644
--- a/src/x64/stub-cache-x64.cc
+++ b/src/x64/stub-cache-x64.cc
@@ -228,7 +228,7 @@ void StubCompiler::GenerateLoadGlobalFunctionPrototype(MacroAssembler* masm,
                                                        Register prototype) {
   // Load the global or builtins object from the current context.
   __ movq(prototype,
-             Operand(rsi, Context::SlotOffset(Context::GLOBAL_INDEX)));
+             Operand(rsi, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX)));

[Michael Starzinger, 2012/08/17 12:44:57]

Indentation seems off.

[rossberg, 2012/08/17 12:55:44]

Done.

   // Load the native context from the global or builtins object.
   __ movq(prototype,
              FieldOperand(prototype, GlobalObject::kNativeContextOffset));
@@ -249,8 +249,8 @@ void StubCompiler::GenerateDirectLoadGlobalFunctionPrototype(
     Label* miss) {
   Isolate* isolate = masm->isolate();
   // Check we're still in the same context.
-  __ Move(prototype, isolate->global());
-  __ cmpq(Operand(rsi, Context::SlotOffset(Context::GLOBAL_INDEX)),
+  __ Move(prototype, isolate->global_object());
+  __ cmpq(Operand(rsi, Context::SlotOffset(Context::GLOBAL_OBJECT_INDEX)),
           prototype);
   __ j(not_equal, miss);
   // Get the global function with the given index.