Fix serialization statistics for external strings.

src/snapshot/serialize.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/accessors.h"
 #include "src/api.h"
 #include "src/base/platform/platform.h"
 #include "src/bootstrapper.h"
@@ skipping 1228 matching lines @@
 #ifdef OBJECT_PRINT
   if (instance_type_count_ != NULL) {
     DeleteArray(instance_type_count_);
     DeleteArray(instance_type_size_);
   }
 #endif  // OBJECT_PRINT
 }
 
 
 #ifdef OBJECT_PRINT
-void Serializer::CountInstanceType(HeapObject* obj) {
-  int instance_type = obj->map()->instance_type();
+void Serializer::CountInstanceType(Map* map, int size) {
+  int instance_type = map->instance_type();
   instance_type_count_[instance_type]++;
-  instance_type_size_[instance_type] += obj->Size();
+  instance_type_size_[instance_type] += size;
 }
 #endif  // OBJECT_PRINT
 
 
 void Serializer::OutputStatistics(const char* name) {
   if (!FLAG_serialization_statistics) return;
   PrintF("%s:\n", name);
   PrintF("  Spaces (bytes):\n");
   for (int space = 0; space < kNumberOfSpaces; space++) {
     PrintF("%16s", AllocationSpaceName(static_cast<AllocationSpace>(space)));
@@ skipping 426 matching lines @@
     sink_->Put(kNewObject + reference_representation_ + space, "NewObject");
     if (needs_double_align)
       sink_->PutInt(kDoubleAlignmentSentinel, "DoubleAlignSentinel");
     int encoded_size = size >> kObjectAlignmentBits;
     DCHECK_NE(kDoubleAlignmentSentinel, encoded_size);
     sink_->PutInt(encoded_size, "ObjectSizeInWords");
   }
 
 #ifdef OBJECT_PRINT
   if (FLAG_serialization_statistics) {
-    serializer_->CountInstanceType(object_);
+    serializer_->CountInstanceType(map, size);
   }
 #endif  // OBJECT_PRINT
 
   // Mark this object as already serialized.
   serializer_->back_reference_map()->Add(object_, back_reference);
 
   // Serialize the map (first word of the object).
   serializer_->SerializeObject(map, kPlain, kStartOfObject, 0);
 }
 
@@ skipping 882 matching lines @@
   DisallowHeapAllocation no_gc;
   SerializedCodeData* scd = new SerializedCodeData(cached_data);
   SanityCheckResult r = scd->SanityCheck(isolate, source);
   if (r == CHECK_SUCCESS) return scd;
   cached_data->Reject();
   source->GetIsolate()->counters()->code_cache_reject_reason()->AddSample(r);
   delete scd;
   return NULL;
 }
 } }  // namespace v8::internal