Minor-key-ify new LoadICTrampolineStub.

src/code-stubs.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_CODE_STUBS_H_
 #define V8_CODE_STUBS_H_
 
 #include "src/allocation.h"
 #include "src/assembler.h"
 #include "src/codegen.h"
@@ skipping 1926 matching lines @@
   Major MajorKey() const { return KeyedLoadGeneric; }
   int NotMissMinorKey() const { return 0; }
 
   DISALLOW_COPY_AND_ASSIGN(KeyedLoadGenericStub);
 };
 
 
 class LoadICTrampolineStub : public PlatformCodeStub {
  public:
   LoadICTrampolineStub(Isolate* isolate, const LoadIC::State& state)
-      : PlatformCodeStub(isolate), state_(state) {}
+      : PlatformCodeStub(isolate) {
+    minor_key_ = state.GetExtraICState();
+  }
 
   virtual Code::Kind GetCodeKind() const V8_OVERRIDE { return Code::LOAD_IC; }
 
   virtual InlineCacheState GetICState() const V8_FINAL V8_OVERRIDE {
     return GENERIC;
   }
 
   virtual ExtraICState GetExtraICState() const V8_FINAL V8_OVERRIDE {
-    return state_.GetExtraICState();
+    return static_cast<ExtraICState>(minor_key_);
   }
 
+  virtual Major MajorKey() const V8_OVERRIDE { return LoadICTrampoline; }
+
  private:
-  Major MajorKey() const { return LoadICTrampoline; }
-  uint32_t MinorKey() const { return GetExtraICState(); }
+  LoadIC::State state() const {
+    return LoadIC::State(static_cast<ExtraICState>(minor_key_));
+  }
 
   virtual void Generate(MacroAssembler* masm);
 
-  const LoadIC::State state_;
-
   DISALLOW_COPY_AND_ASSIGN(LoadICTrampolineStub);
 };
 
 
 class KeyedLoadICTrampolineStub : public LoadICTrampolineStub {
  public:
   explicit KeyedLoadICTrampolineStub(Isolate* isolate)
       : LoadICTrampolineStub(isolate, LoadIC::State(0)) {}
 
   virtual Code::Kind GetCodeKind() const V8_OVERRIDE {
     return Code::KEYED_LOAD_IC;
   }
 
+  virtual Major MajorKey() const V8_OVERRIDE { return KeyedLoadICTrampoline; }
+
  private:
-  Major MajorKey() const { return KeyedLoadICTrampoline; }
-
   virtual void Generate(MacroAssembler* masm);
 
   DISALLOW_COPY_AND_ASSIGN(KeyedLoadICTrampolineStub);
 };
 
 
 class VectorLoadStub : public HydrogenCodeStub {
  public:
   explicit VectorLoadStub(Isolate* isolate, const LoadIC::State& state)
       : HydrogenCodeStub(isolate), state_(state) {}
 
   virtual Handle<Code> GenerateCode() V8_OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   virtual Code::Kind GetCodeKind() const V8_OVERRIDE { return Code::LOAD_IC; }
 
   virtual InlineCacheState GetICState() const V8_FINAL V8_OVERRIDE {
     return GENERIC;
   }
 
   virtual ExtraICState GetExtraICState() const V8_FINAL V8_OVERRIDE {
     return state_.GetExtraICState();
   }
 
+  virtual Major MajorKey() const V8_OVERRIDE { return VectorLoad; }
+
  private:
-  Major MajorKey() const { return VectorLoad; }
   int NotMissMinorKey() const { return state_.GetExtraICState(); }
 
   const LoadIC::State state_;
 
   DISALLOW_COPY_AND_ASSIGN(VectorLoadStub);
 };
 
 
 class VectorKeyedLoadStub : public VectorLoadStub {
  public:
   explicit VectorKeyedLoadStub(Isolate* isolate)
       : VectorLoadStub(isolate, LoadIC::State(0)) {}
 
   virtual Handle<Code> GenerateCode() V8_OVERRIDE;
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE;
 
   static void InstallDescriptors(Isolate* isolate);
 
   virtual Code::Kind GetCodeKind() const V8_OVERRIDE {
     return Code::KEYED_LOAD_IC;
   }
 
+  virtual Major MajorKey() const V8_OVERRIDE { return VectorKeyedLoad; }
+
  private:
-  Major MajorKey() const { return VectorKeyedLoad; }
-
   DISALLOW_COPY_AND_ASSIGN(VectorKeyedLoadStub);
 };
 
 
 class DoubleToIStub : public PlatformCodeStub {
  public:
   DoubleToIStub(Isolate* isolate, Register source, Register destination,
                 int offset, bool is_truncating, bool skip_fastpath = false)
       : PlatformCodeStub(isolate) {
     minor_key_ = SourceRegisterBits::encode(source.code()) |
@@ skipping 607 matching lines @@
 
 
 class CallDescriptors {
  public:
   static void InitializeForIsolate(Isolate* isolate);
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_CODE_STUBS_H_