Index: src/x64/lithium-x64.cc |
diff --git a/src/x64/lithium-x64.cc b/src/x64/lithium-x64.cc |
index c1d81c08717b2364a4ff5180408d72418ed7a3de..d6f05c0a2df80bf90531fda2ed89aae021f9c442 100644 |
--- a/src/x64/lithium-x64.cc |
+++ b/src/x64/lithium-x64.cc |
@@ -2118,13 +2118,9 @@ LInstruction* LChunkBuilder::DoLoadExternalArrayPointer( |
LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) { |
- ASSERT(instr->key()->representation().IsInteger32() || |
- instr->key()->representation().IsSmi()); |
+ ASSERT(instr->key()->representation().IsInteger32()); |
ElementsKind elements_kind = instr->elements_kind(); |
- bool clobbers_key = instr->key()->representation().IsSmi(); |
- LOperand* key = clobbers_key |
- ? UseTempRegister(instr->key()) |
- : UseRegisterOrConstantAtStart(instr->key()); |
+ LOperand* key = UseRegisterOrConstantAtStart(instr->key()); |
LLoadKeyed* result = NULL; |
if (!instr->is_external()) { |
@@ -2162,7 +2158,6 @@ LInstruction* LChunkBuilder::DoLoadKeyedGeneric(HLoadKeyedGeneric* instr) { |
LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
ElementsKind elements_kind = instr->elements_kind(); |
- bool clobbers_key = instr->key()->representation().IsSmi(); |
if (!instr->is_external()) { |
ASSERT(instr->elements()->representation().IsTagged()); |
@@ -2174,8 +2169,7 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
if (instr->value()->representation().IsDouble()) { |
object = UseRegisterAtStart(instr->elements()); |
val = UseTempRegister(instr->value()); |
- key = clobbers_key ? UseTempRegister(instr->key()) |
- : UseRegisterOrConstantAtStart(instr->key()); |
+ key = UseRegisterOrConstantAtStart(instr->key()); |
} else { |
ASSERT(instr->value()->representation().IsSmiOrTagged()); |
object = UseTempRegister(instr->elements()); |
@@ -2184,12 +2178,7 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
key = UseTempRegister(instr->key()); |
} else { |
val = UseRegisterOrConstantAtStart(instr->value()); |
- |
- if (clobbers_key) { |
- key = UseTempRegister(instr->key()); |
- } else { |
- key = UseRegisterOrConstantAtStart(instr->key()); |
- } |
+ key = UseRegisterOrConstantAtStart(instr->key()); |
} |
} |
@@ -2209,8 +2198,7 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) { |
elements_kind == EXTERNAL_FLOAT_ELEMENTS; |
LOperand* val = val_is_temp_register ? UseTempRegister(instr->value()) |
: UseRegister(instr->value()); |
- LOperand* key = clobbers_key ? UseTempRegister(instr->key()) |
- : UseRegisterOrConstantAtStart(instr->key()); |
+ LOperand* key = UseRegisterOrConstantAtStart(instr->key()); |
LOperand* external_pointer = UseRegister(instr->elements()); |
return new(zone()) LStoreKeyed(external_pointer, key, val); |
} |