| Index: vm/intermediate_language_x64.cc
|
| ===================================================================
|
| --- vm/intermediate_language_x64.cc (revision 11121)
|
| +++ vm/intermediate_language_x64.cc (working copy)
|
| @@ -249,11 +249,9 @@
|
|
|
|
|
| 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(dart_object_cid);
|
| + HasICData() && ic_data()->AllTargetsHaveSameOwner(kInstanceCid);
|
| if ((receiver_class_id() == kSmiCid) ||
|
| (receiver_class_id() == kDoubleCid) ||
|
| is_checked_strict_equal) {
|
| @@ -648,10 +646,8 @@
|
| 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(dart_object_cid);
|
| + HasICData() && ic_data()->AllTargetsHaveSameOwner(kInstanceCid);
|
| if (is_checked_strict_equal) {
|
| EmitCheckedStrictEqual(compiler, *ic_data(), *locs(), kind(), NULL,
|
| deopt_id(), token_pos(), try_index());
|
| @@ -2056,9 +2052,7 @@
|
|
|
| static bool IsCheckedStrictEquals(const ICData& ic_data, Token::Kind kind) {
|
| if ((kind == Token::kEQ) || (kind == Token::kNE)) {
|
| - const intptr_t dart_object_cid =
|
| - Class::Handle(Isolate::Current()->object_store()->object_class()).id();
|
| - return ic_data.AllTargetsHaveSameOwner(dart_object_cid);
|
| + return ic_data.AllTargetsHaveSameOwner(kInstanceCid);
|
| }
|
| return false;
|
| }
|
|
|