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

runtime/vm/intermediate_language.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 771 matching lines @@
 }
 
 
 // Only known == targets return a Boolean.
 RawAbstractType* EqualityCompareComp::CompileType() const {
   if ((receiver_class_id() == kSmiCid) ||
       (receiver_class_id() == kDoubleCid) ||
       (receiver_class_id() == kNumberCid)) {
     return Type::BoolInterface();
   }
-  if (HasICData() && ic_data()->AllTargetsHaveSameOwner(kInstanceCid)) {
+  const intptr_t dart_object_cid =
+      Class::Handle(Isolate::Current()->object_store()->object_class()).id();
+  if (HasICData() && ic_data()->AllTargetsHaveSameOwner(dart_object_cid)) {
     return Type::BoolInterface();
   }
   return Type::DynamicType();
 }
 
 
 intptr_t EqualityCompareComp::ResultCid() const {
   if ((receiver_class_id() == kSmiCid) ||
       (receiver_class_id() == kDoubleCid) ||
       (receiver_class_id() == kNumberCid)) {
     // Known/library equalities that are guaranteed to return Boolean.
     return kBoolCid;
   }
-  if (HasICData() && ic_data()->AllTargetsHaveSameOwner(kInstanceCid)) {
+  const intptr_t dart_object_cid =
+      Class::Handle(Isolate::Current()->object_store()->object_class()).id();
+  if (HasICData() && ic_data()->AllTargetsHaveSameOwner(dart_object_cid)) {
     return kBoolCid;
   }
   return kDynamicCid;
 }
 
 
 RawAbstractType* RelationalOpComp::CompileType() const {
   if ((operands_class_id() == kSmiCid) ||
       (operands_class_id() == kDoubleCid) ||
       (operands_class_id() == kNumberCid)) {
@@ skipping 694 matching lines @@
       fixed_parameter_count_(fixed_parameter_count) {
   for (intptr_t i = 0; i < definitions.length(); ++i) {
     values_.Add(UseDefinition(definitions[i]));
   }
 }
 
 
 #undef __
 
 }  // namespace dart