Revision: 6961
Author: [email protected]
Date: Mon Feb 28 02:30:06 2011
Log: Merge r6954 from the bleeding edge to the 2.5 branch.
Review URL: http://codereview.chromium.org/6598003
http://code.google.com/p/v8/source/detail?r=6961
Modified:
/branches/2.5/src/spaces.h
/branches/2.5/src/version.cc
=======================================
--- /branches/2.5/src/spaces.h Thu Nov 18 04:04:40 2010
+++ /branches/2.5/src/spaces.h Mon Feb 28 02:30:06 2011
@@ -2062,6 +2062,12 @@
accounting_stats_.DeallocateBytes(accounting_stats_.Size());
accounting_stats_.AllocateBytes(new_size);
+ // Flush allocation watermarks.
+ for (Page* p = first_page_; p != top_page; p = p->next_page()) {
+ p->SetAllocationWatermark(p->AllocationTop());
+ }
+ top_page->SetAllocationWatermark(new_top);
+
#ifdef DEBUG
if (FLAG_enable_slow_asserts) {
intptr_t actual_size = 0;
=======================================
--- /branches/2.5/src/version.cc Tue Feb 22 01:33:52 2011
+++ /branches/2.5/src/version.cc Mon Feb 28 02:30:06 2011
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 5
#define BUILD_NUMBER 9
-#define PATCH_LEVEL 16
+#define PATCH_LEVEL 17
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
