Index: runtime/vm/flow_graph_compiler_arm.cc |
=================================================================== |
--- runtime/vm/flow_graph_compiler_arm.cc (revision 29013) |
+++ runtime/vm/flow_graph_compiler_arm.cc (working copy) |
@@ -8,6 +8,7 @@ |
#include "vm/flow_graph_compiler.h" |
#include "vm/ast_printer.h" |
+#include "vm/compiler.h" |
#include "vm/dart_entry.h" |
#include "vm/deopt_instructions.h" |
#include "vm/il_printer.h" |
@@ -1368,8 +1369,25 @@ |
// be invoked as a normal Dart function. |
__ add(IP, R2, ShifterOperand(R3, LSL, 2)); |
__ ldr(R0, FieldAddress(IP, base + kWordSize)); |
- __ ldr(R0, FieldAddress(R0, Function::code_offset())); |
- __ ldr(R0, FieldAddress(R0, Code::instructions_offset())); |
+ __ ldr(R1, FieldAddress(R0, Function::code_offset())); |
+ if (FLAG_collect_code) { |
+ // If we are collecting code, the code object may be null. |
+ Label is_compiled; |
+ __ CompareImmediate(R1, reinterpret_cast<intptr_t>(Object::null())); |
+ __ b(&is_compiled, NE); |
+ __ EnterStubFrame(); |
srdjan
2013/10/23 15:58:13
I am not sure that we can do EnterStubFrame in com
zra
2013/10/23 17:39:37
Can the megamorphic call be a call to unoptimized
zra
2013/10/23 23:27:52
Moved call to a stub.
|
+ // Preserve arg desc. and IC data object. |
+ __ PushList((1 << R4) | (1 << R5)); |
+ __ Push(R0); // Pass function. |
+ __ CallRuntime(kCompileFunctionRuntimeEntry, 1); |
+ __ Pop(R0); // Discard argument. |
+ __ PopList((1 << R4) | (1 << R5)); // Restore arg desc. and IC data. |
+ __ LeaveStubFrame(); |
+ // R0: target function. |
+ __ ldr(R1, FieldAddress(R0, Function::code_offset())); |
+ __ Bind(&is_compiled); |
+ } |
+ __ ldr(R0, FieldAddress(R1, Code::instructions_offset())); |
__ LoadObject(R5, ic_data); |
__ LoadObject(R4, arguments_descriptor); |
__ AddImmediate(R0, Instructions::HeaderSize() - kHeapObjectTag); |