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

Unified Diff: runtime/vm/clustered_snapshot.cc

Issue 2793163002: Do not embed is_auto_setup_scope into the compilation of native calls. (Closed)
Patch Set: . Created 3 years, 9 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 | « no previous file | runtime/vm/constants_dbc.h » ('j') | runtime/vm/intermediate_language_arm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/clustered_snapshot.cc
diff --git a/runtime/vm/clustered_snapshot.cc b/runtime/vm/clustered_snapshot.cc
index 7676242958a32f32d01a704702d6217bd6370ddb..c8d139ce7c9f219881d79169af615732db4e8828 100644
--- a/runtime/vm/clustered_snapshot.cc
+++ b/runtime/vm/clustered_snapshot.cc
@@ -1811,12 +1811,14 @@ class ObjectPoolSerializationCluster : public SerializationCluster {
switch (entry_type) {
case ObjectPool::kTaggedObject: {
#if !defined(TARGET_ARCH_DBC)
- if (entry.raw_obj_ ==
- StubCode::CallNativeCFunction_entry()->code()) {
+ if ((entry.raw_obj_ ==
+ StubCode::CallNoScopeNative_entry()->code()) ||
+ (entry.raw_obj_ ==
+ StubCode::CallAutoScopeNative_entry()->code())) {
// Natives can run while precompiling, becoming linked and
// switching their stub. Reset to the initial stub used for
// lazy-linking.
- s->WriteRef(StubCode::CallBootstrapCFunction_entry()->code());
+ s->WriteRef(StubCode::CallBootstrapNative_entry()->code());
break;
}
#endif
« no previous file with comments | « no previous file | runtime/vm/constants_dbc.h » ('j') | runtime/vm/intermediate_language_arm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698