[ic] [stubs] Remove InlineCacheState field from the code flags.

src/objects.cc

 // Copyright 2015 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.
 
 #include "src/objects.h"
 
 #include <cmath>
 #include <iomanip>
 #include <sstream>
 
@@ skipping 13921 matching lines @@
   DCHECK(kind() == OPTIMIZED_FUNCTION);
   Object* weak_cell_cache =
       DeoptimizationInputData::cast(deoptimization_data())->WeakCellCache();
   if (weak_cell_cache->IsWeakCell()) {
     DCHECK(this == WeakCell::cast(weak_cell_cache)->value());
     return WeakCell::cast(weak_cell_cache);
   }
   return NULL;
 }
 
+InlineCacheState Code::ic_state() {
+  switch (kind()) {
+    case Code::BINARY_OP_IC: {
+      BinaryOpICState state(GetIsolate(), extra_ic_state());
+      return state.GetICState();
+    }
+    case Code::COMPARE_IC: {
+      CompareICStub stub(GetIsolate(), extra_ic_state());
+      return stub.GetICState();
+    }
+    case Code::TO_BOOLEAN_IC: {
+      ToBooleanICStub stub(GetIsolate(), extra_ic_state());
+      return stub.GetICState();
+    }
+    case Code::DEBUG_STUB:
+      return UNINITIALIZED;
+
+    default:
+      DCHECK(is_inline_cache_stub() || !IC::ICUseVector(kind()));
+      return UNINITIALIZED;

[Toon Verwaest, 2016/06/09 13:49:12]

This looks weird, this case should be unreachable probably?
What about making this private to ic.cc?

[Igor Sheludko, 2016/06/09 15:18:21]

Done.

+  }
+}
 
 #ifdef ENABLE_DISASSEMBLER
 
 void DeoptimizationInputData::DeoptimizationInputDataPrint(
     std::ostream& os) {  // NOLINT
   disasm::NameConverter converter;
   int const inlined_function_count = InlinedFunctionCount()->value();
   os << "Inlined functions (count = " << inlined_function_count << ")\n";
   for (int id = 0; id < inlined_function_count; ++id) {
     Object* info = LiteralArray()->get(id);
@@ skipping 243 matching lines @@
 const char* Code::ICState2String(InlineCacheState state) {
   switch (state) {
     case UNINITIALIZED: return "UNINITIALIZED";
     case PREMONOMORPHIC: return "PREMONOMORPHIC";
     case MONOMORPHIC: return "MONOMORPHIC";
     case RECOMPUTE_HANDLER:
       return "RECOMPUTE_HANDLER";
     case POLYMORPHIC: return "POLYMORPHIC";
     case MEGAMORPHIC: return "MEGAMORPHIC";
     case GENERIC: return "GENERIC";
-    case DEBUG_STUB: return "DEBUG_STUB";
   }
   UNREACHABLE();
   return NULL;
 }
 
 
 void Code::PrintExtraICState(std::ostream& os,  // NOLINT
                              Kind kind, ExtraICState extra) {
   os << "extra_ic_state = ";
   if ((kind == STORE_IC || kind == KEYED_STORE_IC) &&
@@ skipping 4645 matching lines @@
   if (cell->value() != *new_value) {
     cell->set_value(*new_value);
     Isolate* isolate = cell->GetIsolate();
     cell->dependent_code()->DeoptimizeDependentCodeGroup(
         isolate, DependentCode::kPropertyCellChangedGroup);
   }
 }
 
 }  // namespace internal
 }  // namespace v8