Inline more zone stuff.

src/heap-profiler.cc

 // Copyright 2009-2010 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 456 matching lines @@
 void HeapProfiler::ObjectMoveEvent(Address from, Address to) {
   snapshots_->ObjectMoveEvent(from, to);
 }
 
 
 const JSObjectsClusterTreeConfig::Key JSObjectsClusterTreeConfig::kNoKey;
 const JSObjectsClusterTreeConfig::Value JSObjectsClusterTreeConfig::kNoValue;
 
 
 ConstructorHeapProfile::ConstructorHeapProfile()
-    : zscope_(DELETE_ON_EXIT) {
+    : zscope_(Isolate::Current(), DELETE_ON_EXIT) {
 }
 
 
 void ConstructorHeapProfile::Call(const JSObjectsCluster& cluster,
                                   const NumberAndSizeInfo& number_and_size) {
   HeapStringAllocator allocator;
   StringStream stream(&allocator);
   cluster.Print(&stream);
   LOG(ISOLATE,
       HeapSampleJSConstructorEvent(*(stream.ToCString()),
@@ skipping 89 matching lines @@
   if (a.refs.length() > b.refs.length()) return 1;
   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),
+    : zscope_(Isolate::Current(), DELETE_ON_EXIT),
       sim_list_(ClustersCoarser::kInitialSimilarityListCapacity),
       current_pair_(NULL),
       current_set_(NULL),
       self_(NULL) {
 }
 
 
 void ClustersCoarser::Call(const JSObjectsCluster& cluster,
                            JSObjectsClusterTree* tree) {
   if (!cluster.can_be_coarsed()) return;
@@ skipping 94 matching lines @@
 
 
 const JSObjectsCluster ClustersCoarser::ClusterEqualityConfig::kNoKey;
 const JSObjectsCluster ClustersCoarser::ClusterEqualityConfig::kNoValue;
 const JSObjectsRetainerTreeConfig::Key JSObjectsRetainerTreeConfig::kNoKey;
 const JSObjectsRetainerTreeConfig::Value JSObjectsRetainerTreeConfig::kNoValue =
     NULL;
 
 
 RetainerHeapProfile::RetainerHeapProfile()
-    : zscope_(DELETE_ON_EXIT),
+    : zscope_(Isolate::Current(), DELETE_ON_EXIT),
       aggregator_(NULL) {
   JSObjectsCluster roots(JSObjectsCluster::ROOTS);
   ReferencesExtractor extractor(roots, this);
   HEAP->IterateRoots(&extractor, VISIT_ONLY_STRONG);
 }
 
 
 RetainerHeapProfile::~RetainerHeapProfile() {
   delete aggregator_;
 }
@@ skipping 307 matching lines @@
   explicit AggregatingRetainerTreeIterator(ClustersCoarser* coarser,
                                            HeapEntriesAllocator* allocator,
                                            HeapEntriesMap* map)
       : coarser_(coarser), allocator_(allocator), map_(map) {
   }
 
   void Call(const JSObjectsCluster& cluster, JSObjectsClusterTree* tree) {
     if (coarser_ != NULL &&
         !coarser_->GetCoarseEquivalent(cluster).is_null()) return;
     JSObjectsClusterTree* tree_to_iterate = tree;
-    ZoneScope zs(DELETE_ON_EXIT);
+    ZoneScope zs(Isolate::Current(), DELETE_ON_EXIT);
     JSObjectsClusterTree dest_tree_;
     if (coarser_ != NULL) {
       RetainersAggregator retainers_aggregator(coarser_, &dest_tree_);
       tree->ForEach(&retainers_aggregator);
       tree_to_iterate = &dest_tree_;
     }
     RetainersIterator iterator(cluster, allocator_, map_);
     tree_to_iterate->ForEach(&iterator);
   }
 
@@ skipping 123 matching lines @@
   isolate_->global_handles()->MakeWeak(handle.location(),
                                        static_cast<void*>(stack.start()),
                                        StackWeakReferenceCallback);
 }
 
 
 #endif  // ENABLE_LOGGING_AND_PROFILING
 
 
 } }  // namespace v8::internal