| Index: src/x64/lithium-codegen-x64.cc
|
| diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc
|
| index 74bb1327483111248f7381b6a1c35894ee6fd412..d05f72ba54524b182ece5356cac3223133fc6fa5 100644
|
| --- a/src/x64/lithium-codegen-x64.cc
|
| +++ b/src/x64/lithium-codegen-x64.cc
|
| @@ -2850,11 +2850,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()));
|
| __ Move(vector, instr->hydrogen()->feedback_vector());
|
| // No need to allocate this register.
|
| - DCHECK(VectorLoadConvention::SlotRegister().is(rax));
|
| - __ Move(VectorLoadConvention::SlotRegister(),
|
| + DCHECK(VectorLoadICDescriptor::SlotRegister().is(rax));
|
| + __ Move(VectorLoadICDescriptor::SlotRegister(),
|
| Smi::FromInt(instr->hydrogen()->slot()));
|
| }
|
|
|
| @@ -2862,10 +2862,10 @@ void LCodeGen::EmitVectorLoadICRegisters(T* instr) {
|
| void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(rsi));
|
| DCHECK(ToRegister(instr->global_object())
|
| - .is(LoadConvention::ReceiverRegister()));
|
| + .is(LoadDescriptor::ReceiverRegister()));
|
| DCHECK(ToRegister(instr->result()).is(rax));
|
|
|
| - __ Move(LoadConvention::NameRegister(), instr->name());
|
| + __ Move(LoadDescriptor::NameRegister(), instr->name());
|
| if (FLAG_vector_ics) {
|
| EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr);
|
| }
|
| @@ -3005,10 +3005,10 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
|
|
| void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(rsi));
|
| - DCHECK(ToRegister(instr->object()).is(LoadConvention::ReceiverRegister()));
|
| + DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister()));
|
| DCHECK(ToRegister(instr->result()).is(rax));
|
|
|
| - __ Move(LoadConvention::NameRegister(), instr->name());
|
| + __ Move(LoadDescriptor::NameRegister(), instr->name());
|
| if (FLAG_vector_ics) {
|
| EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr);
|
| }
|
| @@ -3289,8 +3289,8 @@ Operand LCodeGen::BuildFastArrayOperand(
|
|
|
| void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(rsi));
|
| - 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);
|
| @@ -4189,10 +4189,10 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
|
|
| void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(rsi));
|
| - 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()));
|
|
|
| - __ Move(StoreConvention::NameRegister(), instr->hydrogen()->name());
|
| + __ Move(StoreDescriptor::NameRegister(), instr->hydrogen()->name());
|
| Handle<Code> ic = StoreIC::initialize_stub(isolate(), instr->strict_mode());
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr);
|
| }
|
| @@ -4454,9 +4454,9 @@ void LCodeGen::DoStoreKeyed(LStoreKeyed* instr) {
|
|
|
| void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(rsi));
|
| - 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()
|
|
|