Index: src/arm64/lithium-codegen-arm64.cc |
diff --git a/src/arm64/lithium-codegen-arm64.cc b/src/arm64/lithium-codegen-arm64.cc |
index 5d2014c8185c93ad75f525f790fae48811c2718d..e32c4ba8b739f6c09beccacc75426f15e704b08e 100644 |
--- a/src/arm64/lithium-codegen-arm64.cc |
+++ b/src/arm64/lithium-codegen-arm64.cc |
@@ -3348,11 +3348,11 @@ template <class T> |
void LCodeGen::EmitVectorLoadICRegisters(T* instr) { |
DCHECK(FLAG_vector_ics); |
Register vector = ToRegister(instr->temp_vector()); |
- DCHECK(vector.is(FullVectorLoadConvention::VectorRegister())); |
+ DCHECK(vector.is(VectorLoadICDescriptor::VectorRegister())); |
__ Mov(vector, instr->hydrogen()->feedback_vector()); |
// No need to allocate this register. |
- DCHECK(FullVectorLoadConvention::SlotRegister().is(x0)); |
- __ Mov(FullVectorLoadConvention::SlotRegister(), |
+ DCHECK(VectorLoadICDescriptor::SlotRegister().is(x0)); |
+ __ Mov(VectorLoadICDescriptor::SlotRegister(), |
Smi::FromInt(instr->hydrogen()->slot())); |
} |
@@ -3360,9 +3360,9 @@ void LCodeGen::EmitVectorLoadICRegisters(T* instr) { |
void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
DCHECK(ToRegister(instr->global_object()) |
- .is(LoadConvention::ReceiverRegister())); |
+ .is(LoadDescriptor::ReceiverRegister())); |
DCHECK(ToRegister(instr->result()).Is(x0)); |
- __ Mov(LoadConvention::NameRegister(), Operand(instr->name())); |
+ __ Mov(LoadDescriptor::NameRegister(), Operand(instr->name())); |
if (FLAG_vector_ics) { |
EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr); |
} |
@@ -3616,8 +3616,8 @@ void LCodeGen::DoLoadKeyedFixed(LLoadKeyedFixed* instr) { |
void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
- DCHECK(ToRegister(instr->object()).is(LoadConvention::ReceiverRegister())); |
- DCHECK(ToRegister(instr->key()).is(LoadConvention::NameRegister())); |
+ DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister())); |
+ DCHECK(ToRegister(instr->key()).is(LoadDescriptor::NameRegister())); |
if (FLAG_vector_ics) { |
EmitVectorLoadICRegisters<LLoadKeyedGeneric>(instr); |
} |
@@ -3672,8 +3672,8 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) { |
void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
// LoadIC expects name and receiver in registers. |
- DCHECK(ToRegister(instr->object()).is(LoadConvention::ReceiverRegister())); |
- __ Mov(LoadConvention::NameRegister(), Operand(instr->name())); |
+ DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister())); |
+ __ Mov(LoadDescriptor::NameRegister(), Operand(instr->name())); |
if (FLAG_vector_ics) { |
EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr); |
} |
@@ -5309,9 +5309,9 @@ void LCodeGen::DoStoreKeyedFixed(LStoreKeyedFixed* instr) { |
void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
- DCHECK(ToRegister(instr->object()).is(StoreConvention::ReceiverRegister())); |
- DCHECK(ToRegister(instr->key()).is(StoreConvention::NameRegister())); |
- DCHECK(ToRegister(instr->value()).is(StoreConvention::ValueRegister())); |
+ DCHECK(ToRegister(instr->object()).is(StoreDescriptor::ReceiverRegister())); |
+ DCHECK(ToRegister(instr->key()).is(StoreDescriptor::NameRegister())); |
+ DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister())); |
Handle<Code> ic = instr->strict_mode() == STRICT |
? isolate()->builtins()->KeyedStoreIC_Initialize_Strict() |
@@ -5416,10 +5416,10 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(cp)); |
- DCHECK(ToRegister(instr->object()).is(StoreConvention::ReceiverRegister())); |
- DCHECK(ToRegister(instr->value()).is(StoreConvention::ValueRegister())); |
+ DCHECK(ToRegister(instr->object()).is(StoreDescriptor::ReceiverRegister())); |
+ DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister())); |
- __ Mov(StoreConvention::NameRegister(), Operand(instr->name())); |
+ __ Mov(StoreDescriptor::NameRegister(), Operand(instr->name())); |
Handle<Code> ic = StoreIC::initialize_stub(isolate(), instr->strict_mode()); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |