Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(804)

Unified Diff: runtime/vm/native_entry.cc

Issue 1192103004: VM: New calling convention for generated code. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: ARM64 port Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/vm/native_entry.cc
diff --git a/runtime/vm/native_entry.cc b/runtime/vm/native_entry.cc
index ad351c813e7e54d8c7ff9fa5a6620a10797e0a2b..cea261f9748a6c8438bcc3fda92bbcb92fbc7ad6 100644
--- a/runtime/vm/native_entry.cc
+++ b/runtime/vm/native_entry.cc
@@ -212,10 +212,10 @@ void NativeEntry::LinkNativeCall(Dart_NativeArguments args) {
#if defined(DEBUG)
{
NativeFunction current_function = NULL;
- uword current_trampoline =
+ const Code& current_trampoline = Code::Handle(
CodePatcher::GetNativeCallAt(caller_frame->pc(),
code,
- &current_function);
+ &current_function));
#if !defined(USING_SIMULATOR)
ASSERT(current_function ==
reinterpret_cast<NativeFunction>(LinkNativeCall));
@@ -227,8 +227,8 @@ void NativeEntry::LinkNativeCall(Dart_NativeArguments args) {
Simulator::kBootstrapNativeCall,
func.NumParameters())));
#endif
- ASSERT(current_trampoline ==
- StubCode::CallBootstrapCFunction_entry()->EntryPoint());
+ ASSERT(current_trampoline.raw() ==
+ StubCode::CallBootstrapCFunction_entry()->code());
}
#endif
« no previous file with comments | « runtime/vm/intrinsifier_x64.cc ('k') | runtime/vm/object.h » ('j') | runtime/vm/stack_frame.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698