Index: src/ia32/lithium-codegen-ia32.cc |
diff --git a/src/ia32/lithium-codegen-ia32.cc b/src/ia32/lithium-codegen-ia32.cc |
index 1f40bf7a083ba0f35e5cd09274cca8293de69986..12ff427069707fad7981b808a248aa20b1a7a277 100644 |
--- a/src/ia32/lithium-codegen-ia32.cc |
+++ b/src/ia32/lithium-codegen-ia32.cc |
@@ -2832,11 +2832,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(eax)); |
- __ mov(FullVectorLoadConvention::SlotRegister(), |
+ DCHECK(VectorLoadICDescriptor::SlotRegister().is(eax)); |
+ __ mov(VectorLoadICDescriptor::SlotRegister(), |
Immediate(Smi::FromInt(instr->hydrogen()->slot()))); |
} |
@@ -2844,10 +2844,10 @@ void LCodeGen::EmitVectorLoadICRegisters(T* instr) { |
void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(esi)); |
DCHECK(ToRegister(instr->global_object()) |
- .is(LoadConvention::ReceiverRegister())); |
+ .is(LoadDescriptor::ReceiverRegister())); |
DCHECK(ToRegister(instr->result()).is(eax)); |
- __ mov(LoadConvention::NameRegister(), instr->name()); |
+ __ mov(LoadDescriptor::NameRegister(), instr->name()); |
if (FLAG_vector_ics) { |
EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr); |
} |
@@ -2981,10 +2981,10 @@ void LCodeGen::EmitPushTaggedOperand(LOperand* operand) { |
void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(esi)); |
- DCHECK(ToRegister(instr->object()).is(LoadConvention::ReceiverRegister())); |
+ DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister())); |
DCHECK(ToRegister(instr->result()).is(eax)); |
- __ mov(LoadConvention::NameRegister(), instr->name()); |
+ __ mov(LoadDescriptor::NameRegister(), instr->name()); |
if (FLAG_vector_ics) { |
EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr); |
} |
@@ -3209,8 +3209,8 @@ Operand LCodeGen::BuildFastArrayOperand( |
void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(esi)); |
- 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); |
@@ -4068,10 +4068,10 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(esi)); |
- 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(), instr->name()); |
+ __ mov(StoreDescriptor::NameRegister(), instr->name()); |
Handle<Code> ic = StoreIC::initialize_stub(isolate(), instr->strict_mode()); |
CallCode(ic, RelocInfo::CODE_TARGET, instr); |
} |
@@ -4250,9 +4250,9 @@ void LCodeGen::DoStoreKeyed(LStoreKeyed* instr) { |
void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) { |
DCHECK(ToRegister(instr->context()).is(esi)); |
- 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() |