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

Unified Diff: pkg/compiler/lib/src/scanner/listener.dart

Issue 1257513002: dart2js: fix crash when annotations have syntax errors (fix #23983) (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 5 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: pkg/compiler/lib/src/scanner/listener.dart
diff --git a/pkg/compiler/lib/src/scanner/listener.dart b/pkg/compiler/lib/src/scanner/listener.dart
index 9df843cf7002ad57656119d7367c3f70a1cd9e5b..c3299a3c5eed23f18200e199e261c94cf84b49ea 100644
--- a/pkg/compiler/lib/src/scanner/listener.dart
+++ b/pkg/compiler/lib/src/scanner/listener.dart
@@ -2566,12 +2566,17 @@ class PartialMetadataAnnotation extends MetadataAnnotationX
Node parseNode(DiagnosticListener listener) {
if (cachedNode != null) return cachedNode;
- Metadata metadata = parse(listener,
- annotatedElement,
- declarationSite,
- (p) => p.parseMetadata(beginToken));
- cachedNode = metadata.expression;
- return cachedNode;
+ var metadata = parse(listener,
+ annotatedElement,
+ declarationSite,
+ (p) => p.parseMetadata(beginToken));
+ if (metadata is Metadata) {
+ cachedNode = metadata.expression;
+ return cachedNode;
+ } else {
+ assert (metadata is ErrorNode);
+ return metadata;
+ }
}
bool get hasNode => cachedNode != null;

Powered by Google App Engine
This is Rietveld 408576698