Merge "Fix a bug in the register allocator."

diff --cc compiler/optimizing/nodes.h
Simple merge

diff --cc compiler/optimizing/register_allocator.cc
Simple merge

diff --cc compiler/optimizing/register_allocator.h
index 70841b8,0a0c6e6..ec46a77
--- 1/compiler/optimizing/register_allocator.h
--- 2/compiler/optimizing/register_allocator.h
+++ b/compiler/optimizing/register_allocator.h
@@@ -190,13 -190,11 +190,14 @@@ class RegisterAllocator 
    // Slots reserved for out arguments.
    size_t reserved_out_slots_;
  
 -  // The maximum live registers at safepoints.
 -  size_t maximum_number_of_live_registers_;
 +  // The maximum live core registers at safepoints.
 +  size_t maximum_number_of_live_core_registers_;
 +
 +  // The maximum live FP registers at safepoints.
 +  size_t maximum_number_of_live_fp_registers_;
  
    ART_FRIEND_TEST(RegisterAllocatorTest, FreeUntil);
+   ART_FRIEND_TEST(RegisterAllocatorTest, SpillInactive);
  
    DISALLOW_COPY_AND_ASSIGN(RegisterAllocator);
  };