[Isolates] Merge from bleeding_edge to isolates, revisions 6100-6300.

src/zone.cc

-// Copyright 2006-2008 the V8 project authors. All rights reserved.
+// Copyright 2011 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
 //       with the distribution.
@@ skipping 23 matching lines @@
 
 
 Zone::Zone()
     : zone_excess_limit_(256 * MB),
       segment_bytes_allocated_(0),
       position_(0),
       limit_(0),
       scope_nesting_(0),
       segment_head_(NULL) {
 }
+unsigned Zone::allocation_size_ = 0;
 
 
 ZoneScope::~ZoneScope() {
   ASSERT_EQ(Isolate::Current(), isolate_);
   if (ShouldDeleteOnExit()) isolate_->zone()->DeleteAll();
   isolate_->zone()->scope_nesting_--;
 }
 
 
 // Segments represent chunks of memory: They have starting address
@@ skipping 131 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