Always use the LoadStubCompiler for Load handlers, also for keyedload 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 485 matching lines @@
   bool IncludesNumberType(TypeHandleList* types);
 
   Code::Kind kind_;
   CacheHolderFlag cache_holder_;
   Register* registers_;
 };
 
 
 class LoadStubCompiler: public BaseLoadStoreStubCompiler {
  public:
-  LoadStubCompiler(Isolate* isolate,
+  LoadStubCompiler(Isolate* isolate, Code::Kind kind = Code::LOAD_IC,
                    ExtraICState extra_ic_state = kNoExtraICState,
-                   CacheHolderFlag cache_holder = kCacheOnReceiver,
-                   Code::Kind kind = Code::LOAD_IC)
+                   CacheHolderFlag cache_holder = kCacheOnReceiver)
       : BaseLoadStoreStubCompiler(isolate, kind, extra_ic_state, cache_holder) {
   }
   virtual ~LoadStubCompiler() { }
+  static Register* registers();
 
   Handle<Code> CompileLoadField(Handle<HeapType> type,
                                 Handle<JSObject> holder,
                                 Handle<Name> name,
                                 FieldIndex index,
                                 Representation representation);
 
   Handle<Code> CompileLoadCallback(Handle<HeapType> type,
                                    Handle<JSObject> holder,
                                    Handle<Name> name,
@@ skipping 73 matching lines @@
                                Handle<Object> object,
                                Handle<JSObject> holder,
                                LookupResult* lookup,
                                Handle<Name> name);
   void GenerateLoadPostInterceptor(Register reg,
                                    Handle<JSObject> interceptor_holder,
                                    Handle<Name> name,
                                    LookupResult* lookup);
 
  private:
-  static Register* registers();
   Register scratch4() { return registers_[5]; }
   friend class BaseLoadStoreStubCompiler;
 };
 
 
-class KeyedLoadStubCompiler: public LoadStubCompiler {
+class KeyedLoadStubCompiler : public StubCompiler {
  public:
   KeyedLoadStubCompiler(Isolate* isolate,
-                        ExtraICState extra_ic_state = kNoExtraICState,
-                        CacheHolderFlag cache_holder = kCacheOnReceiver)
-      : LoadStubCompiler(isolate, extra_ic_state, cache_holder,
-                         Code::KEYED_LOAD_IC) {}
+                        ExtraICState extra_ic_state = kNoExtraICState)
+      : StubCompiler(isolate, extra_ic_state) {
+    registers_ = LoadStubCompiler::registers();
+  }
 
   Handle<Code> CompileLoadElement(Handle<Map> receiver_map);
 
   void CompileElementHandlers(MapHandleList* receiver_maps,
                               CodeHandleList* handlers);
 
   static void GenerateLoadDictionaryElement(MacroAssembler* masm);
 
+  Register receiver() { return registers_[0]; }
+  Register name() { return registers_[1]; }
+  Register scratch1() { return registers_[2]; }
+  Register scratch2() { return registers_[3]; }
+  Register scratch3() { return registers_[4]; }
+
  private:
   static Register* registers();
-  friend class BaseLoadStoreStubCompiler;
+  Register* registers_;
 };
 
 
 class StoreStubCompiler: public BaseLoadStoreStubCompiler {
  public:
   StoreStubCompiler(Isolate* isolate,
                     ExtraICState extra_ic_state,
                     Code::Kind kind = Code::STORE_IC)
       : BaseLoadStoreStubCompiler(isolate, kind, extra_ic_state) {}
 
@@ skipping 182 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_