Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index b55679ee0147b30f702b6cff74ae879ad7811f44..00001460d90956f2d788bf41c0ff29dbb53e9ed6 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -708,9 +708,9 @@ LInstruction* LChunkBuilder::DoDeoptimize(HDeoptimize* instr) { |
LInstruction* LChunkBuilder::DoShift(Token::Value op, |
HBitwiseBinaryOperation* instr) { |
- if (instr->representation().IsTagged()) { |
- ASSERT(instr->left()->representation().IsTagged()); |
- ASSERT(instr->right()->representation().IsTagged()); |
+ if (instr->representation().IsSmiOrTagged()) { |
+ ASSERT(instr->left()->representation().IsSmiOrTagged()); |
+ ASSERT(instr->right()->representation().IsSmiOrTagged()); |
LOperand* left = UseFixed(instr->left(), r1); |
LOperand* right = UseFixed(instr->right(), r0); |
@@ -718,35 +718,25 @@ LInstruction* LChunkBuilder::DoShift(Token::Value op, |
return MarkAsCall(DefineFixed(result, r0), instr); |
} |
- ASSERT(instr->representation().IsSmiOrInteger32()); |
- ASSERT(instr->left()->representation().Equals(instr->representation())); |
- ASSERT(instr->right()->representation().Equals(instr->representation())); |
+ ASSERT(instr->representation().IsInteger32()); |
+ ASSERT(instr->left()->representation().IsInteger32()); |
+ ASSERT(instr->right()->representation().IsInteger32()); |
LOperand* left = UseRegisterAtStart(instr->left()); |
HValue* right_value = instr->right(); |
LOperand* right = NULL; |
int constant_value = 0; |
- bool does_deopt = false; |
if (right_value->IsConstant()) { |
HConstant* constant = HConstant::cast(right_value); |
right = chunk_->DefineConstantOperand(constant); |
constant_value = constant->Integer32Value() & 0x1f; |
- // Left shifts can deoptimize if we shift by > 0 and the result cannot be |
- // truncated to smi. |
- if (instr->representation().IsSmi() && constant_value > 0) { |
- for (HUseIterator it(instr->uses()); !it.Done(); it.Advance()) { |
- if (!it.value()->CheckFlag(HValue::kTruncatingToSmi)) { |
- does_deopt = true; |
- break; |
- } |
- } |
- } |
} else { |
right = UseRegisterAtStart(right_value); |
} |
// Shift operations can only deoptimize if we do a logical shift |
// by 0 and the result cannot be truncated to int32. |
+ bool does_deopt = false; |
if (op == Token::SHR && constant_value == 0) { |
if (FLAG_opt_safe_uint32_operations) { |
does_deopt = !instr->CheckFlag(HInstruction::kUint32); |
@@ -2095,8 +2085,6 @@ LInstruction* LChunkBuilder::DoConstant(HConstant* instr) { |
return DefineAsRegister(new(zone()) LConstantI); |
} else if (r.IsDouble()) { |
return DefineAsRegister(new(zone()) LConstantD); |
- } else if (r.IsExternal()) { |
- return DefineAsRegister(new(zone()) LConstantE); |
} else if (r.IsTagged()) { |
return DefineAsRegister(new(zone()) LConstantT); |
} else { |
@@ -2324,12 +2312,21 @@ LInstruction* LChunkBuilder::DoTransitionElementsKind( |
if (IsSimpleMapChangeTransition(instr->from_kind(), instr->to_kind())) { |
LOperand* new_map_reg = TempRegister(); |
LTransitionElementsKind* result = |
- new(zone()) LTransitionElementsKind(object, new_map_reg); |
+ new(zone()) LTransitionElementsKind(object, new_map_reg, NULL); |
return result; |
- } else { |
+ } else if (FLAG_compiled_transitions) { |
LTransitionElementsKind* result = |
- new(zone()) LTransitionElementsKind(object, NULL); |
+ new(zone()) LTransitionElementsKind(object, NULL, NULL); |
return AssignPointerMap(result); |
+ } else { |
+ LOperand* object = UseFixed(instr->object(), r0); |
+ LOperand* fixed_object_reg = FixedTemp(r2); |
+ LOperand* new_map_reg = FixedTemp(r3); |
+ LTransitionElementsKind* result = |
+ new(zone()) LTransitionElementsKind(object, |
+ new_map_reg, |
+ fixed_object_reg); |
+ return MarkAsCall(result, instr); |
} |
} |