Revert "Fix gtests after loop inlining support."
This reverts commit 0e342cd5ccf0f648e165fa4fd270b44dfbea8be6.
Loop inlining exposes BCE issues.
Bug: 26689526
Change-Id: Iab0f8f502d8b389af4efc2e99e28cae59c00ee9b
diff --git a/compiler/optimizing/dominator_test.cc b/compiler/optimizing/dominator_test.cc
index feb8b20..91e4a997 100644
--- a/compiler/optimizing/dominator_test.cc
+++ b/compiler/optimizing/dominator_test.cc
@@ -133,9 +133,8 @@
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 d530564..d4b9b71 100644
--- a/compiler/optimizing/graph_test.cc
+++ b/compiler/optimizing/graph_test.cc
@@ -164,7 +164,7 @@
// 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 @@
// 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.
