commit 18c219b21c6692036bc5f1d52f26c66378325bee
author Nicolas Geoffray <ngeoffray@google.com> Wed Feb 04 09:38:49 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Wed Feb 04 09:38:49 2015 +0000
tree 4558f65f0d08b13212763f84e8f28e7851f15d8a
parent b73e4447736996f7cc8b193d7e3f5c38d5739d22

Fix test after register allocator changes.

Change-Id: I22b8faf7926d33ab19033deaba77001d164abd2a

compiler/optimizing/register_allocator_test.cc

diff --git a/compiler/optimizing/register_allocator_test.cc b/compiler/optimizing/register_allocator_test.cc
index cb5010a..0e49bf2 100644
--- a/compiler/optimizing/register_allocator_test.cc
+++ b/compiler/optimizing/register_allocator_test.cc
@@ -526,7 +526,7 @@
 
     // Set the phi to a specific register, and check that the inputs get allocated
     // the same register.
-    phi->GetLocations()->SetOut(Location::RegisterLocation(2));
+    phi->GetLocations()->UpdateOut(Location::RegisterLocation(2));
     RegisterAllocator register_allocator(&allocator, &codegen, liveness);
     register_allocator.AllocateRegisters();
 
@@ -543,7 +543,7 @@
 
     // Set input1 to a specific register, and check that the phi and other input get allocated
     // the same register.
-    input1->GetLocations()->SetOut(Location::RegisterLocation(2));
+    input1->GetLocations()->UpdateOut(Location::RegisterLocation(2));
     RegisterAllocator register_allocator(&allocator, &codegen, liveness);
     register_allocator.AllocateRegisters();
 
@@ -560,7 +560,7 @@
 
     // Set input2 to a specific register, and check that the phi and other input get allocated
     // the same register.
-    input2->GetLocations()->SetOut(Location::RegisterLocation(2));
+    input2->GetLocations()->UpdateOut(Location::RegisterLocation(2));
     RegisterAllocator register_allocator(&allocator, &codegen, liveness);
     register_allocator.AllocateRegisters();
 
@@ -685,7 +685,7 @@
     liveness.Analyze();
 
     // check that both adds get the same register.
-    // Don't use SetOutput because output is already allocated.
+    // Don't use UpdateOutput because output is already allocated.
     first_add->InputAt(0)->GetLocations()->output_ = Location::RegisterLocation(2);
     ASSERT_EQ(first_add->GetLocations()->Out().GetPolicy(), Location::kSameAsFirstInput);
     ASSERT_EQ(second_add->GetLocations()->Out().GetPolicy(), Location::kSameAsFirstInput);