[printing] Remove duplicate code that prints property details.

src/objects-printer.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/objects.h"
 
 #include <iomanip>
 #include <memory>
 
 #include "src/bootstrapper.h"
@@ skipping 318 matching lines @@
 
 
 void JSObject::PrintProperties(std::ostream& os) {  // NOLINT
   if (HasFastProperties()) {
     DescriptorArray* descs = map()->instance_descriptors();
     for (int i = 0; i < map()->NumberOfOwnDescriptors(); i++) {
       os << "\n   ";
       descs->GetKey(i)->NamePrint(os);
       os << ": ";
       PropertyDetails details = descs->GetDetails(i);
-      FieldIndex field_index;
       switch (details.location()) {
         case kField: {
-          field_index = FieldIndex::ForDescriptor(map(), i);
+          FieldIndex field_index = FieldIndex::ForDescriptor(map(), i);
           if (IsUnboxedDoubleField(field_index)) {
             os << "<unboxed double> " << RawFastDoublePropertyAt(field_index);
           } else {
             os << Brief(RawFastPropertyAt(field_index));
           }
           break;
         }
         case kDescriptor:
           os << Brief(descs->GetValue(i));
           break;
       }
-      os << " (" << (details.kind() == kData ? "data" : "accessor");
-      switch (details.location()) {
-        case kField: {
-          os << " field at offset " << field_index.property_index();
-          break;
-        }
-        case kDescriptor:
-          break;
-      }
-      os << ")";
+      os << " ";
+      details.PrintAsFastTo(os, PropertyDetails::kForProperties);
     }
   } else if (IsJSGlobalObject()) {
     global_dictionary()->Print(os);
   } else {
     property_dictionary()->Print(os);
   }
 }
 
 namespace {
 
@@ skipping 767 matching lines @@
 void Cell::CellPrint(std::ostream& os) {  // NOLINT
   HeapObject::PrintHeader(os, "Cell");
   os << "\n - value: " << Brief(value());
   os << "\n";
 }
 
 
 void PropertyCell::PropertyCellPrint(std::ostream& os) {  // NOLINT
   HeapObject::PrintHeader(os, "PropertyCell");
   os << "\n - value: " << Brief(value());
-  os << "\n - details: " << property_details();
+  os << "\n - details: ";
+  property_details().PrintAsSlowTo(os);
   PropertyCellType cell_type = property_details().cell_type();
   os << "\n - cell_type: ";
   if (value()->IsTheHole(GetIsolate())) {
     switch (cell_type) {
       case PropertyCellType::kUninitialized:
         os << "Uninitialized";
         break;
       case PropertyCellType::kInvalidated:
         os << "Invalidated";
         break;
@@ skipping 421 matching lines @@
 
 void DescriptorArray::Print() {
   OFStream os(stdout);
   this->PrintDescriptors(os);
   os << std::flush;
 }
 
 
 void DescriptorArray::PrintDescriptors(std::ostream& os) {  // NOLINT
   HandleScope scope(GetIsolate());
-  os << "Descriptor array #" << number_of_descriptors();
+  os << "Descriptor array #" << number_of_descriptors() << ":";
   for (int i = 0; i < number_of_descriptors(); i++) {
-    Descriptor desc;
-    Get(i, &desc);
-    os << "\n " << i << ": " << desc;
+    Name* key = GetKey(i);
+    os << "\n  [" << i << "]: ";
+#ifdef OBJECT_PRINT
+    key->NamePrint(os);
+#else
+    key->ShortPrint(os);
+#endif
+    os << " ";
+    PrintDescriptorDetails(os, i, PropertyDetails::kPrintFull);
   }
   os << "\n";
 }
 
+void DescriptorArray::PrintDescriptorDetails(std::ostream& os, int descriptor,
+                                             PropertyDetails::PrintMode mode) {
+  PropertyDetails details = GetDetails(descriptor);
+  details.PrintAsFastTo(os, mode);
+  os << " @ ";
+  Object* value = GetValue(descriptor);
+  switch (details.location()) {
+    case kField: {
+      FieldType* field_type = Map::UnwrapFieldType(value);
+      field_type->PrintTo(os);
+      break;
+    }
+    case kDescriptor:
+      os << Brief(value);
+      if (value->IsAccessorPair()) {
+        AccessorPair* pair = AccessorPair::cast(value);
+        os << "(get: " << Brief(pair->getter())
+           << ", set: " << Brief(pair->setter()) << ")";
+      }
+      break;
+  }
+}
 
 void TransitionArray::Print() {
   OFStream os(stdout);
   TransitionArray::PrintTransitions(os, this);
   os << "\n" << std::flush;
 }
 
 
 void TransitionArray::PrintTransitions(std::ostream& os, Object* transitions,
                                        bool print_header) {  // NOLINT
@@ skipping 17 matching lines @@
     } else if (key == heap->sealed_symbol()) {
       os << "(transition to sealed)";
     } else if (key == heap->frozen_symbol()) {
       os << "(transition to frozen)";
     } else if (key == heap->elements_transition_symbol()) {
       os << "(transition to " << ElementsKindToString(target->elements_kind())
          << ")";
     } else if (key == heap->strict_function_transition_symbol()) {
       os << " (transition to strict function)";
     } else {
-      PropertyDetails details = GetTargetDetails(key, target);
+      DCHECK(!IsSpecialTransition(key));
       os << "(transition to ";
-      if (details.location() == kDescriptor) {
-        os << "immutable ";
-      }
-      os << (details.kind() == kData ? "data" : "accessor");
-      if (details.location() == kDescriptor) {
-        Object* value =
-            target->instance_descriptors()->GetValue(target->LastAdded());
-        os << " " << Brief(value);
-      } else {
-        os << " field";
-      }
-      os << ", attrs: " << details.attributes() << ")";
+      int descriptor = target->LastAdded();
+      DescriptorArray* descriptors = target->instance_descriptors();
+      descriptors->PrintDescriptorDetails(os, descriptor,
+                                          PropertyDetails::kForTransitions);
+      os << ")";
     }
     os << " -> " << Brief(target);
   }
 }
 
 
 void JSObject::PrintTransitions(std::ostream& os) {  // NOLINT
   Object* transitions = map()->raw_transitions();
   int num_transitions = TransitionArray::NumberOfTransitions(transitions);
   if (num_transitions == 0) return;
@@ skipping 46 matching lines @@
     printf("Not a transition array\n");
   } else {
     reinterpret_cast<i::TransitionArray*>(object)->Print();
   }
 }
 
 extern void _v8_internal_Print_StackTrace() {
   i::Isolate* isolate = i::Isolate::Current();
   isolate->PrintStack(stdout);
 }