TransitionArray now uses <is_data_property, name, attributes> tuple as a key, which allows to have …

src/objects-debug.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #include "src/disasm.h"
 #include "src/disassembler.h"
 #include "src/heap/objects-visiting.h"
 #include "src/jsregexp.h"
@@ skipping 1166 matching lines @@
     }
     current = hash;
   }
   return true;
 }
 
 
 bool TransitionArray::IsSortedNoDuplicates(int valid_entries) {
   DCHECK(valid_entries == -1);
   Name* current_key = NULL;
+  bool current_is_data_property = false;
+  PropertyAttributes current_attributes = NONE;
   uint32_t current = 0;
   for (int i = 0; i < number_of_transitions(); i++) {
     Name* key = GetSortedKey(i);
-    if (key == current_key) {
+    Map* target = GetTarget(i);
+    PropertyDetails details = GetTargetDetails(key, target);
+    bool is_data_property =
+        details.type() == FIELD || details.type() == CONSTANT;
+    PropertyAttributes attributes = details.attributes();
+
+    if ((key == current_key) && (attributes == current_attributes) &&
+        (is_data_property == current_is_data_property)) {
       OFStream os(stdout);
       PrintTransitions(os);
       return false;
     }
     current_key = key;
+    current_is_data_property = is_data_property;
+    current_attributes = attributes;
     uint32_t hash = GetSortedKey(i)->Hash();
     if (hash < current) {
       OFStream os(stdout);
       PrintTransitions(os);
       return false;
     }
     current = hash;
   }
   return true;
 }
 
 
 static bool CheckOneBackPointer(Map* current_map, Object* target) {
   return !target->IsMap() || Map::cast(target)->GetBackPointer() == current_map;
 }
 
 
 bool TransitionArray::IsConsistentWithBackPointers(Map* current_map) {
   for (int i = 0; i < number_of_transitions(); ++i) {
     if (!CheckOneBackPointer(current_map, GetTarget(i))) return false;
   }
   return true;
 }
 
 
 #endif  // DEBUG
 
 } }  // namespace v8::internal