Hydrogen: fix keyed loads with string keys

src/ic/ic-state.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_IC_STATE_H_
 #define V8_IC_STATE_H_
 
 #include "src/macro-assembler.h"
 
 namespace v8 {
@@ skipping 218 matching lines @@
   static ContextualMode GetContextualMode(ExtraICState state) {
     return LoadICState(state).contextual_mode();
   }
 
  private:
   class ContextualModeBits : public BitField<ContextualMode, 0, 1> {};
   STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
 
   const ExtraICState state_;
 };
+
+
+class KeyedLoadICState FINAL BASE_EMBEDDED {

[Jakob Kummerow, 2014/12/10 15:21:18]

I see that you're just following an existing pattern here, but I'm not convinced
this logic needs to be double-wrapped. Two 1-liners would do it, no?

Besides, KeyedLoadICs so far inherited the extra IC state from LoadICs. I'm
pretty sure that we want to preserve that. So again, look at how KeyedStoreICs
add to the bits they inherit from StoreIC, and model KeyedLoadICs after that.

+ public:
+  explicit KeyedLoadICState(ExtraICState extra_ic_state)
+      : state_(extra_ic_state) {}
+
+  explicit KeyedLoadICState(IcCheckType key_type)
+      : state_(IcCheckTypeField::encode(key_type)) {}
+
+  ExtraICState GetExtraICState() const { return state_; }
+
+  IcCheckType key_type() const {
+    return IcCheckTypeField::decode(state_);
+  }
+
+  static IcCheckType GetKeyType(ExtraICState state) {
+    return KeyedLoadICState(state).key_type();
+  }
+
+ private:
+  // Offset is just to make sure that LoadICState is not conflicting with us
+  class IcCheckTypeField : public BitField<IcCheckType, 1, 1> {};
+
+  const ExtraICState state_;
+};
 }
 }
 
 #endif  // V8_IC_STATE_H_