| Index: runtime/vm/intermediate_language_arm.cc
|
| ===================================================================
|
| --- runtime/vm/intermediate_language_arm.cc (revision 39909)
|
| +++ 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 (compiler->intrinsic_mode()) {
|
| + // Intrinsics don't have a frame.
|
| + __ Ret();
|
| + return;
|
| + }
|
| +
|
| #if defined(DEBUG)
|
| Label stack_ok;
|
| __ Comment("Stack Check");
|
| @@ -1852,7 +1859,6 @@
|
| String::Handle(cls_.PrettyName()).ToCString());
|
| }
|
| __ Bind(entry_label());
|
| -
|
| const Code& stub =
|
| Code::Handle(isolate, stub_code->GetAllocationStubForClass(cls_));
|
| const ExternalLabel label(stub.EntryPoint());
|
| @@ -1868,7 +1874,6 @@
|
| locs);
|
| __ MoveRegister(result_, R0);
|
| compiler->RestoreLiveRegisters(locs);
|
| -
|
| __ b(exit_label());
|
| }
|
|
|
| @@ -1877,21 +1882,28 @@
|
| const Class& cls,
|
| Register result,
|
| Register temp) {
|
| - BoxAllocationSlowPath* slow_path =
|
| - new BoxAllocationSlowPath(instruction, cls, result);
|
| - compiler->AddSlowPathCode(slow_path);
|
| + if (compiler->intrinsic_mode()) {
|
| + __ TryAllocate(cls,
|
| + compiler->intrinsic_slow_path_label(),
|
| + result,
|
| + temp);
|
| + } else {
|
| + BoxAllocationSlowPath* slow_path =
|
| + new BoxAllocationSlowPath(instruction, cls, result);
|
| + compiler->AddSlowPathCode(slow_path);
|
|
|
| - __ TryAllocate(cls,
|
| - slow_path->entry_label(),
|
| - result,
|
| - temp);
|
| - __ Bind(slow_path->exit_label());
|
| + __ TryAllocate(cls,
|
| + slow_path->entry_label(),
|
| + result,
|
| + temp);
|
| + __ Bind(slow_path->exit_label());
|
| + }
|
| }
|
|
|
| private:
|
| Instruction* instruction_;
|
| const Class& cls_;
|
| - Register result_;
|
| + const Register result_;
|
| };
|
|
|
|
|
|
|