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

Unified Diff: runtime/vm/native_entry.cc

Issue 1343373003: Revert "VM: New calling convention for generated code." (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: 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
« no previous file with comments | « runtime/vm/intrinsifier_x64.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/native_entry.cc
diff --git a/runtime/vm/native_entry.cc b/runtime/vm/native_entry.cc
index 51c4a463e454cf05d8f1a5f3e3b53b46bb3719b6..5f373dfa0076f590dce25da5a57fc92a80ccfe02 100644
--- a/runtime/vm/native_entry.cc
+++ b/runtime/vm/native_entry.cc
@@ -210,10 +210,10 @@ void NativeEntry::LinkNativeCall(Dart_NativeArguments args) {
#if defined(DEBUG)
{
NativeFunction current_function = NULL;
- const Code& current_trampoline = Code::Handle(
+ uword current_trampoline =
CodePatcher::GetNativeCallAt(caller_frame->pc(),
code,
- &current_function));
+ &current_function);
#if !defined(USING_SIMULATOR)
ASSERT(current_function ==
reinterpret_cast<NativeFunction>(LinkNativeCall));
@@ -225,8 +225,8 @@ void NativeEntry::LinkNativeCall(Dart_NativeArguments args) {
Simulator::kBootstrapNativeCall,
NativeEntry::kNumArguments)));
#endif
- ASSERT(current_trampoline.raw() ==
- StubCode::CallBootstrapCFunction_entry()->code());
+ ASSERT(current_trampoline ==
+ StubCode::CallBootstrapCFunction_entry()->EntryPoint());
}
#endif
« no previous file with comments | « runtime/vm/intrinsifier_x64.cc ('k') | runtime/vm/object.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698