| Index: src/objects-debug.cc
|
| diff --git a/src/objects-debug.cc b/src/objects-debug.cc
|
| index 171716680512e190c3bfad85fe22fdc217f8afa2..4c6fb4fa3a29dcf21da8b61f77f93b04d69aa40f 100644
|
| --- a/src/objects-debug.cc
|
| +++ b/src/objects-debug.cc
|
| @@ -1213,27 +1213,26 @@ bool LayoutDescriptor::IsConsistentWithMap(Map* map) {
|
| bool TransitionArray::IsSortedNoDuplicates(int valid_entries) {
|
| DCHECK(valid_entries == -1);
|
| Name* prev_key = NULL;
|
| - bool prev_is_data_property = false;
|
| + PropertyKind prev_kind = DATA;
|
| PropertyAttributes prev_attributes = NONE;
|
| uint32_t prev_hash = 0;
|
| for (int i = 0; i < number_of_transitions(); i++) {
|
| Name* key = GetSortedKey(i);
|
| uint32_t hash = key->Hash();
|
| - bool is_data_property = false;
|
| + PropertyKind kind = DATA;
|
| PropertyAttributes attributes = NONE;
|
| if (!IsSpecialTransition(key)) {
|
| Map* target = GetTarget(i);
|
| PropertyDetails details = GetTargetDetails(key, target);
|
| - is_data_property = details.type() == FIELD || details.type() == CONSTANT;
|
| + kind = details.kind();
|
| attributes = details.attributes();
|
| } else {
|
| // Duplicate entries are not allowed for non-property transitions.
|
| CHECK_NE(prev_key, key);
|
| }
|
|
|
| - int cmp =
|
| - CompareKeys(prev_key, prev_hash, prev_is_data_property, prev_attributes,
|
| - key, hash, is_data_property, attributes);
|
| + int cmp = CompareKeys(prev_key, prev_hash, prev_kind, prev_attributes, key,
|
| + hash, kind, attributes);
|
| if (cmp >= 0) {
|
| Print();
|
| return false;
|
| @@ -1241,7 +1240,7 @@ bool TransitionArray::IsSortedNoDuplicates(int valid_entries) {
|
| prev_key = key;
|
| prev_hash = hash;
|
| prev_attributes = attributes;
|
| - prev_is_data_property = is_data_property;
|
| + prev_kind = kind;
|
| }
|
| return true;
|
| }
|
|
|