Index: runtime/vm/intermediate_language_arm.cc |
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc |
index bc4ba3c592036a3ad58931aceb9439e659816d92..1c24cd05a4c7e898304b979b85273d7995afebdb 100644 |
--- a/runtime/vm/intermediate_language_arm.cc |
+++ b/runtime/vm/intermediate_language_arm.cc |
@@ -947,7 +947,7 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
entry = reinterpret_cast<uword>(&NativeEntry::LinkNativeCall); |
#if defined(USING_SIMULATOR) |
entry = Simulator::RedirectExternalReference( |
- entry, Simulator::kBootstrapNativeCall, function().NumParameters()); |
+ entry, Simulator::kBootstrapNativeCall, NativeEntry::kNumArguments); |
#endif |
} else { |
entry = reinterpret_cast<uword>(native_c_function()); |
@@ -955,7 +955,7 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
stub_entry = StubCode::CallBootstrapCFunction_entry(); |
#if defined(USING_SIMULATOR) |
entry = Simulator::RedirectExternalReference( |
- entry, Simulator::kBootstrapNativeCall, function().NumParameters()); |
+ entry, Simulator::kBootstrapNativeCall, NativeEntry::kNumArguments); |
#endif |
} else { |
// In the case of non bootstrap native methods the CallNativeCFunction |
@@ -965,14 +965,14 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) { |
#if defined(USING_SIMULATOR) |
if (!function().IsNativeAutoSetupScope()) { |
entry = Simulator::RedirectExternalReference( |
- entry, Simulator::kBootstrapNativeCall, function().NumParameters()); |
+ entry, Simulator::kBootstrapNativeCall, NativeEntry::kNumArguments); |
} |
#endif |
} |
} |
__ LoadImmediate(R1, argc_tag); |
ExternalLabel label(entry); |
- __ LoadExternalLabel(R5, &label, link_lazily() ? kPatchable : kNotPatchable); |
+ __ LoadNativeEntry(R5, &label, link_lazily() ? kPatchable : kNotPatchable); |
compiler->GenerateCall(token_pos(), |
*stub_entry, |
RawPcDescriptors::kOther, |