| Index: runtime/vm/intermediate_language_arm.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language_arm.cc (revision 39651)
|
| +++ runtime/vm/intermediate_language_arm.cc (working copy)
|
| @@ -63,7 +63,7 @@
|
| } else {
|
| ASSERT(value.IsStackSlot());
|
| const intptr_t value_offset = value.ToStackSlotOffset();
|
| - __ LoadFromOffset(kWord, IP, FP, value_offset);
|
| + __ LoadFromOffset(kWord, IP, value.base_reg(), value_offset);
|
| __ Push(IP);
|
| }
|
| }
|
| @@ -87,6 +87,13 @@
|
| void ReturnInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
|
| const Register result = locs()->in(0).reg();
|
| ASSERT(result == R0);
|
| +
|
| + if (is_intrinsic_) {
|
| + // Intrinsics don't have a frame.
|
| + __ Ret();
|
| + return;
|
| + }
|
| +
|
| #if defined(DEBUG)
|
| Label stack_ok;
|
| __ Comment("Stack Check");
|
|
|