Revert "Reland of https://codereview.chromium.org/172523002/"

src/objects-inl.h

Index: src/objects-inl.h
diff --git a/src/objects-inl.h b/src/objects-inl.h
index ee6b94d9086992ebe8145cd4456e46dc91cbbb06..978704ac54286aff224e370390121e305cd45100 100644
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -4433,7 +4433,6 @@ bool Code::has_major_key() {
       kind() == LOAD_IC ||
       kind() == KEYED_LOAD_IC ||
       kind() == STORE_IC ||
-      kind() == CALL_IC ||
       kind() == KEYED_STORE_IC ||
       kind() == TO_BOOLEAN_IC;
 }
@@ -5878,7 +5877,7 @@ void Code::set_type_feedback_info(Object* value, WriteBarrierMode mode) {
 
 int Code::stub_info() {
   ASSERT(kind() == COMPARE_IC || kind() == COMPARE_NIL_IC ||
-         kind() == BINARY_OP_IC || kind() == LOAD_IC || kind() == CALL_IC);
+         kind() == BINARY_OP_IC || kind() == LOAD_IC);
   return Smi::cast(raw_type_feedback_info())->value();
 }
 
@@ -5889,7 +5888,6 @@ void Code::set_stub_info(int value) {
          kind() == BINARY_OP_IC ||
          kind() == STUB ||
          kind() == LOAD_IC ||
-         kind() == CALL_IC ||
          kind() == KEYED_LOAD_IC ||
          kind() == STORE_IC ||
          kind() == KEYED_STORE_IC);