| Index: src/ia32/lithium-ia32.cc
|
| diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
|
| index d68524075045fafee85bcce1bb306a7a5b4a2b87..b99a3b1e5b1f4d132736f509056cb25f894bb317 100644
|
| --- a/src/ia32/lithium-ia32.cc
|
| +++ b/src/ia32/lithium-ia32.cc
|
| @@ -1123,13 +1123,13 @@ LInstruction* LChunkBuilder::DoCallJSFunction(
|
|
|
| LInstruction* LChunkBuilder::DoCallWithDescriptor(
|
| HCallWithDescriptor* instr) {
|
| - const CallInterfaceDescriptor* descriptor = instr->descriptor();
|
| + CallInterfaceDescriptor descriptor = instr->descriptor();
|
| LOperand* target = UseRegisterOrConstantAtStart(instr->target());
|
| ZoneList<LOperand*> ops(instr->OperandCount(), zone());
|
| ops.Add(target, zone());
|
| for (int i = 1; i < instr->OperandCount(); i++) {
|
| - LOperand* op = UseFixed(instr->OperandAt(i),
|
| - descriptor->GetParameterRegister(i - 1));
|
| + LOperand* op =
|
| + UseFixed(instr->OperandAt(i), descriptor.GetParameterRegister(i - 1));
|
| ops.Add(op, zone());
|
| }
|
|
|
| @@ -2107,10 +2107,10 @@ LInstruction* LChunkBuilder::DoLoadGlobalCell(HLoadGlobalCell* instr) {
|
| LInstruction* LChunkBuilder::DoLoadGlobalGeneric(HLoadGlobalGeneric* instr) {
|
| LOperand* context = UseFixed(instr->context(), esi);
|
| LOperand* global_object =
|
| - UseFixed(instr->global_object(), LoadConvention::ReceiverRegister());
|
| + UseFixed(instr->global_object(), LoadDescriptor::ReceiverRegister());
|
| LOperand* vector = NULL;
|
| if (FLAG_vector_ics) {
|
| - vector = FixedTemp(FullVectorLoadConvention::VectorRegister());
|
| + vector = FixedTemp(VectorLoadICDescriptor::VectorRegister());
|
| }
|
|
|
| LLoadGlobalGeneric* result =
|
| @@ -2168,10 +2168,10 @@ LInstruction* LChunkBuilder::DoLoadNamedField(HLoadNamedField* instr) {
|
| LInstruction* LChunkBuilder::DoLoadNamedGeneric(HLoadNamedGeneric* instr) {
|
| LOperand* context = UseFixed(instr->context(), esi);
|
| LOperand* object =
|
| - UseFixed(instr->object(), LoadConvention::ReceiverRegister());
|
| + UseFixed(instr->object(), LoadDescriptor::ReceiverRegister());
|
| LOperand* vector = NULL;
|
| if (FLAG_vector_ics) {
|
| - vector = FixedTemp(FullVectorLoadConvention::VectorRegister());
|
| + vector = FixedTemp(VectorLoadICDescriptor::VectorRegister());
|
| }
|
| LLoadNamedGeneric* result = new(zone()) LLoadNamedGeneric(
|
| context, object, vector);
|
| @@ -2232,11 +2232,11 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) {
|
| LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) {
|
| LOperand* context = UseFixed(instr->context(), esi);
|
| LOperand* object =
|
| - UseFixed(instr->object(), LoadConvention::ReceiverRegister());
|
| - LOperand* key = UseFixed(instr->key(), LoadConvention::NameRegister());
|
| + UseFixed(instr->object(), LoadDescriptor::ReceiverRegister());
|
| + LOperand* key = UseFixed(instr->key(), LoadDescriptor::NameRegister());
|
| LOperand* vector = NULL;
|
| if (FLAG_vector_ics) {
|
| - vector = FixedTemp(FullVectorLoadConvention::VectorRegister());
|
| + vector = FixedTemp(VectorLoadICDescriptor::VectorRegister());
|
| }
|
| LLoadKeyedGeneric* result =
|
| new(zone()) LLoadKeyedGeneric(context, object, key, vector);
|
| @@ -2318,9 +2318,9 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
|
| LInstruction* LChunkBuilder::DoStoreKeyedGeneric(HStoreKeyedGeneric* instr) {
|
| LOperand* context = UseFixed(instr->context(), esi);
|
| LOperand* object =
|
| - UseFixed(instr->object(), StoreConvention::ReceiverRegister());
|
| - LOperand* key = UseFixed(instr->key(), StoreConvention::NameRegister());
|
| - LOperand* value = UseFixed(instr->value(), StoreConvention::ValueRegister());
|
| + UseFixed(instr->object(), StoreDescriptor::ReceiverRegister());
|
| + LOperand* key = UseFixed(instr->key(), StoreDescriptor::NameRegister());
|
| + LOperand* value = UseFixed(instr->value(), StoreDescriptor::ValueRegister());
|
|
|
| DCHECK(instr->object()->representation().IsTagged());
|
| DCHECK(instr->key()->representation().IsTagged());
|
| @@ -2423,8 +2423,8 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
|
| LInstruction* LChunkBuilder::DoStoreNamedGeneric(HStoreNamedGeneric* instr) {
|
| LOperand* context = UseFixed(instr->context(), esi);
|
| LOperand* object =
|
| - UseFixed(instr->object(), StoreConvention::ReceiverRegister());
|
| - LOperand* value = UseFixed(instr->value(), StoreConvention::ValueRegister());
|
| + UseFixed(instr->object(), StoreDescriptor::ReceiverRegister());
|
| + LOperand* value = UseFixed(instr->value(), StoreDescriptor::ValueRegister());
|
|
|
| LStoreNamedGeneric* result =
|
| new(zone()) LStoreNamedGeneric(context, object, value);
|
|
|