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

Unified Diff: runtime/vm/isolate_reload.cc

Issue 2997243002: Move all the isolate reload code under !defined(DART_PRECOMPILED_RUNTIME) (Closed)
Patch Set: Fix. Created 3 years, 4 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/isolate_reload.cc
diff --git a/runtime/vm/isolate_reload.cc b/runtime/vm/isolate_reload.cc
index 9cb7cde3a519043b4ec79c7fe40c0d5132142c00..00646083c1c0927104157646b8edbb2bbfb94a10 100644
--- a/runtime/vm/isolate_reload.cc
+++ b/runtime/vm/isolate_reload.cc
@@ -45,7 +45,8 @@ DEFINE_FLAG(bool,
check_reloaded,
false,
"Assert that an isolate has reloaded at least once.")
-#ifndef PRODUCT
+
+#if !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
#define I (isolate())
#define Z (thread->zone())
@@ -486,7 +487,6 @@ class Aborted : public ReasonForCancelling {
}
};
-#if !defined(DART_PRECOMPILED_RUNTIME)
static intptr_t CommonSuffixLength(const char* a, const char* b) {
const intptr_t a_length = strlen(a);
const intptr_t b_length = strlen(b);
@@ -691,12 +691,6 @@ void IsolateReloadContext::Reload(bool force_reload,
FinalizeFailedLoad(Error::Cast(result));
}
}
-#else
-// NOTE: This function returns *after* FinalizeLoading is called.
-void IsolateReloadContext::Reload(bool force_reload,
- const char* root_script_url,
- const char* packages_url_) {}
-#endif // !defined(DART_PRECOMPILED_RUNTIME)
void IsolateReloadContext::RegisterClass(const Class& new_cls) {
const Class& old_cls = Class::Handle(OldClassOrNull(new_cls));
@@ -1892,6 +1886,6 @@ void IsolateReloadContext::RebuildDirectSubclasses() {
}
}
-#endif // !PRODUCT
+#endif // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
} // namespace dart

Powered by Google App Engine
This is Rietveld 408576698