Index: runtime/vm/dart_entry.cc |
diff --git a/runtime/vm/dart_entry.cc b/runtime/vm/dart_entry.cc |
index 10c194bf8b265bdd7da6b422a6f62df679255c43..226dbe806fb98eb6238ab9e4ef638a90c971c235 100644 |
--- a/runtime/vm/dart_entry.cc |
+++ b/runtime/vm/dart_entry.cc |
@@ -90,8 +90,11 @@ RawObject* DartEntry::InvokeFunction(const Function& function, |
} |
} |
// Now Call the invoke stub which will invoke the dart function. |
+ const Code& invoke_stub = Code::CheckedHandle( |
+ isolate->stub_code()->InvokeDartCodeCode()); |
+ |
invokestub entrypoint = reinterpret_cast<invokestub>( |
- isolate->stub_code()->InvokeDartCodeEntryPoint()); |
+ invoke_stub.EntryPoint()); |
const Code& code = Code::Handle(zone, function.CurrentCode()); |
ASSERT(!code.IsNull()); |
ASSERT(Isolate::Current()->no_callback_scope_depth() == 0); |
@@ -114,6 +117,12 @@ RawObject* DartEntry::InvokeFunction(const Function& function, |
reinterpret_cast<int32_t>(&arguments), |
reinterpret_cast<int32_t>(thread))); |
#endif |
+#elif defined(TARGET_ARCH_X64) |
+ return entrypoint(invoke_stub, |
+ code, |
+ arguments_descriptor, |
+ arguments, |
+ thread); |
#else |
return entrypoint(code.EntryPoint(), |
arguments_descriptor, |