Index: src/arm/ic-arm.cc |
diff --git a/src/arm/ic-arm.cc b/src/arm/ic-arm.cc |
index e65249022751dd2f33aa3380162d8cc6cd94a33f..56242f3f69e938214d6112df742a41162c6e6485 100644 |
--- a/src/arm/ic-arm.cc |
+++ b/src/arm/ic-arm.cc |
@@ -1247,9 +1247,17 @@ void KeyedStoreIC::GenerateSlow(MacroAssembler* masm) { |
void KeyedStoreIC::GenerateTransitionElementsSmiToDouble(MacroAssembler* masm) { |
// ---------- S t a t e -------------- |
// -- r2 : receiver |
+ // -- r3 : target map |
// -- lr : return address |
// ----------------------------------- |
// Must return the modified receiver in r0. |
+ if (!FLAG_trace_elements_transitions) { |
+ Label fail; |
+ ElementsTransitionGenerator::GenerateSmiOnlyToDouble(masm, &fail); |
+ __ mov(r0, r2); |
+ __ Ret(); |
+ __ bind(&fail); |
+ } |
__ push(r2); |
__ TailCallRuntime(Runtime::kTransitionElementsSmiToDouble, 1, 1); |
@@ -1260,9 +1268,17 @@ void KeyedStoreIC::GenerateTransitionElementsDoubleToObject( |
MacroAssembler* masm) { |
// ---------- S t a t e -------------- |
// -- r2 : receiver |
+ // -- r3 : target map |
// -- lr : return address |
// ----------------------------------- |
// Must return the modified receiver in r0. |
+ if (!FLAG_trace_elements_transitions) { |
+ Label fail; |
+ ElementsTransitionGenerator::GenerateDoubleToObject(masm, &fail); |
+ __ mov(r0, r2); |
+ __ Ret(); |
+ __ bind(&fail); |
+ } |
__ push(r2); |
__ TailCallRuntime(Runtime::kTransitionElementsDoubleToObject, 1, 1); |