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

src/zone-inl.h

-// 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 40 matching lines @@
   ASSERT(ZoneScope::nesting() > 0);
   // Round up the requested size to fit the alignment.
   size = RoundUp(size, kAlignment);
 
   // Check if the requested size is available without expanding.
   Address result = position_;
   if ((position_ += size) > limit_) result = NewExpand(size);
 
   // Check that the result has the proper alignment and return it.
   ASSERT(IsAddressAligned(result, kAlignment, 0));
+  allocation_size_ += size;
   return reinterpret_cast<void*>(result);
 }
 
 
 template <typename T>
 T* Zone::NewArray(int length) {
   return static_cast<T*>(New(length * sizeof(T)));
 }
 
 
@@ skipping 43 matching lines @@
 
 
 int ZoneScope::nesting() {
   return Isolate::Current()->zone()->scope_nesting_;
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_ZONE_INL_H_