Do not embed is_auto_setup_scope into the compilation of native calls.

runtime/vm/intermediate_language_arm.cc

Index: runtime/vm/intermediate_language_arm.cc
diff --git a/runtime/vm/intermediate_language_arm.cc b/runtime/vm/intermediate_language_arm.cc
index 791a6f919af59548cd6968f427a49e16eed563ae..ec89471cf87edecb84648cdd95f03494083447c6 100644
--- a/runtime/vm/intermediate_language_arm.cc
+++ b/runtime/vm/intermediate_language_arm.cc
@@ -973,21 +973,26 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   const intptr_t argc_tag = NativeArguments::ComputeArgcTag(function());
   const StubEntry* stub_entry;
   if (link_lazily()) {
-    stub_entry = StubCode::CallBootstrapCFunction_entry();
+    stub_entry = StubCode::CallBootstrapNative_entry();
     entry = NativeEntry::LinkNativeCallEntry();
   } else {
     entry = reinterpret_cast<uword>(native_c_function());
     if (is_bootstrap_native()) {
-      stub_entry = StubCode::CallBootstrapCFunction_entry();
+      stub_entry = StubCode::CallBootstrapNative_entry();
 #if defined(USING_SIMULATOR)
       entry = Simulator::RedirectExternalReference(
           entry, Simulator::kBootstrapNativeCall, NativeEntry::kNumArguments);

[zra, 2017/04/04 15:00:44]

Is there any change needed to this code to point the simulator at the right
stub?

[rmacnak, 2017/04/04 19:25:41]

No. The simulator doesn't associate the redirection with a stub; it just returns
to the calling stub.

 #endif
+    } else if (is_auto_scope()) {
+      // In the case of non bootstrap native methods the CallNativeCFunction
+      // stub generates the redirection address when running under the simulator
+      // and hence we do not change 'entry' here.
+      stub_entry = StubCode::CallAutoScopeNative_entry();
     } else {
       // In the case of non bootstrap native methods the CallNativeCFunction
       // stub generates the redirection address when running under the simulator
       // and hence we do not change 'entry' here.
-      stub_entry = StubCode::CallNativeCFunction_entry();
+      stub_entry = StubCode::CallNoScopeNative_entry();
     }
   }
   __ LoadImmediate(R1, argc_tag);