commit af92d54d4e0d5fdde3a556a58c3f7c4ae31540e2
author Matthew Brandyberry <mbrandy@us.ibm.com> Mon Oct 19 19:38:31 2015
committer Matthew Brandyberry <mbrandy@us.ibm.com> Mon Oct 19 19:40:20 2015
tree 0ad2a134553f6c96ec13322c1c8689ff26dd0e94
parent 1316530e65091df599251bd35482f1e8b7d7b01f

Version 4.7.80.13 (cherry-pick)

Merged 4ddc9f1cc82f739f6da657e4076c291cbcdab765

[test] Protect against infinite loops in LiveRange logic.

R=bmeurer@chromium.org, hablich@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1411933004 .

Cr-Commit-Position: refs/branch-heads/4.7@{#22}
Cr-Branched-From: f3c89267db0fc6120d95046c3ff35a35ca34614f-refs/heads/master@{#31014}

include/v8-version.h

diff --git a/include/v8-version.h b/include/v8-version.h
index 4ae5e74..ca42006 100644
--- a/include/v8-version.h
+++ b/include/v8-version.h
@@ -11,7 +11,7 @@
 #define V8_MAJOR_VERSION 4
 #define V8_MINOR_VERSION 7
 #define V8_BUILD_NUMBER 80
-#define V8_PATCH_LEVEL 12
+#define V8_PATCH_LEVEL 13
 
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)

test/unittests/compiler/live-range-unittest.cc

diff --git a/test/unittests/compiler/live-range-unittest.cc b/test/unittests/compiler/live-range-unittest.cc
index 6237218..886a812 100644
--- a/test/unittests/compiler/live-range-unittest.cc
+++ b/test/unittests/compiler/live-range-unittest.cc
@@ -11,9 +11,11 @@
 #ifdef DEBUG
 #define V8_ASSERT_DEBUG_DEATH(statement, regex) \
   ASSERT_DEATH_IF_SUPPORTED(statement, regex)
+#define DISABLE_IN_RELEASE(Name) Name
 
 #else
 #define V8_ASSERT_DEBUG_DEATH(statement, regex) statement
+#define DISABLE_IN_RELEASE(Name) DISABLED_##Name
 #endif  // DEBUG
 
 namespace v8 {
@@ -83,19 +85,19 @@
 }
 
 
-TEST_F(LiveRangeUnitTest, InvalidSplitEnd) {
+TEST_F(LiveRangeUnitTest, DISABLE_IN_RELEASE(InvalidSplitEnd)) {
   TopLevelLiveRange* range = TestRangeBuilder(zone()).Build(0, 1);
   ASSERT_DEATH_IF_SUPPORTED(Split(range, 1), ".*");
 }
 
 
-TEST_F(LiveRangeUnitTest, SplitInvalidPreStart) {
+TEST_F(LiveRangeUnitTest, DISABLE_IN_RELEASE(SplitInvalidPreStart)) {
   TopLevelLiveRange* range = TestRangeBuilder(zone()).Build(1, 2);
   ASSERT_DEATH_IF_SUPPORTED(Split(range, 0), ".*");
 }
 
 
-TEST_F(LiveRangeUnitTest, SplitInvalidPostEnd) {
+TEST_F(LiveRangeUnitTest, DISABLE_IN_RELEASE(SplitInvalidPostEnd)) {
   TopLevelLiveRange* range = TestRangeBuilder(zone()).Build(0, 1);
   ASSERT_DEATH_IF_SUPPORTED(Split(range, 2), ".*");
 }