Remove misleading "_index" suffix from some native context slots.

R=jarin@chromium.org

Change-Id: I9b54049852696680fb7fde26813638aae727b5d3
Reviewed-on: https://chromium-review.googlesource.com/1158231Reviewed-by: Jaroslav Sevcik <jarin@chromium.org>
Commit-Queue: Georg Neis <neis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#54835}

src/bootstrapper.cc

@@ -4376,7 +4376,7 @@ void Genesis::InitializeGlobal_harmony_string_matchall() {
         JS_REGEXP_STRING_ITERATOR_TYPE, JSRegExpStringIterator::kSize, 0,
         regexp_string_iterator_prototype, Builtins::kIllegal);
     regexp_string_iterator_function->shared()->set_native(false);
-    native_context()->set_initial_regexp_string_iterator_prototype_map_index(
+    native_context()->set_initial_regexp_string_iterator_prototype_map(
         regexp_string_iterator_function->initial_map());
   }
 

src/compiler/js-create-lowering.cc

@@ -260,7 +260,7 @@ Reduction JSCreateLowering::ReduceJSCreateArguments(Node* node) {
                              arguments_frame, rest_length, effect);
         // Load the JSArray object map.
         Node* const jsarray_map = jsgraph()->Constant(
-            native_context_ref().js_array_fast_elements_map_index());
+            native_context_ref().js_array_fast_elements_map());
         // Actually allocate and initialize the jsarray.
         AllocationBuilder a(jsgraph(), effect, control);
         Node* properties = jsgraph()->EmptyFixedArrayConstant();
@@ -379,7 +379,7 @@ Reduction JSCreateLowering::ReduceJSCreateArguments(Node* node) {
       effect = elements->op()->EffectOutputCount() > 0 ? elements : effect;
       // Load the JSArray object map.
       Node* const jsarray_map = jsgraph()->Constant(
-          native_context_ref().js_array_fast_elements_map_index());
+          native_context_ref().js_array_fast_elements_map());
       // Actually allocate and initialize the jsarray.
       AllocationBuilder a(jsgraph(), effect, control);
       Node* properties = jsgraph()->EmptyFixedArrayConstant();
@@ -1067,8 +1067,8 @@ Reduction JSCreateLowering::ReduceJSCreateKeyValueArray(Node* node) {
   Node* value = NodeProperties::GetValueInput(node, 1);
   Node* effect = NodeProperties::GetEffectInput(node);
 
-  Node* array_map = jsgraph()->Constant(
-      native_context_ref().js_array_fast_elements_map_index());
+  Node* array_map =
+      jsgraph()->Constant(native_context_ref().js_array_fast_elements_map());
   Node* properties = jsgraph()->EmptyFixedArrayConstant();
   Node* length = jsgraph()->Constant(2);
 

src/compiler/js-heap-broker.cc

@@ -966,11 +966,11 @@ MapRef NativeContextRef::strict_arguments_map() const {
                                  broker()->isolate()));
 }
 
-MapRef NativeContextRef::js_array_fast_elements_map_index() const {
+MapRef NativeContextRef::js_array_fast_elements_map() const {
   AllowHandleAllocation handle_allocation;
   AllowHandleDereference allow_handle_dereference;
   return MapRef(broker(),
-                handle(object<Context>()->js_array_fast_elements_map_index(),
+                handle(object<Context>()->js_array_fast_elements_map(),
                        broker()->isolate()));
 }
 

src/compiler/js-heap-broker.h

@@ -226,7 +226,7 @@ class NativeContextRef : public ContextRef {
   MapRef fast_aliased_arguments_map() const;
   MapRef sloppy_arguments_map() const;
   MapRef strict_arguments_map() const;
-  MapRef js_array_fast_elements_map_index() const;
+  MapRef js_array_fast_elements_map() const;
   MapRef initial_array_iterator_map() const;
   MapRef set_value_iterator_map() const;
   MapRef set_key_value_iterator_map() const;

src/contexts.h

@@ -212,16 +212,15 @@ enum ContextLookupFlags {
   V(INTL_V8_BREAK_ITERATOR_FUNCTION_INDEX, JSFunction,                         \
     intl_v8_break_iterator_function)                                           \
   V(JS_ARRAY_PACKED_SMI_ELEMENTS_MAP_INDEX, Map,                               \
-    js_array_fast_smi_elements_map_index)                                      \
+    js_array_fast_smi_elements_map)                                            \
   V(JS_ARRAY_HOLEY_SMI_ELEMENTS_MAP_INDEX, Map,                                \
-    js_array_fast_holey_smi_elements_map_index)                                \
-  V(JS_ARRAY_PACKED_ELEMENTS_MAP_INDEX, Map, js_array_fast_elements_map_index) \
-  V(JS_ARRAY_HOLEY_ELEMENTS_MAP_INDEX, Map,                                    \
-    js_array_fast_holey_elements_map_index)                                    \
+    js_array_fast_holey_smi_elements_map)                                      \
+  V(JS_ARRAY_PACKED_ELEMENTS_MAP_INDEX, Map, js_array_fast_elements_map)       \
+  V(JS_ARRAY_HOLEY_ELEMENTS_MAP_INDEX, Map, js_array_fast_holey_elements_map)  \
   V(JS_ARRAY_PACKED_DOUBLE_ELEMENTS_MAP_INDEX, Map,                            \
-    js_array_fast_double_elements_map_index)                                   \
+    js_array_fast_double_elements_map)                                         \
   V(JS_ARRAY_HOLEY_DOUBLE_ELEMENTS_MAP_INDEX, Map,                             \
-    js_array_fast_holey_double_elements_map_index)                             \
+    js_array_fast_holey_double_elements_map)                                   \
   V(JS_MAP_FUN_INDEX, JSFunction, js_map_fun)                                  \
   V(JS_MAP_MAP_INDEX, Map, js_map_map)                                         \
   V(JS_MODULE_NAMESPACE_MAP, Map, js_module_namespace_map)                     \
@@ -272,7 +271,7 @@ enum ContextLookupFlags {
     regexp_internal_match_info)                                                \
   V(REGEXP_PROTOTYPE_MAP_INDEX, Map, regexp_prototype_map)                     \
   V(INITIAL_REGEXP_STRING_ITERATOR_PROTOTYPE_MAP_INDEX, Map,                   \
-    initial_regexp_string_iterator_prototype_map_index)                        \
+    initial_regexp_string_iterator_prototype_map)                              \
   V(REGEXP_RESULT_MAP_INDEX, Map, regexp_result_map)                           \
   V(SCRIPT_CONTEXT_TABLE_INDEX, ScriptContextTable, script_context_table)      \
   V(SECURITY_TOKEN_INDEX, Object, security_token)                              \