Skip to content

Commit 6e491cf

Browse files
committed
Only call .hasResolvedAst in assertions.
[email protected] Review URL: https://codereview.chromium.org/1949713004 .
1 parent a5078ea commit 6e491cf

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

pkg/compiler/lib/src/compiler.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,15 +1932,12 @@ class _CompilerResolution implements Resolution {
19321932
ResolvedAst getResolvedAst(ExecutableElement element) {
19331933
assert(invariant(element, element.isDeclaration,
19341934
message: "Element $element must be the declaration."));
1935-
if (hasResolvedAst(element)) {
1936-
if (compiler.serialization.isDeserialized(element)) {
1937-
return compiler.serialization.getResolvedAst(element);
1938-
}
1939-
return element.resolvedAst;
1940-
}
19411935
assert(invariant(element, hasResolvedAst(element),
19421936
message: "ResolvedAst not available for $element."));
1943-
return null;
1937+
if (compiler.serialization.isDeserialized(element)) {
1938+
return compiler.serialization.getResolvedAst(element);
1939+
}
1940+
return element.resolvedAst;
19441941
}
19451942

19461943
@override

pkg/compiler/lib/src/parser/listener.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ class Listener {
556556
}
557557

558558
void reportErrorHelper(Spannable spannable, MessageKind messageKind,
559-
[Map arguments = const {}]) {
559+
[Map arguments = const {}]) {
560560
MessageTemplate template = MessageTemplate.TEMPLATES[messageKind];
561561
String message = template.message(arguments, true).toString();
562562
Token token;

0 commit comments

Comments
 (0)