| Index: pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
|
| diff --git a/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart b/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
|
| index e549d68301d832f6d0335d6d503e8d48209a940d..0ed437c2c86365e8d92fabc26483070f86d78c3f 100644
|
| --- a/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
|
| +++ b/pkg/compiler/lib/src/inferrer/type_graph_nodes.dart
|
| @@ -515,8 +515,8 @@ class MemberTypeInformation extends ElementTypeInformation
|
| TypeMask potentiallyNarrowType(TypeMask mask,
|
| TypeGraphInferrerEngine inferrer) {
|
| Compiler compiler = inferrer.compiler;
|
| - if (!compiler.trustTypeAnnotations &&
|
| - !compiler.enableTypeAssertions &&
|
| + if (!compiler.options.trustTypeAnnotations &&
|
| + !compiler.options.enableTypeAssertions &&
|
| !inferrer.annotations.trustTypeAnnotations(element)) {
|
| return mask;
|
| }
|
| @@ -664,14 +664,14 @@ class ParameterTypeInformation extends ElementTypeInformation {
|
| TypeMask potentiallyNarrowType(TypeMask mask,
|
| TypeGraphInferrerEngine inferrer) {
|
| Compiler compiler = inferrer.compiler;
|
| - if (!compiler.trustTypeAnnotations &&
|
| + if (!compiler.options.trustTypeAnnotations &&
|
| !inferrer.annotations.trustTypeAnnotations(declaration)) {
|
| return mask;
|
| }
|
| // When type assertions are enabled (aka checked mode), we have to always
|
| // ignore type annotations to ensure that the checks are actually inserted
|
| // into the function body and retained until runtime.
|
| - assert(!compiler.enableTypeAssertions);
|
| + assert(!compiler.options.enableTypeAssertions);
|
| return _narrowType(compiler, mask, element.type);
|
| }
|
|
|
|
|