Merge GlobalObject with JSGlobalObject.

src/compiler/js-typed-lowering.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/code-factory.h"
 #include "src/compiler/access-builder.h"
 #include "src/compiler/js-graph.h"
 #include "src/compiler/js-typed-lowering.h"
 #include "src/compiler/linkage.h"
 #include "src/compiler/node-matchers.h"
@@ skipping 1233 matching lines @@
             Handle<Context>::cast(context_type->AsConstant()->Value())
                 ->global_proxy(),
             isolate());
         receiver = jsgraph()->Constant(global_proxy);
       } else {
         Node* global_object = effect = graph()->NewNode(
             javascript()->LoadContext(0, Context::GLOBAL_OBJECT_INDEX, true),
             context, context, effect);
         receiver = effect =
             graph()->NewNode(simplified()->LoadField(
-                                 AccessBuilder::ForGlobalObjectGlobalProxy()),
+                                 AccessBuilder::ForJSGlobalObjectGlobalProxy()),
                              global_object, effect, control);
       }
     } else if (!receiver_type->Maybe(Type::NullOrUndefined()) ||
                mode == ConvertReceiverMode::kNotNullOrUndefined) {
       receiver = effect =
           graph()->NewNode(javascript()->ToObject(), receiver, context,
                            frame_state, effect, control);
     } else {
       // Check {receiver} for undefined.
       Node* check0 =
@@ skipping 32 matching lines @@
         if (context_type->IsConstant()) {
           Handle<JSObject> global_proxy(
               Handle<Context>::cast(context_type->AsConstant()->Value())
                   ->global_proxy(),
               isolate());
           rglobal = jsgraph()->Constant(global_proxy);
         } else {
           Node* global_object = eglobal = graph()->NewNode(
               javascript()->LoadContext(0, Context::GLOBAL_OBJECT_INDEX, true),
               context, context, eglobal);
-          rglobal = eglobal =
-              graph()->NewNode(simplified()->LoadField(
-                                   AccessBuilder::ForGlobalObjectGlobalProxy()),
-                               global_object, eglobal, if_global);
+          rglobal = eglobal = graph()->NewNode(
+              simplified()->LoadField(
+                  AccessBuilder::ForJSGlobalObjectGlobalProxy()),
+              global_object, eglobal, if_global);
         }
       }
 
       control = graph()->NewNode(common()->Merge(2), if_convert, if_global);
       effect =
           graph()->NewNode(common()->EffectPhi(2), econvert, eglobal, control);
       receiver = graph()->NewNode(common()->Phi(kMachAnyTagged, 2), rconvert,
                                   rglobal, control);
     }
   }
@@ skipping 69 matching lines @@
     FrameStateInfo args_state_info = OpParameter<FrameStateInfo>(args_state);
     // Prepare element backing store to be used by arguments object.
     bool has_aliased_arguments = false;
     Node* const elements = AllocateAliasedArguments(
         effect, control, args_state, context, shared, &has_aliased_arguments);
     // Load the arguments object map from the current native context.
     Node* const load_global_object = graph()->NewNode(
         simplified()->LoadField(
             AccessBuilder::ForContextSlot(Context::GLOBAL_OBJECT_INDEX)),
         context, effect, control);
-    Node* const load_native_context = graph()->NewNode(
-        simplified()->LoadField(AccessBuilder::ForGlobalObjectNativeContext()),
-        load_global_object, effect, control);
+    Node* const load_native_context =
+        graph()->NewNode(simplified()->LoadField(
+                             AccessBuilder::ForJSGlobalObjectNativeContext()),
+                         load_global_object, effect, control);
     Node* const load_arguments_map = graph()->NewNode(
         simplified()->LoadField(AccessBuilder::ForContextSlot(
             has_aliased_arguments ? Context::FAST_ALIASED_ARGUMENTS_MAP_INDEX
                                   : Context::SLOPPY_ARGUMENTS_MAP_INDEX)),
         load_native_context, effect, control);
     // Actually allocate and initialize the arguments object.
     AllocationBuilder a(jsgraph(), effect, control);
     Node* properties = jsgraph()->EmptyFixedArrayConstant();
     int length = args_state_info.parameter_count() - 1;  // Minus receiver.
     STATIC_ASSERT(Heap::kSloppyArgumentsObjectSize == 5 * kPointerSize);
@@ skipping 19 matching lines @@
     // there conceptually is an arguments adaptor frame in the call chain.
     Node* const args_state = GetArgumentsFrameState(frame_state);
     FrameStateInfo args_state_info = OpParameter<FrameStateInfo>(args_state);
     // Prepare element backing store to be used by arguments object.
     Node* const elements = AllocateArguments(effect, control, args_state);
     // Load the arguments object map from the current native context.
     Node* const load_global_object = graph()->NewNode(
         simplified()->LoadField(
             AccessBuilder::ForContextSlot(Context::GLOBAL_OBJECT_INDEX)),
         context, effect, control);
-    Node* const load_native_context = graph()->NewNode(
-        simplified()->LoadField(AccessBuilder::ForGlobalObjectNativeContext()),
-        load_global_object, effect, control);
+    Node* const load_native_context =
+        graph()->NewNode(simplified()->LoadField(
+                             AccessBuilder::ForJSGlobalObjectNativeContext()),
+                         load_global_object, effect, control);
     Node* const load_arguments_map = graph()->NewNode(
         simplified()->LoadField(
             AccessBuilder::ForContextSlot(Context::STRICT_ARGUMENTS_MAP_INDEX)),
         load_native_context, effect, control);
     // Actually allocate and initialize the arguments object.
     AllocationBuilder a(jsgraph(), effect, control);
     Node* properties = jsgraph()->EmptyFixedArrayConstant();
     int length = args_state_info.parameter_count() - 1;  // Minus receiver.
     STATIC_ASSERT(Heap::kStrictArgumentsObjectSize == 4 * kPointerSize);
     a.Allocate(Heap::kStrictArgumentsObjectSize);
@@ skipping 780 matching lines @@
 }
 
 
 MachineOperatorBuilder* JSTypedLowering::machine() const {
   return jsgraph()->machine();
 }
 
 }  // namespace compiler
 }  // namespace internal
 }  // namespace v8