From fee4e2eff0b6d76fb52e776802efae8d0b8ee0bf Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Wed, 20 Jan 2016 21:23:10 +0000 Subject: [PATCH] Revert "Fix gtests after loop inlining support." This reverts commit 0e342cd5ccf0f648e165fa4fd270b44dfbea8be6. Loop inlining exposes BCE issues. Bug: 26689526 Change-Id: Iab0f8f502d8b389af4efc2e99e28cae59c00ee9b --- compiler/optimizing/dominator_test.cc | 5 ++--- compiler/optimizing/graph_test.cc | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/compiler/optimizing/dominator_test.cc b/compiler/optimizing/dominator_test.cc index feb8b2092..91e4a997f 100644 --- a/compiler/optimizing/dominator_test.cc +++ b/compiler/optimizing/dominator_test.cc @@ -133,9 +133,8 @@ TEST(OptimizerTest, CFG4) { const uint32_t dominators[] = { kInvalidBlockId, - 3, - kInvalidBlockId, - 0 + 0, + kInvalidBlockId }; TestCode(data1, dominators, sizeof(dominators) / sizeof(int)); diff --git a/compiler/optimizing/graph_test.cc b/compiler/optimizing/graph_test.cc index d5305646a..d4b9b7195 100644 --- a/compiler/optimizing/graph_test.cc +++ b/compiler/optimizing/graph_test.cc @@ -164,7 +164,7 @@ TEST(GraphTest, IfSuccessorMultipleBackEdges1) { // Ensure there is only one back edge. ASSERT_EQ(if_block->GetPredecessors().size(), 2u); - ASSERT_EQ(if_block->GetPredecessors()[0], entry_block->GetSingleSuccessor()); + ASSERT_EQ(if_block->GetPredecessors()[0], entry_block); ASSERT_NE(if_block->GetPredecessors()[1], if_block); // Ensure the new block is the back edge. @@ -199,7 +199,7 @@ TEST(GraphTest, IfSuccessorMultipleBackEdges2) { // Ensure there is only one back edge. ASSERT_EQ(if_block->GetPredecessors().size(), 2u); - ASSERT_EQ(if_block->GetPredecessors()[0], entry_block->GetSingleSuccessor()); + ASSERT_EQ(if_block->GetPredecessors()[0], entry_block); ASSERT_NE(if_block->GetPredecessors()[1], if_block); // Ensure the new block is the back edge. -- 2.11.0