| Index: src/hydrogen-instructions.cc
|
| diff --git a/src/hydrogen-instructions.cc b/src/hydrogen-instructions.cc
|
| index 3eb4aa6c0e63de6dcba0cf5444387bf02e92904e..dcb0b55d4cf84c2746e95d5fd4560bf77c953ca1 100644
|
| --- a/src/hydrogen-instructions.cc
|
| +++ b/src/hydrogen-instructions.cc
|
| @@ -1687,10 +1687,10 @@ void HCheckMaps::HandleSideEffectDominator(GVNFlag side_effect,
|
| // for which the map is known.
|
| if (HasNoUses() && dominator->IsStoreNamedField()) {
|
| HStoreNamedField* store = HStoreNamedField::cast(dominator);
|
| - UniqueValueId map_unique_id = store->transition_unique_id();
|
| - if (!map_unique_id.IsInitialized() || store->object() != value()) return;
|
| + if (!store->has_transition() || store->object() != value()) return;
|
| + HConstant* transition = HConstant::cast(store->transition());
|
| for (int i = 0; i < map_set()->length(); i++) {
|
| - if (map_unique_id == map_unique_ids_.at(i)) {
|
| + if (transition->UniqueValueIdsMatch(map_unique_ids_.at(i))) {
|
| DeleteAndReplaceWith(NULL);
|
| return;
|
| }
|
| @@ -3522,8 +3522,8 @@ void HStoreNamedField::PrintDataTo(StringStream* stream) {
|
| if (NeedsWriteBarrier()) {
|
| stream->Add(" (write-barrier)");
|
| }
|
| - if (!transition().is_null()) {
|
| - stream->Add(" (transition map %p)", *transition());
|
| + if (has_transition()) {
|
| + stream->Add(" (transition map %p)", *transition_map());
|
| }
|
| }
|
|
|
|
|