summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-10-21 16:14:40 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-10-21 16:14:41 +0000
commit4403b08717af2fe476e933c8cb69f53fe37a6c5a (patch)
treed857ca02dec553b30a6fd8d5d39ca88b2ece95ab
parent4ff20eba94a2519e5bac57b5f92e04741ea90141 (diff)
parent1f897b98e19a9b0192a373ee9d3c2fcb4a9463f4 (diff)
downloadart-4403b08717af2fe476e933c8cb69f53fe37a6c5a.tar.gz
art-4403b08717af2fe476e933c8cb69f53fe37a6c5a.tar.bz2
art-4403b08717af2fe476e933c8cb69f53fe37a6c5a.zip
Merge "Fix register_allocator_test after reg alloc changes."
-rw-r--r--compiler/optimizing/register_allocator_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/register_allocator_test.cc b/compiler/optimizing/register_allocator_test.cc
index 7517a6b00..2d84a9d33 100644
--- a/compiler/optimizing/register_allocator_test.cc
+++ b/compiler/optimizing/register_allocator_test.cc
@@ -348,14 +348,14 @@ TEST(RegisterAllocatorTest, FirstRegisterUse) {
// Split at the next instruction.
interval = interval->SplitAt(first_add->GetLifetimePosition() + 2);
// The user of the split is the last add.
- ASSERT_EQ(interval->FirstRegisterUse(), last_add->GetLifetimePosition() - 1);
+ ASSERT_EQ(interval->FirstRegisterUse(), last_add->GetLifetimePosition());
// Split before the last add.
LiveInterval* new_interval = interval->SplitAt(last_add->GetLifetimePosition() - 1);
// Ensure the current interval has no register use...
ASSERT_EQ(interval->FirstRegisterUse(), kNoLifetime);
// And the new interval has it for the last add.
- ASSERT_EQ(new_interval->FirstRegisterUse(), last_add->GetLifetimePosition() - 1);
+ ASSERT_EQ(new_interval->FirstRegisterUse(), last_add->GetLifetimePosition());
}
TEST(RegisterAllocatorTest, DeadPhi) {