Index: src/crankshaft/ia32/lithium-ia32.cc |
diff --git a/src/crankshaft/ia32/lithium-ia32.cc b/src/crankshaft/ia32/lithium-ia32.cc |
index 0bfdb0d85aef8eafe1054e465a454dbd7cadbef8..5e9561bfc076d2d024d376a7993ac4135ecf6822 100644 |
--- a/src/crankshaft/ia32/lithium-ia32.cc |
+++ b/src/crankshaft/ia32/lithium-ia32.cc |
@@ -2020,10 +2020,7 @@ LInstruction* LChunkBuilder::DoLoadGlobalGeneric(HLoadGlobalGeneric* instr) { |
LOperand* context = UseFixed(instr->context(), esi); |
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); |
@@ -2074,10 +2071,7 @@ LInstruction* LChunkBuilder::DoLoadNamedGeneric(HLoadNamedGeneric* instr) { |
LOperand* context = UseFixed(instr->context(), esi); |
LOperand* object = |
UseFixed(instr->object(), LoadDescriptor::ReceiverRegister()); |
- LOperand* vector = NULL; |
- if (instr->HasVectorAndSlot()) { |
- vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister()); |
- } |
+ LOperand* vector = FixedTemp(LoadWithVectorDescriptor::VectorRegister()); |
LLoadNamedGeneric* result = new(zone()) LLoadNamedGeneric( |
context, object, vector); |
return MarkAsCall(DefineFixed(result, eax), instr); |
@@ -2147,10 +2141,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()); |
LLoadKeyedGeneric* result = |
new(zone()) LLoadKeyedGeneric(context, object, key, vector); |
return MarkAsCall(DefineFixed(result, eax), instr); |
@@ -2234,12 +2225,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, object, key, value, slot, vector); |
@@ -2353,12 +2340,8 @@ LInstruction* LChunkBuilder::DoStoreNamedGeneric(HStoreNamedGeneric* instr) { |
LOperand* object = |
UseFixed(instr->object(), StoreDescriptor::ReceiverRegister()); |
LOperand* value = 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, object, value, slot, vector); |