Merged r12731 into trunk branch. (issue 11140023)

[sven...@chromium.org]

Reviewers: Jakob,

Description:
Merged r12731 into trunk branch.

Fixed VERIFY_HEAP without DEBUG.

R=jkum...@chromium.org


Please review this at https://codereview.chromium.org/11140023/

SVN Base: https://v8.googlecode.com/svn/trunk

Affected files:
M src/profile-generator.cc
M src/version.cc


Index: src/profile-generator.cc
diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index
f50d85cfdad8bc15ddb2754a698cc503bf64bb8c..d9259c8c25ee294d828ea6134d8eeb5fc3a049f0
100644
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -3094,13 +3094,13 @@ bool HeapSnapshotGenerator::GenerateSnapshot() {
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
Index: src/version.cc
diff --git a/src/version.cc b/src/version.cc
index
a9f2cb74ce5b6e75e526fc5ba07bf0343d46feb2..083abc587a8663e8773c583933d6c74bdb3db812
100644
--- a/src/version.cc
+++ b/src/version.cc
@@ -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

[jkum...@chromium.org]

lgtm



https://codereview.chromium.org/11140023/