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

Unified Diff: runtime/vm/parser.cc

Issue 2415743004: Fix assertion failure with deferred prefixes. (Closed)
Patch Set: Created 4 years, 2 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/parser.cc
diff --git a/runtime/vm/parser.cc b/runtime/vm/parser.cc
index 20886521af0a5993768a3d703782d2f5aef9808b..cddc843404efb9c3a99baacdb27f0bf54c3a4b19 100644
--- a/runtime/vm/parser.cc
+++ b/runtime/vm/parser.cc
@@ -12210,7 +12210,8 @@ AstNode* Parser::ParseClosurization(AstNode* primary) {
obj = prefix.LookupObject(extractor_name);
}
}
- if (!prefix.is_loaded() && (parsed_function() != NULL)) {
+ if (!prefix.is_loaded() && (parsed_function() != NULL) &&
+ !FLAG_load_deferred_eagerly) {
// Remember that this function depends on an import prefix of an
// unloaded deferred library.
parsed_function()->AddDeferredPrefix(prefix);
@@ -14032,7 +14033,8 @@ AstNode* Parser::ParseNewOperator(Token::Kind op_kind) {
UnresolvedClass::Handle(Z, redirect_type.unresolved_class());
const LibraryPrefix& prefix =
LibraryPrefix::Handle(Z, cls.library_prefix());
- if (!prefix.IsNull() && !prefix.is_loaded()) {
+ if (!prefix.IsNull() && !prefix.is_loaded() &&
+ !FLAG_load_deferred_eagerly) {
// If the redirection type is unresolved because it refers to
// an unloaded deferred prefix, mark this function as depending
// on the library prefix. It will then get invalidated when the
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698