Fix queries for Dart's clas Obbject cid: get object class from object store and get its cid. This i…

runtime/vm/intermediate_language_ia32.cc

Index: runtime/vm/intermediate_language_ia32.cc
===================================================================
--- runtime/vm/intermediate_language_ia32.cc	(revision 10998)
+++ runtime/vm/intermediate_language_ia32.cc	(working copy)
@@ -244,9 +244,11 @@
 
 
 LocationSummary* EqualityCompareComp::MakeLocationSummary() const {
+  const intptr_t dart_object_cid =
+      Class::Handle(Isolate::Current()->object_store()->object_class()).id();
   const intptr_t kNumInputs = 2;
   const bool is_checked_strict_equal =
-      HasICData() && ic_data()->AllTargetsHaveSameOwner(kInstanceCid);
+      HasICData() && ic_data()->AllTargetsHaveSameOwner(dart_object_cid);
   if ((receiver_class_id() == kSmiCid) ||
       (receiver_class_id() == kDoubleCid) ||
       is_checked_strict_equal) {
@@ -646,8 +648,10 @@
                            deopt_id(), token_pos(), try_index());
     return;
   }
+  const intptr_t dart_object_cid =
+      Class::Handle(Isolate::Current()->object_store()->object_class()).id();
   const bool is_checked_strict_equal =
-      HasICData() && ic_data()->AllTargetsHaveSameOwner(kInstanceCid);
+      HasICData() && ic_data()->AllTargetsHaveSameOwner(dart_object_cid);
   if (is_checked_strict_equal) {
     EmitCheckedStrictEqual(compiler, *ic_data(), *locs(), kind(), NULL,
                            deopt_id(), token_pos(), try_index());
@@ -2068,8 +2072,10 @@
 
 
 static bool IsCheckedStrictEquals(const ICData& ic_data, Token::Kind kind) {
+  const intptr_t dart_object_cid =
+      Class::Handle(Isolate::Current()->object_store()->object_class()).id();
   if ((kind == Token::kEQ) || (kind == Token::kNE)) {
-    return ic_data.AllTargetsHaveSameOwner(kInstanceCid);
+    return ic_data.AllTargetsHaveSameOwner(dart_object_cid);
   }
   return false;
 }