Index: runtime/vm/native_entry.cc |
diff --git a/runtime/vm/native_entry.cc b/runtime/vm/native_entry.cc |
index a5c79d3731a4d6c63153b04bc5f34e0c02157606..5a7cca9043ed4992abbfe566528bbf4d467e8878 100644 |
--- a/runtime/vm/native_entry.cc |
+++ b/runtime/vm/native_entry.cc |
@@ -90,7 +90,7 @@ const uint8_t* NativeEntry::ResolveSymbol(uword pc) { |
uword NativeEntry::NativeCallWrapperEntry() { |
uword entry = reinterpret_cast<uword>(NativeEntry::NativeCallWrapper); |
-#if defined(USING_SIMULATOR) |
+#if defined(USING_SIMULATOR) && !defined(TARGET_ARCH_DBC) |
entry = Simulator::RedirectExternalReference( |
entry, Simulator::kNativeCall, NativeEntry::kNumCallWrapperArguments); |
#endif |
@@ -198,7 +198,7 @@ static NativeFunction ResolveNativeFunction(Zone* zone, |
uword NativeEntry::LinkNativeCallEntry() { |
uword entry = reinterpret_cast<uword>(NativeEntry::LinkNativeCall); |
-#if defined(USING_SIMULATOR) |
+#if defined(USING_SIMULATOR) && !defined(TARGET_ARCH_DBC) |
entry = Simulator::RedirectExternalReference( |
entry, Simulator::kBootstrapNativeCall, NativeEntry::kNumArguments); |
#endif |
@@ -236,7 +236,7 @@ void NativeEntry::LinkNativeCall(Dart_NativeArguments args) { |
arguments->thread()->zone(), func, &is_bootstrap_native); |
ASSERT(target_function != NULL); |
-#if defined(DEBUG) |
+#if defined(DEBUG) && !defined(TARGET_ARCH_DBC) |
{ |
NativeFunction current_function = NULL; |
const Code& current_trampoline = Code::Handle( |
@@ -260,12 +260,17 @@ void NativeEntry::LinkNativeCall(Dart_NativeArguments args) { |
#endif |
call_through_wrapper = !is_bootstrap_native; |
- const Code& trampoline = Code::Handle(call_through_wrapper ? |
- StubCode::CallNativeCFunction_entry()->code() : |
- StubCode::CallBootstrapCFunction_entry()->code()); |
+ const Code& trampoline = |
+#if !defined(TARGET_ARCH_DBC) |
+ Code::Handle(call_through_wrapper ? |
+ StubCode::CallNativeCFunction_entry()->code() : |
+ StubCode::CallBootstrapCFunction_entry()->code()); |
+#else |
+ Code::Handle(); |
+#endif |
NativeFunction patch_target_function = target_function; |
-#if defined(USING_SIMULATOR) |
+#if defined(USING_SIMULATOR) && !defined(TARGET_ARCH_DBC) |
if (!call_through_wrapper) { |
patch_target_function = reinterpret_cast<NativeFunction>( |
Simulator::RedirectExternalReference( |