Revert trunk to bleeding_edge at r12484

src/string-stream.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 330 matching lines @@
 
 
 void StringStream::PrintUsingMap(JSObject* js_object) {
   Map* map = js_object->map();
   if (!HEAP->Contains(map) ||
       !map->IsHeapObject() ||
       !map->IsMap()) {
     Add("<Invalid map>\n");
     return;
   }
-  int real_size = map->NumberOfOwnDescriptors();
   DescriptorArray* descs = map->instance_descriptors();
   for (int i = 0; i < descs->number_of_descriptors(); i++) {
-    PropertyDetails details = descs->GetDetails(i);
-    if (details.descriptor_index() > real_size) continue;
-    if (details.type() == FIELD) {
+    if (descs->GetType(i) == FIELD) {
       Object* key = descs->GetKey(i);
       if (key->IsString() || key->IsNumber()) {
         int len = 3;
         if (key->IsString()) {
           len = String::cast(key)->length();
         }
         for (; len < 18; len++)
           Put(' ');
         if (key->IsString()) {
           Put(String::cast(key));
@@ skipping 216 matching lines @@
 
 // Only grow once to the maximum allowable size.
 char* NoAllocationStringAllocator::grow(unsigned* bytes) {
   ASSERT(size_ >= *bytes);
   *bytes = size_;
   return space_;
 }
 
 
 } }  // namespace v8::internal