Index: src/crankshaft/mips64/lithium-mips64.cc |
diff --git a/src/crankshaft/mips64/lithium-mips64.cc b/src/crankshaft/mips64/lithium-mips64.cc |
index 3ee9ab6a3ea96725897a539861e7b13e68a3741e..17f59d84fccff7dfc499b963435e33416a0bc452 100644 |
--- a/src/crankshaft/mips64/lithium-mips64.cc |
+++ b/src/crankshaft/mips64/lithium-mips64.cc |
@@ -1964,10 +1964,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); |
@@ -2013,10 +2010,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); |
@@ -2089,10 +2083,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), |
@@ -2155,12 +2146,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); |
@@ -2249,12 +2236,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); |