Revision: 12732 Author: [email protected] Date: Mon Oct 15 05:39:45 2012 Log: Merged r12731 into trunk branch.
Fixed VERIFY_HEAP without DEBUG. [email protected] Review URL: https://codereview.chromium.org/11140023 http://code.google.com/p/v8/source/detail?r=12732 Modified: /trunk/src/profile-generator.cc /trunk/src/version.cc ======================================= --- /trunk/src/profile-generator.cc Mon Oct 15 04:51:39 2012 +++ /trunk/src/profile-generator.cc Mon Oct 15 05:39:45 2012 @@ -3094,13 +3094,13 @@ Heap::kMakeHeapIterableMask, "HeapSnapshotGenerator::GenerateSnapshot"); -#ifdef DEBUG +#ifdef VERIFY_HEAP Heap* debug_heap = Isolate::Current()->heap(); - ASSERT(!debug_heap->old_data_space()->was_swept_conservatively()); - ASSERT(!debug_heap->old_pointer_space()->was_swept_conservatively()); - ASSERT(!debug_heap->code_space()->was_swept_conservatively()); - ASSERT(!debug_heap->cell_space()->was_swept_conservatively()); - ASSERT(!debug_heap->map_space()->was_swept_conservatively()); + CHECK(!debug_heap->old_data_space()->was_swept_conservatively()); + CHECK(!debug_heap->old_pointer_space()->was_swept_conservatively()); + CHECK(!debug_heap->code_space()->was_swept_conservatively()); + CHECK(!debug_heap->cell_space()->was_swept_conservatively()); + CHECK(!debug_heap->map_space()->was_swept_conservatively()); #endif // The following code uses heap iterators, so we want the heap to be ======================================= --- /trunk/src/version.cc Mon Oct 15 04:51:39 2012 +++ /trunk/src/version.cc Mon Oct 15 05:39:45 2012 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 14 #define BUILD_NUMBER 4 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
