Clean up name distinction between Keyed ICs and Element Handlers

src/stub-cache.h

 // Copyright 2012 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.
 
 #ifndef V8_STUB_CACHE_H_
 #define V8_STUB_CACHE_H_
 
 #include "src/allocation.h"
 #include "src/arguments.h"
 #include "src/code-stubs.h"
@@ skipping 175 matching lines @@
 // ------------------------------------------------------------------------
 
 
 // Support functions for IC stubs for callbacks.
 DECLARE_RUNTIME_FUNCTION(StoreCallbackProperty);
 
 
 // Support functions for IC stubs for interceptors.
 DECLARE_RUNTIME_FUNCTION(LoadPropertyWithInterceptorOnly);
 DECLARE_RUNTIME_FUNCTION(LoadPropertyWithInterceptor);
-DECLARE_RUNTIME_FUNCTION(StoreInterceptorProperty);
-DECLARE_RUNTIME_FUNCTION(KeyedLoadPropertyWithInterceptor);
+DECLARE_RUNTIME_FUNCTION(LoadElementWithInterceptor);
+DECLARE_RUNTIME_FUNCTION(StorePropertyWithInterceptor);
 
 
 enum PrototypeCheckType { CHECK_ALL_MAPS, SKIP_RECEIVER };
 enum IcCheckType { ELEMENT, PROPERTY };
 
 
 class PropertyAccessCompiler BASE_EMBEDDED {
  public:
   static Builtins::Name MissBuiltin(Code::Kind kind) {
     switch (kind) {
@@ skipping 55 matching lines @@
   CacheHolderFlag cache_holder_;
 
   Isolate* isolate_;
   MacroAssembler masm_;
 };
 
 
 class PropertyICCompiler : public PropertyAccessCompiler {
  public:
   // Finds the Code object stored in the Heap::non_monomorphic_cache().
-  static Code* FindPreMonomorphicIC(Isolate* isolate, Code::Kind kind,
-                                    ExtraICState extra_ic_state);
+  static Code* FindPreMonomorphic(Isolate* isolate, Code::Kind kind,
+                                  ExtraICState extra_ic_state);
 
   // Named
   static Handle<Code> ComputeLoad(Isolate* isolate, InlineCacheState ic_state,
                                   ExtraICState extra_state);
   static Handle<Code> ComputeStore(Isolate* isolate, InlineCacheState ic_state,
                                    ExtraICState extra_state);
 
-  static Handle<Code> ComputeMonomorphicIC(Code::Kind kind, Handle<Name> name,
-                                           Handle<HeapType> type,
-                                           Handle<Code> handler,
-                                           ExtraICState extra_ic_state);
-  static Handle<Code> ComputePolymorphicIC(
-      Code::Kind kind, TypeHandleList* types, CodeHandleList* handlers,
-      int number_of_valid_maps, Handle<Name> name, ExtraICState extra_ic_state);
+  static Handle<Code> ComputeMonomorphic(Code::Kind kind, Handle<Name> name,
+                                         Handle<HeapType> type,
+                                         Handle<Code> handler,
+                                         ExtraICState extra_ic_state);
+  static Handle<Code> ComputePolymorphic(Code::Kind kind, TypeHandleList* types,
+                                         CodeHandleList* handlers,
+                                         int number_of_valid_maps,
+                                         Handle<Name> name,
+                                         ExtraICState extra_ic_state);
 
   // Keyed
-  static Handle<Code> ComputeKeyedLoadElement(Handle<Map> receiver_map);
+  static Handle<Code> ComputeKeyedLoadMonomorphic(Handle<Map> receiver_map);
 
-  static Handle<Code> ComputeKeyedStoreElement(Handle<Map> receiver_map,
-                                               StrictMode strict_mode,
-                                               KeyedAccessStoreMode store_mode);
-  static Handle<Code> ComputeLoadElementPolymorphic(
-      MapHandleList* receiver_maps);
-  static Handle<Code> ComputeStoreElementPolymorphic(
+  static Handle<Code> ComputeKeyedStoreMonomorphic(
+      Handle<Map> receiver_map, StrictMode strict_mode,
+      KeyedAccessStoreMode store_mode);
+  static Handle<Code> ComputeKeyedLoadPolymorphic(MapHandleList* receiver_maps);
+  static Handle<Code> ComputeKeyedStorePolymorphic(
       MapHandleList* receiver_maps, KeyedAccessStoreMode store_mode,
       StrictMode strict_mode);
 
   // Compare nil
   static Handle<Code> ComputeCompareNil(Handle<Map> receiver_map,
                                         CompareNilICStub* stub);
 
 
  private:
   PropertyICCompiler(Isolate* isolate, Code::Kind kind,
@@ skipping 14 matching lines @@
   Handle<Code> CompileStorePreMonomorphic(Code::Flags flags);
   Handle<Code> CompileStoreGeneric(Code::Flags flags);
   Handle<Code> CompileStoreMegamorphic(Code::Flags flags);
 
   Handle<Code> CompileMonomorphic(Handle<HeapType> type, Handle<Code> handler,
                                   Handle<Name> name, IcCheckType check);
   Handle<Code> CompilePolymorphic(TypeHandleList* types,
                                   CodeHandleList* handlers, Handle<Name> name,
                                   Code::StubType type, IcCheckType check);
 
-  Handle<Code> CompileIndexedStoreMonomorphic(Handle<Map> receiver_map,
-                                              KeyedAccessStoreMode store_mode);
-  Handle<Code> CompileIndexedStorePolymorphic(MapHandleList* receiver_maps,
-                                              KeyedAccessStoreMode store_mode);
-  Handle<Code> CompileIndexedStorePolymorphic(MapHandleList* receiver_maps,
-                                              CodeHandleList* handler_stubs,
-                                              MapHandleList* transitioned_maps);
+  Handle<Code> CompileKeyedStoreMonomorphic(Handle<Map> receiver_map,
+                                            KeyedAccessStoreMode store_mode);
+  Handle<Code> CompileKeyedStorePolymorphic(MapHandleList* receiver_maps,
+                                            KeyedAccessStoreMode store_mode);
+  Handle<Code> CompileKeyedStorePolymorphic(MapHandleList* receiver_maps,
+                                            CodeHandleList* handler_stubs,
+                                            MapHandleList* transitioned_maps);
 
   bool IncludesNumberType(TypeHandleList* types);
 
   Handle<Code> GetCode(Code::Kind kind, Code::StubType type, Handle<Name> name,
                        InlineCacheState state = MONOMORPHIC);
 
   Logger::LogEventsAndTags log_kind(Handle<Code> code) {
     if (kind() == Code::LOAD_IC) {
       return code->ic_state() == MONOMORPHIC ? Logger::LOAD_IC_TAG
                                              : Logger::LOAD_POLYMORPHIC_IC_TAG;
@@ skipping 310 matching lines @@
       case Code::KEYED_STORE_IC: return Builtins::kKeyedStoreIC_Slow;
       default: UNREACHABLE();
     }
     return Builtins::kStoreIC_Slow;
   }
 
   static Register value();
 };
 
 
-class IndexedHandlerCompiler : public PropertyHandlerCompiler {
+class ElementHandlerCompiler : public PropertyHandlerCompiler {
  public:
-  explicit IndexedHandlerCompiler(Isolate* isolate)
+  explicit ElementHandlerCompiler(Isolate* isolate)
       : PropertyHandlerCompiler(isolate, Code::KEYED_LOAD_IC,
                                 kCacheOnReceiver) {}
 
-  virtual ~IndexedHandlerCompiler() {}
+  virtual ~ElementHandlerCompiler() {}
 
   void CompileElementHandlers(MapHandleList* receiver_maps,
                               CodeHandleList* handlers);
 
   static void GenerateLoadDictionaryElement(MacroAssembler* masm);
   static void GenerateStoreDictionaryElement(MacroAssembler* masm);
 };
 
 
 // Holds information about possible function call optimizations.
@@ skipping 49 matching lines @@
   Handle<JSFunction> constant_function_;
   bool is_simple_api_call_;
   Handle<FunctionTemplateInfo> expected_receiver_type_;
   Handle<CallHandlerInfo> api_call_info_;
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_STUB_CACHE_H_