Index: src/arm64/lithium-arm64.cc |
diff --git a/src/arm64/lithium-arm64.cc b/src/arm64/lithium-arm64.cc |
index 90ee0054f043f3c09a36db6c6839c6cffbd9e024..b731d963e7c50dc65271fbcbe54dc96c47b803b4 100644 |
--- a/src/arm64/lithium-arm64.cc |
+++ b/src/arm64/lithium-arm64.cc |
@@ -1663,11 +1663,11 @@ LInstruction* LChunkBuilder::DoLoadGlobalCell(HLoadGlobalCell* instr) { |
LInstruction* LChunkBuilder::DoLoadGlobalGeneric(HLoadGlobalGeneric* instr) { |
LOperand* context = UseFixed(instr->context(), cp); |
- LOperand* global_object = UseFixed(instr->global_object(), |
- LoadIC::ReceiverRegister()); |
+ LOperand* global_object = |
+ UseFixed(instr->global_object(), LoadConvention::ReceiverRegister()); |
LOperand* vector = NULL; |
if (FLAG_vector_ics) { |
- vector = FixedTemp(LoadIC::VectorRegister()); |
+ vector = FixedTemp(FullVectorLoadConvention::VectorRegister()); |
} |
LLoadGlobalGeneric* result = |
@@ -1725,11 +1725,12 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) { |
LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) { |
LOperand* context = UseFixed(instr->context(), cp); |
- LOperand* object = UseFixed(instr->object(), LoadIC::ReceiverRegister()); |
- LOperand* key = UseFixed(instr->key(), LoadIC::NameRegister()); |
+ LOperand* object = |
+ UseFixed(instr->object(), LoadConvention::ReceiverRegister()); |
+ LOperand* key = UseFixed(instr->key(), LoadConvention::NameRegister()); |
LOperand* vector = NULL; |
if (FLAG_vector_ics) { |
- vector = FixedTemp(LoadIC::VectorRegister()); |
+ vector = FixedTemp(FullVectorLoadConvention::VectorRegister()); |
} |
LInstruction* result = |
@@ -1747,10 +1748,11 @@ LInstruction* LChunkBuilder::DoLoadNamedField(HLoadNamedField* instr) { |
LInstruction* LChunkBuilder::DoLoadNamedGeneric(HLoadNamedGeneric* instr) { |
LOperand* context = UseFixed(instr->context(), cp); |
- LOperand* object = UseFixed(instr->object(), LoadIC::ReceiverRegister()); |
+ LOperand* object = |
+ UseFixed(instr->object(), LoadConvention::ReceiverRegister()); |
LOperand* vector = NULL; |
if (FLAG_vector_ics) { |
- vector = FixedTemp(LoadIC::VectorRegister()); |
+ vector = FixedTemp(FullVectorLoadConvention::VectorRegister()); |
} |
LInstruction* result = |
@@ -2366,10 +2368,10 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
LInstruction* LChunkBuilder::DoStoreKeyedGeneric(HStoreKeyedGeneric* instr) { |
LOperand* context = UseFixed(instr->context(), cp); |
- LOperand* object = UseFixed(instr->object(), |
- KeyedStoreIC::ReceiverRegister()); |
- LOperand* key = UseFixed(instr->key(), KeyedStoreIC::NameRegister()); |
- LOperand* value = UseFixed(instr->value(), KeyedStoreIC::ValueRegister()); |
+ LOperand* object = |
+ UseFixed(instr->object(), StoreConvention::ReceiverRegister()); |
+ LOperand* key = UseFixed(instr->key(), StoreConvention::NameRegister()); |
+ LOperand* value = UseFixed(instr->value(), StoreConvention::ValueRegister()); |
DCHECK(instr->object()->representation().IsTagged()); |
DCHECK(instr->key()->representation().IsTagged()); |
@@ -2411,8 +2413,9 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) { |
LInstruction* LChunkBuilder::DoStoreNamedGeneric(HStoreNamedGeneric* instr) { |
LOperand* context = UseFixed(instr->context(), cp); |
- LOperand* object = UseFixed(instr->object(), StoreIC::ReceiverRegister()); |
- LOperand* value = UseFixed(instr->value(), StoreIC::ValueRegister()); |
+ LOperand* object = |
+ UseFixed(instr->object(), StoreConvention::ReceiverRegister()); |
+ LOperand* value = UseFixed(instr->value(), StoreConvention::ValueRegister()); |
LInstruction* result = new(zone()) LStoreNamedGeneric(context, object, value); |
return MarkAsCall(result, instr); |