| Index: src/crankshaft/mips/lithium-mips.cc
|
| diff --git a/src/crankshaft/mips/lithium-mips.cc b/src/crankshaft/mips/lithium-mips.cc
|
| index 345694d78fc3202725ea5bce1e4d1853010e6e63..7b481db188042e26cbb38efdd6eacb5fa1659b2d 100644
|
| --- a/src/crankshaft/mips/lithium-mips.cc
|
| +++ b/src/crankshaft/mips/lithium-mips.cc
|
| @@ -1961,10 +1961,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, v0), instr);
|
| @@ -2010,10 +2007,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), v0);
|
| @@ -2085,10 +2079,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),
|
| @@ -2150,12 +2141,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);
|
| @@ -2244,12 +2231,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);
|
|
|