Merge bleeding_edge 18021:18297

src/ic-inl.h

Index: src/ic-inl.h
diff --git a/src/ic-inl.h b/src/ic-inl.h
index bd45c3e99d8a19a7778a6ef7439f4e4b18944ad9..24a939dedbf2a8d5ec3a96204d1d7d3729cc50f7 100644
--- a/src/ic-inl.h
+++ b/src/ic-inl.h
@@ -86,8 +86,8 @@ void IC::SetTargetAtAddress(Address address, Code* target) {
   // ICs as strict mode. The strict-ness of the IC must be preserved.
   if (old_target->kind() == Code::STORE_IC ||
       old_target->kind() == Code::KEYED_STORE_IC) {
-    ASSERT(Code::GetStrictMode(old_target->extra_ic_state()) ==
-           Code::GetStrictMode(target->extra_ic_state()));
+    ASSERT(StoreIC::GetStrictMode(old_target->extra_ic_state()) ==
+           StoreIC::GetStrictMode(target->extra_ic_state()));
   }
 #endif
   Assembler::set_target_address_at(address, target->instruction_start());
@@ -149,7 +149,7 @@ Handle<Map> IC::GetCodeCacheHolder(InlineCacheHolderFlag flag,
     }
     return handle(JSObject::cast(constructor->instance_prototype())->map());
   }
-  return type->AsClass();
+  return TypeToMap(type, isolate);
 }