Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index fb8f0d7332197fd5eee9c8f16a3f22763084ed21..04ab3810726f3cfd012ea150b71c170ddee1bf0b 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -2098,12 +2098,16 @@ LInstruction* LChunkBuilder::DoStoreKeyedGeneric(HStoreKeyedGeneric* instr) { |
LInstruction* LChunkBuilder::DoTransitionElementsKind( |
HTransitionElementsKind* instr) { |
+ LOperand* object = UseRegister(instr->object()); |
if (IsSimpleMapChangeTransition(instr->from_kind(), instr->to_kind())) { |
- LOperand* object = UseRegister(instr->object()); |
LOperand* new_map_reg = TempRegister(); |
LTransitionElementsKind* result = |
new(zone()) LTransitionElementsKind(object, new_map_reg, NULL); |
return DefineSameAsFirst(result); |
+ } else if (FLAG_compiled_transitions) { |
+ LTransitionElementsKind* result = |
+ new(zone()) LTransitionElementsKind(object, NULL, NULL); |
+ return AssignPointerMap(result); |
} else { |
LOperand* object = UseFixed(instr->object(), r0); |
LOperand* fixed_object_reg = FixedTemp(r2); |
@@ -2112,11 +2116,21 @@ LInstruction* LChunkBuilder::DoTransitionElementsKind( |
new(zone()) LTransitionElementsKind(object, |
new_map_reg, |
fixed_object_reg); |
- return MarkAsCall(DefineFixed(result, r0), instr); |
+ return MarkAsCall(result, instr); |
} |
} |
+LInstruction* LChunkBuilder::DoTrapAllocationMemento( |
+ HTrapAllocationMemento* instr) { |
+ LOperand* object = UseRegister(instr->object()); |
+ LOperand* temp = TempRegister(); |
+ LTrapAllocationMemento* result = |
+ new(zone()) LTrapAllocationMemento(object, temp); |
+ return AssignEnvironment(result); |
+} |
+ |
+ |
LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) { |
bool needs_write_barrier = instr->NeedsWriteBarrier(); |
bool needs_write_barrier_for_map = !instr->transition().is_null() && |
@@ -2183,12 +2197,23 @@ LInstruction* LChunkBuilder::DoStringLength(HStringLength* instr) { |
LInstruction* LChunkBuilder::DoAllocateObject(HAllocateObject* instr) { |
+ info()->MarkAsDeferredCalling(); |
LAllocateObject* result = |
new(zone()) LAllocateObject(TempRegister(), TempRegister()); |
return AssignPointerMap(DefineAsRegister(result)); |
} |
+LInstruction* LChunkBuilder::DoAllocate(HAllocate* instr) { |
+ info()->MarkAsDeferredCalling(); |
+ LOperand* size = UseTempRegister(instr->size()); |
+ LOperand* temp1 = TempRegister(); |
+ LOperand* temp2 = TempRegister(); |
+ LAllocate* result = new(zone()) LAllocate(size, temp1, temp2); |
+ return AssignPointerMap(DefineAsRegister(result)); |
+} |
+ |
+ |
LInstruction* LChunkBuilder::DoFastLiteral(HFastLiteral* instr) { |
return MarkAsCall(DefineFixed(new(zone()) LFastLiteral, r0), instr); |
} |