| Index: runtime/vm/intermediate_language_arm64.cc
 | 
| diff --git a/runtime/vm/intermediate_language_arm64.cc b/runtime/vm/intermediate_language_arm64.cc
 | 
| index 18d82cd497dc60c85058f647cb332897f11e1f08..02862b82c27c88692341c8b9928bada9e3c740aa 100644
 | 
| --- a/runtime/vm/intermediate_language_arm64.cc
 | 
| +++ b/runtime/vm/intermediate_language_arm64.cc
 | 
| @@ -796,15 +796,13 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
 | 
|    // into the runtime system.
 | 
|    uword entry;
 | 
|    const intptr_t argc_tag = NativeArguments::ComputeArgcTag(function());
 | 
| -  const bool is_leaf_call =
 | 
| -      (argc_tag & NativeArguments::AutoSetupScopeMask()) == 0;
 | 
|    const StubEntry* stub_entry;
 | 
|    if (link_lazily()) {
 | 
|      stub_entry = StubCode::CallBootstrapCFunction_entry();
 | 
|      entry = NativeEntry::LinkNativeCallEntry();
 | 
|    } else {
 | 
|      entry = reinterpret_cast<uword>(native_c_function());
 | 
| -    if (is_bootstrap_native() || is_leaf_call) {
 | 
| +    if (is_bootstrap_native()) {
 | 
|        stub_entry = StubCode::CallBootstrapCFunction_entry();
 | 
|  #if defined(USING_SIMULATOR)
 | 
|        entry = Simulator::RedirectExternalReference(
 | 
| @@ -815,12 +813,6 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
 | 
|        // stub generates the redirection address when running under the simulator
 | 
|        // and hence we do not change 'entry' here.
 | 
|        stub_entry = StubCode::CallNativeCFunction_entry();
 | 
| -#if defined(USING_SIMULATOR)
 | 
| -      if (!function().IsNativeAutoSetupScope()) {
 | 
| -        entry = Simulator::RedirectExternalReference(
 | 
| -            entry, Simulator::kBootstrapNativeCall, NativeEntry::kNumArguments);
 | 
| -      }
 | 
| -#endif
 | 
|      }
 | 
|    }
 | 
|    __ LoadImmediate(R1, argc_tag);
 | 
| 
 |