Fix overlapping KeyedLoadIC bitfield.

BUG=
LOG=N

Review URL: https://codereview.chromium.org/1192383003

Cr-Commit-Position: refs/heads/master@{#29148}

diff --git a/src/ic/ic-state.h b/src/ic/ic-state.h
index 89e455d..e1fed19 100644 (file)
--- a/src/ic/ic-state.h
+++ b/src/ic/ic-state.h
@@ -203,11 +203,14 @@ class CompareICState {
 class LoadICState final BASE_EMBEDDED {
  private:
   class ContextualModeBits : public BitField<ContextualMode, 0, 1> {};
-  class LanguageModeBits : public BitField<LanguageMode, 1, 2> {};
+  class LanguageModeBits
+      : public BitField<LanguageMode, ContextualModeBits::kNext, 2> {};
   STATIC_ASSERT(static_cast<int>(NOT_CONTEXTUAL) == 0);
   const ExtraICState state_;
 
  public:
+  static const uint32_t kNextBitFieldOffset = LanguageModeBits::kNext;
+
   static const ExtraICState kStrongModeState = STRONG
                                                << LanguageModeBits::kShift;
 

diff --git a/src/ic/ic.h b/src/ic/ic.h
index 935d856..f1291c9 100644 (file)
--- a/src/ic/ic.h
+++ b/src/ic/ic.h
@@ -444,7 +444,8 @@ class LoadIC : public IC {
 class KeyedLoadIC : public LoadIC {
  public:
   // ExtraICState bits (building on IC)
-  class IcCheckTypeField : public BitField<IcCheckType, 2, 1> {};
+  class IcCheckTypeField
+      : public BitField<IcCheckType, LoadICState::kNextBitFieldOffset, 1> {};
 
   static ExtraICState ComputeExtraICState(ContextualMode contextual_mode,
                                           LanguageMode language_mode,