- Remove [static] from methods in Zone and associated helpers.

src/zone.cc

 // Copyright 2006-2008 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 16 matching lines @@
 
 #include "v8.h"
 
 #include "zone-inl.h"
 #include "splay-tree-inl.h"
 
 namespace v8 {
 namespace internal {
 
 
-Address Zone::position_ = 0;
-Address Zone::limit_ = 0;
-int Zone::zone_excess_limit_ = 256 * MB;
-int Zone::segment_bytes_allocated_ = 0;
+int ZoneScope::nesting_ = 0;
 
-bool AssertNoZoneAllocation::allow_allocation_ = true;
+Zone::Zone()
+    : zone_excess_limit_(256 * MB),
+      segment_bytes_allocated_(0),
+      position_(0),
+      limit_(0) {
+}
 
-int ZoneScope::nesting_ = 0;
+
+ZoneScope::~ZoneScope() {
+  if (ShouldDeleteOnExit()) ZONE->DeleteAll();
+  --nesting_;
+}
+
 
 // Segments represent chunks of memory: They have starting address
 // (encoded in the this pointer) and a size in bytes. Segments are
 // chained together forming a LIFO structure with the newest segment
 // available as Segment::head(). Segments are allocated using malloc()
 // and de-allocated using free().
 
 class Segment {
  public:
   Segment* next() const { return next_; }
   void clear_next() { next_ = NULL; }
 
   int size() const { return size_; }
   int capacity() const { return size_ - sizeof(Segment); }
 
   Address start() const { return address(sizeof(Segment)); }
   Address end() const { return address(size_); }
 
   static Segment* head() { return head_; }
   static void set_head(Segment* head) { head_ = head; }
 
   // Creates a new segment, sets it size, and pushes it to the front
   // of the segment chain. Returns the new segment.
   static Segment* New(int size) {
     Segment* result = reinterpret_cast<Segment*>(Malloced::New(size));
-    Zone::adjust_segment_bytes_allocated(size);
+    ZONE->adjust_segment_bytes_allocated(size);
     if (result != NULL) {
       result->next_ = head_;
       result->size_ = size;
       head_ = result;
     }
     return result;
   }
 
   // Deletes the given segment. Does not touch the segment chain.
   static void Delete(Segment* segment, int size) {
-    Zone::adjust_segment_bytes_allocated(-size);
+    ZONE->adjust_segment_bytes_allocated(-size);
     Malloced::Delete(segment);
   }
 
   static int bytes_allocated() { return bytes_allocated_; }
 
  private:
   // Computes the address of the nth byte in this segment.
   Address address(int n) const {
     return Address(this) + n;
   }
@@ skipping 93 matching lines @@
   // Recompute 'top' and 'limit' based on the new segment.
   Address result = RoundUp(segment->start(), kAlignment);
   position_ = result + size;
   limit_ = segment->end();
   ASSERT(position_ <= limit_);
   return result;
 }
 
 
 } }  // namespace v8::internal