From a3c00e54f9b711bf3fc55ce5e7d4f8765e2ea9fa Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Tue, 25 Nov 2014 11:18:37 +0000 Subject: Fix tests now that dead phis are removed when building SSA. Change-Id: Ie795f5f1c7c44ec1a3ea2bac822b6255bfb8d45c --- compiler/optimizing/live_ranges_test.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing/live_ranges_test.cc') diff --git a/compiler/optimizing/live_ranges_test.cc b/compiler/optimizing/live_ranges_test.cc index 89c949563b..e3c6fec23b 100644 --- a/compiler/optimizing/live_ranges_test.cc +++ b/compiler/optimizing/live_ranges_test.cc @@ -386,7 +386,7 @@ TEST(LiveRangesTest, CFG4) { Instruction::ADD_INT, 1 << 8, Instruction::GOTO | 0x300, Instruction::ADD_INT, 1 << 8, - Instruction::RETURN | 1 << 8); + Instruction::RETURN); ArenaPool pool; ArenaAllocator allocator(&pool); @@ -410,7 +410,10 @@ TEST(LiveRangesTest, CFG4) { interval = liveness.GetInstructionFromSsaIndex(1)->GetLiveInterval(); range = interval->GetFirstRange(); ASSERT_EQ(4u, range->GetStart()); - ASSERT_EQ(28u, range->GetEnd()); + ASSERT_EQ(17u, range->GetEnd()); + range = range->GetNext(); + ASSERT_EQ(20u, range->GetStart()); + ASSERT_EQ(23u, range->GetEnd()); ASSERT_TRUE(range->GetNext() == nullptr); // Test for the first add. @@ -429,9 +432,8 @@ TEST(LiveRangesTest, CFG4) { ASSERT_EQ(26u, range->GetEnd()); ASSERT_TRUE(range->GetNext() == nullptr); - // Test for the phi, which is unused. HPhi* phi = liveness.GetInstructionFromSsaIndex(4)->AsPhi(); - ASSERT_EQ(phi->NumberOfUses(), 0u); + ASSERT_EQ(phi->NumberOfUses(), 1u); interval = phi->GetLiveInterval(); range = interval->GetFirstRange(); ASSERT_EQ(26u, range->GetStart()); -- cgit v1.2.3-59-g8ed1b