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

Unified Diff: runtime/vm/intermediate_language_x64.cc

Issue 1316673005: Track which entries in the ObjectPool are native entries, and reset them when loading a precompiled… (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
Index: runtime/vm/intermediate_language_x64.cc
diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/intermediate_language_x64.cc
index 4955df647885301df94be109fbfbbd7560f288e4..5382e88b801b87f7f2a78d02f393a8365b818f84 100644
--- a/runtime/vm/intermediate_language_x64.cc
+++ b/runtime/vm/intermediate_language_x64.cc
@@ -785,14 +785,14 @@ void NativeCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
const StubEntry* stub_entry;
if (link_lazily()) {
stub_entry = StubCode::CallBootstrapCFunction_entry();
- __ LoadExternalLabel(
+ __ LoadNativeEntry(
RBX, &NativeEntry::LinkNativeCallLabel(), kPatchable);
} else {
stub_entry = (is_bootstrap_native() || is_leaf_call)
? StubCode::CallBootstrapCFunction_entry()
: StubCode::CallNativeCFunction_entry();
const ExternalLabel label(reinterpret_cast<uword>(native_c_function()));
- __ LoadExternalLabel(RBX, &label, kNotPatchable);
+ __ LoadNativeEntry(RBX, &label, kNotPatchable);
}
compiler->GenerateCall(token_pos(),
*stub_entry,

Powered by Google App Engine
This is Rietveld 408576698