diff options
| author | 2016-01-20 18:31:31 +0000 | |
|---|---|---|
| committer | 2016-01-20 18:31:31 +0000 | |
| commit | 7997bafd29c483583bcaa3135d958403caef94e3 (patch) | |
| tree | 0b75202e8c580d3743cafb0c3fe3e633f44693f0 /compiler/optimizing | |
| parent | 1f39dd3333587eee47ca6c22ba06107ff6cc9129 (diff) | |
| parent | 0e342cd5ccf0f648e165fa4fd270b44dfbea8be6 (diff) | |
Merge "Fix gtests after loop inlining support."
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/dominator_test.cc | 5 | ||||
| -rw-r--r-- | compiler/optimizing/graph_test.cc | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler/optimizing/dominator_test.cc b/compiler/optimizing/dominator_test.cc index 91e4a997fd..feb8b2092a 100644 --- a/compiler/optimizing/dominator_test.cc +++ b/compiler/optimizing/dominator_test.cc @@ -133,8 +133,9 @@ TEST(OptimizerTest, CFG4) { const uint32_t dominators[] = { kInvalidBlockId, - 0, - kInvalidBlockId + 3, + kInvalidBlockId, + 0 }; TestCode(data1, dominators, sizeof(dominators) / sizeof(int)); diff --git a/compiler/optimizing/graph_test.cc b/compiler/optimizing/graph_test.cc index d4b9b71952..d5305646a8 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); + ASSERT_EQ(if_block->GetPredecessors()[0], entry_block->GetSingleSuccessor()); 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); + ASSERT_EQ(if_block->GetPredecessors()[0], entry_block->GetSingleSuccessor()); ASSERT_NE(if_block->GetPredecessors()[1], if_block); // Ensure the new block is the back edge. |