Merge GlobalObject with JSGlobalObject.

src/compiler/access-builder.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/compiler/access-builder.h"
 
 #include "src/contexts.h"
 #include "src/frames.h"
 #include "src/heap/heap.h"
 #include "src/type-cache.h"
@@ skipping 121 matching lines @@
 
 // static
 FieldAccess AccessBuilder::ForStringLength() {
   FieldAccess access = {kTaggedBase, String::kLengthOffset, Handle<Name>(),
                         TypeCache::Get().kStringLengthType, kMachAnyTagged};
   return access;
 }
 
 
 // static
-FieldAccess AccessBuilder::ForGlobalObjectGlobalProxy() {
-  FieldAccess access = {kTaggedBase, GlobalObject::kGlobalProxyOffset,
+FieldAccess AccessBuilder::ForJSGlobalObjectGlobalProxy() {
+  FieldAccess access = {kTaggedBase, JSGlobalObject::kGlobalProxyOffset,
                         Handle<Name>(), Type::Receiver(), kMachAnyTagged};
   return access;
 }
 
 
 // static
-FieldAccess AccessBuilder::ForGlobalObjectNativeContext() {
-  FieldAccess access = {kTaggedBase, GlobalObject::kNativeContextOffset,
+FieldAccess AccessBuilder::ForJSGlobalObjectNativeContext() {
+  FieldAccess access = {kTaggedBase, JSGlobalObject::kNativeContextOffset,
                         Handle<Name>(), Type::Internal(), kMachAnyTagged};
   return access;
 }
 
 
 // static
 FieldAccess AccessBuilder::ForValue() {
   FieldAccess access = {kTaggedBase, JSValue::kValueOffset, Handle<Name>(),
                         Type::Any(), kMachAnyTagged};
   return access;
@@ skipping 163 matching lines @@
 // static
 FieldAccess AccessBuilder::ForFrameMarker() {
   FieldAccess access = {kUntaggedBase, StandardFrameConstants::kMarkerOffset,
                         MaybeHandle<Name>(), Type::Tagged(), kMachAnyTagged};
   return access;
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8