| Index: src/crankshaft/arm/lithium-arm.cc
|
| diff --git a/src/crankshaft/arm/lithium-arm.cc b/src/crankshaft/arm/lithium-arm.cc
|
| index d8ee9cd6aaca2bd10da7f80bc1de98480ad6db81..b015d06299bc24d65dd782afeb143fb0939038e7 100644
|
| --- a/src/crankshaft/arm/lithium-arm.cc
|
| +++ b/src/crankshaft/arm/lithium-arm.cc
|
| @@ -2014,10 +2014,7 @@ LInstruction* LChunkBuilder::DoLoadGlobalGeneric(HLoadGlobalGeneric* instr) {
|
| LOperand* context = UseFixed(instr->context(), cp);
|
| LOperand* global_object =
|
| UseFixed(instr->global_object(), LoadDescriptor::ReceiverRegister());
|
| - LOperand* vector = NULL;
|
| - if (instr->HasVectorAndSlot()) {
|
| - vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister());
|
| - }
|
| + LOperand* vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister());
|
| LLoadGlobalGeneric* result =
|
| new(zone()) LLoadGlobalGeneric(context, global_object, vector);
|
| return MarkAsCall(DefineFixed(result, r0), instr);
|
| @@ -2063,10 +2060,7 @@ LInstruction* LChunkBuilder::DoLoadNamedGeneric(HLoadNamedGeneric* instr) {
|
| LOperand* context = UseFixed(instr->context(), cp);
|
| LOperand* object =
|
| UseFixed(instr->object(), LoadDescriptor::ReceiverRegister());
|
| - LOperand* vector = NULL;
|
| - if (instr->HasVectorAndSlot()) {
|
| - vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister());
|
| - }
|
| + LOperand* vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister());
|
|
|
| LInstruction* result =
|
| DefineFixed(new(zone()) LLoadNamedGeneric(context, object, vector), r0);
|
| @@ -2138,10 +2132,7 @@ LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) {
|
| LOperand* object =
|
| UseFixed(instr->object(), LoadDescriptor::ReceiverRegister());
|
| LOperand* key = UseFixed(instr->key(), LoadDescriptor::NameRegister());
|
| - LOperand* vector = NULL;
|
| - if (instr->HasVectorAndSlot()) {
|
| - vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister());
|
| - }
|
| + LOperand* vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister());
|
|
|
| LInstruction* result =
|
| DefineFixed(new(zone()) LLoadKeyedGeneric(context, object, key, vector),
|
| @@ -2203,12 +2194,8 @@ LInstruction* LChunkBuilder::DoStoreKeyedGeneric(HStoreKeyedGeneric* instr) {
|
| DCHECK(instr->key()->representation().IsTagged());
|
| DCHECK(instr->value()->representation().IsTagged());
|
|
|
| - LOperand* slot = NULL;
|
| - LOperand* vector = NULL;
|
| - if (instr->HasVectorAndSlot()) {
|
| - slot = FixedTemp(VectorStoreICDescriptor::SlotRegister());
|
| - vector = FixedTemp(VectorStoreICDescriptor::VectorRegister());
|
| - }
|
| + LOperand* slot = FixedTemp(VectorStoreICDescriptor::SlotRegister());
|
| + LOperand* vector = FixedTemp(VectorStoreICDescriptor::VectorRegister());
|
|
|
| LStoreKeyedGeneric* result =
|
| new (zone()) LStoreKeyedGeneric(context, obj, key, val, slot, vector);
|
| @@ -2297,12 +2284,8 @@ LInstruction* LChunkBuilder::DoStoreNamedGeneric(HStoreNamedGeneric* instr) {
|
| LOperand* obj =
|
| UseFixed(instr->object(), StoreDescriptor::ReceiverRegister());
|
| LOperand* val = UseFixed(instr->value(), StoreDescriptor::ValueRegister());
|
| - LOperand* slot = NULL;
|
| - LOperand* vector = NULL;
|
| - if (instr->HasVectorAndSlot()) {
|
| - slot = FixedTemp(VectorStoreICDescriptor::SlotRegister());
|
| - vector = FixedTemp(VectorStoreICDescriptor::VectorRegister());
|
| - }
|
| + LOperand* slot = FixedTemp(VectorStoreICDescriptor::SlotRegister());
|
| + LOperand* vector = FixedTemp(VectorStoreICDescriptor::VectorRegister());
|
|
|
| LStoreNamedGeneric* result =
|
| new (zone()) LStoreNamedGeneric(context, obj, val, slot, vector);
|
|
|