Fix ARM build (gcc 3.3 failed to resolve types correctly) and constants names.

src/heap-profiler.cc

 // Copyright 2009 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 169 matching lines @@
   if (!is_null()) {
     Print(accumulator);
   } else {
     accumulator->Add("(null cluster)");
   }
 }
 
 
 inline ClustersCoarser::ClusterBackRefs::ClusterBackRefs(
     const JSObjectsCluster& cluster_)
-    : cluster(cluster_), refs(INITIAL_BACKREFS_LIST_CAPACITY) {
+    : cluster(cluster_), refs(kInitialBackrefsListCapacity) {
 }
 
 
 inline ClustersCoarser::ClusterBackRefs::ClusterBackRefs(
     const ClustersCoarser::ClusterBackRefs::ClusterBackRefs& src)
     : cluster(src.cluster), refs(src.refs.capacity()) {
   refs.AddAll(src.refs);
 }
 
 
@@ skipping 18 matching lines @@
   for (int i = 0; i < a.refs.length(); ++i) {
     int cmp = JSObjectsCluster::Compare(a.refs[i], b.refs[i]);
     if (cmp != 0) return cmp;
   }
   return 0;
 }
 
 
 ClustersCoarser::ClustersCoarser()
   : zscope_(DELETE_ON_EXIT),
-    simList_(ClustersCoarser::INITIAL_SIMILARITY_LIST_CAPACITY),
+    simList_(ClustersCoarser::kInitialSimilarityListCapacity),
     currentPair_(NULL) {
 }
 
 
 void ClustersCoarser::Call(
     const JSObjectsCluster& cluster, JSObjectsClusterTree* tree) {
   if (tree != NULL) {
     // First level of retainer graph.
     if (!cluster.can_be_coarsed()) return;
     ClusterBackRefs pair(cluster);
@@ skipping 16 matching lines @@
       currentSet_->Insert(eq, &loc);
     } else {
       currentPair_->refs.Add(cluster);
     }
   }
 }
 
 
 void ClustersCoarser::Process(JSObjectsClusterTree* tree) {
   int last_eq_clusters = -1;
-  for (int i = 0; i < MAX_PASSES_COUNT; ++i) {
+  for (int i = 0; i < kMaxPassesCount; ++i) {
     simList_.Clear();
     const int curr_eq_clusters = DoProcess(tree);
     // If no new cluster equivalents discovered, abort processing.
     if (last_eq_clusters == curr_eq_clusters) break;
     last_eq_clusters = curr_eq_clusters;
   }
 }
 
 
 int ClustersCoarser::DoProcess(JSObjectsClusterTree* tree) {
@@ skipping 55 matching lines @@
 const JSObjectsClusterTreeConfig::Value JSObjectsClusterTreeConfig::kNoValue =
     NULL;
 
 
 RetainerHeapProfile::RetainerHeapProfile()
     : zscope_(DELETE_ON_EXIT),
       coarse_cluster_tree_(NULL),
       retainers_printed_(0),
       current_printer_(NULL),
       current_stream_(NULL) {
+  JSObjectsCluster roots(JSObjectsCluster::ROOTS);
   ReferencesExtractor extractor(

[Søren Thygesen Gjesse, 2009/09/16 15:04:07]

This can be one line now.

-      JSObjectsCluster(JSObjectsCluster::ROOTS), this);
+      roots, this);
   Heap::IterateRoots(&extractor);
 }
 
 
 JSObjectsCluster RetainerHeapProfile::Clusterize(Object* obj) {
   if (obj->IsJSObject()) {
     String* constructor = JSObject::cast(obj)->constructor_name();
     // Differentiate Object and Array instances.
     if (constructor == Heap::Object_symbol() ||
         constructor == Heap::Array_symbol()) {
@@ skipping 23 matching lines @@
   referencedBy->Insert(cluster, &obj_loc);
 }
 
 
 void RetainerHeapProfile::CollectStats(HeapObject* obj) {
   if (obj->IsJSObject()) {
     const JSObjectsCluster cluster = Clusterize(JSObject::cast(obj));
     ReferencesExtractor extractor(cluster, this);
     obj->Iterate(&extractor);
   } else if (obj->IsJSGlobalPropertyCell()) {
-    ReferencesExtractor extractor(
-        JSObjectsCluster(JSObjectsCluster::GLOBAL_PROPERTY), this);
+    JSObjectsCluster global_prop(JSObjectsCluster::GLOBAL_PROPERTY);
+    ReferencesExtractor extractor(global_prop, this);
     obj->Iterate(&extractor);
   }
 }
 
 
 void RetainerHeapProfile::DebugPrintStats(
     RetainerHeapProfile::Printer* printer) {
   coarser_.Process(&retainers_tree_);
   ASSERT(current_printer_ == NULL);
   current_printer_ = printer;
@@ skipping 24 matching lines @@
     coarse_cluster_tree_ = new JSObjectsClusterTree();
     retainers_printed_ = 0;
     tree->ForEach(this);
     coarse_cluster_tree_ = NULL;
     current_printer_->PrintRetainers(stream);
     current_stream_ = NULL;
   } else {
     // Second level of retainer graph.
     ASSERT(coarse_cluster_tree_ != NULL);
     ASSERT(current_stream_ != NULL);
-    if (retainers_printed_ >= MAX_RETAINERS_TO_PRINT) {
-      if (retainers_printed_ == MAX_RETAINERS_TO_PRINT) {
+    if (retainers_printed_ >= kMaxRetainersToPrint) {
+      if (retainers_printed_ == kMaxRetainersToPrint) {
         // TODO(mnaganov): Print the exact count.
         current_stream_->Add(",...");
         ++retainers_printed_;  // avoid printing ellipsis next time.
       }
       return;
     }
     JSObjectsCluster eq = coarser_.GetCoarseEquivalent(cluster);
     if (eq.is_null()) {
       current_stream_->Put(',');
       cluster.Print(current_stream_);
@@ skipping 64 matching lines @@
   js_retainer_profile.PrintStats();
 
   LOG(HeapSampleEndEvent("Heap", "allocated"));
 }
 
 
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 
 } }  // namespace v8::internal