| Index: src/compiler/access-info.cc
|
| diff --git a/src/compiler/access-info.cc b/src/compiler/access-info.cc
|
| index d43d96552a304535d4d9cc815889e8da6debe3ff..0acc6d1d564113dc888feffb88792551e684226f 100644
|
| --- a/src/compiler/access-info.cc
|
| +++ b/src/compiler/access-info.cc
|
| @@ -145,9 +145,12 @@ bool PropertyAccessInfo::Merge(PropertyAccessInfo const* that,
|
|
|
| case kDataField:
|
| case kDataConstantField: {
|
| - // Check if we actually access the same field.
|
| - if (this->kind_ == that->kind_ &&
|
| - this->field_index_ == that->field_index_) {
|
| + // Check if we actually access the same field (we use the
|
| + // GetFieldAccessStubKey method here just like the ICs do
|
| + // since that way we only compare the relevant bits of the
|
| + // field indices).
|
| + if (this->field_index_.GetFieldAccessStubKey() ==
|
| + that->field_index_.GetFieldAccessStubKey()) {
|
| switch (access_mode) {
|
| case AccessMode::kLoad: {
|
| if (this->field_representation_ != that->field_representation_) {
|
|
|