Reviewers: Mads Ager, Description: Merge r6954 from the bleeding edge to the 2.5 branch.
Please review this at http://codereview.chromium.org/6598003/ SVN Base: http://v8.googlecode.com/svn/branches/2.5/ Affected files: M src/spaces.h M src/version.cc Index: src/spaces.h =================================================================== --- src/spaces.h (revision 6913) +++ src/spaces.h (working copy) @@ -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; Index: src/version.cc =================================================================== --- src/version.cc (revision 6913) +++ src/version.cc (working copy) @@ -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
