| Index: src/lithium.cc | 
| diff --git a/src/lithium.cc b/src/lithium.cc | 
| index bc48a0a16389e3f505ebba26fba867726f45e271..7d37532ace71140d61bf42f20937aac91ac3088d 100644 | 
| --- a/src/lithium.cc | 
| +++ b/src/lithium.cc | 
| @@ -56,22 +56,24 @@ | 
| break; | 
| case LUnallocated::FIXED_REGISTER: { | 
| int reg_index = unalloc->fixed_register_index(); | 
| -          if (reg_index < 0 || reg_index >= Register::kNumRegisters) { | 
| +          if (reg_index < 0 || | 
| +              reg_index >= Register::kMaxNumAllocatableRegisters) { | 
| stream->Add("(=invalid_reg#%d)", reg_index); | 
| } else { | 
| const char* register_name = | 
| -                Register::from_code(reg_index).ToString(); | 
| +                Register::AllocationIndexToString(reg_index); | 
| stream->Add("(=%s)", register_name); | 
| } | 
| break; | 
| } | 
| case LUnallocated::FIXED_DOUBLE_REGISTER: { | 
| int reg_index = unalloc->fixed_register_index(); | 
| -          if (reg_index < 0 || reg_index >= DoubleRegister::kMaxNumRegisters) { | 
| +          if (reg_index < 0 || | 
| +              reg_index >= DoubleRegister::kMaxNumAllocatableRegisters) { | 
| stream->Add("(=invalid_double_reg#%d)", reg_index); | 
| } else { | 
| const char* double_register_name = | 
| -                DoubleRegister::from_code(reg_index).ToString(); | 
| +                DoubleRegister::AllocationIndexToString(reg_index); | 
| stream->Add("(=%s)", double_register_name); | 
| } | 
| break; | 
| @@ -104,19 +106,21 @@ | 
| break; | 
| case REGISTER: { | 
| int reg_index = index(); | 
| -      if (reg_index < 0 || reg_index >= Register::kNumRegisters) { | 
| +      if (reg_index < 0 || reg_index >= Register::kMaxNumAllocatableRegisters) { | 
| stream->Add("(=invalid_reg#%d|R)", reg_index); | 
| } else { | 
| -        stream->Add("[%s|R]", Register::from_code(reg_index).ToString()); | 
| +        stream->Add("[%s|R]", Register::AllocationIndexToString(reg_index)); | 
| } | 
| break; | 
| } | 
| case DOUBLE_REGISTER: { | 
| int reg_index = index(); | 
| -      if (reg_index < 0 || reg_index >= DoubleRegister::kMaxNumRegisters) { | 
| +      if (reg_index < 0 || | 
| +          reg_index >= DoubleRegister::kMaxNumAllocatableRegisters) { | 
| stream->Add("(=invalid_double_reg#%d|R)", reg_index); | 
| } else { | 
| -        stream->Add("[%s|R]", DoubleRegister::from_code(reg_index).ToString()); | 
| +        stream->Add("[%s|R]", | 
| +                    DoubleRegister::AllocationIndexToString(reg_index)); | 
| } | 
| break; | 
| } | 
|  |