Version 2.11.0-231.0.dev

Merge commit '89dbc35fca4c994d5ff1c076e1c564519c687f0c' into 'dev'

Author: Dart CI

DEPS

@@ -133,7 +133,7 @@ vars = {
   "quiver-dart_tag": "246e754fe45cecb6aa5f3f13b4ed61037ff0d784",
   "resource_rev": "f8e37558a1c4f54550aa463b88a6a831e3e33cd6",
   "root_certificates_rev": "7e5ec82c99677a2e5b95ce296c4d68b0d3378ed8",
-  "rust_revision": "cbe7c5ce705896d4e22bf6096590bc1f17993b78",
+  "rust_revision": "b7856f695d65a8ebc846754f97d15814bcb1c244",
   "shelf_static_rev": "v0.2.8",
   "shelf_packages_handler_tag": "2.0.0",
   "shelf_proxy_tag": "0.1.0+7",

pkg/analyzer/lib/src/error/best_practices_verifier.dart

@@ -1657,10 +1657,12 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
   Set<TargetKind> _targetKindsFor(ElementAnnotation annotation) {
     var element = annotation.element;
     ClassElement classElement;
-    if (element is VariableElement) {
-      var type = element.type;
-      if (type is InterfaceType) {
-        classElement = type.element;
+    if (element is PropertyAccessorElement) {
+      if (element.isGetter) {
+        var type = element.returnType;
+        if (type is InterfaceType) {
+          classElement = type.element;
+        }
       }
     } else if (element is ConstructorElement) {
       classElement = element.enclosingElement;

pkg/analyzer/test/src/dart/element/nullable_test.dart

@@ -2,19 +2,15 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:analyzer/dart/element/type_provider.dart';
 import 'package:analyzer/src/dart/element/type.dart';
-import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:meta/meta.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../../generated/elements_types_mixin.dart';
-import '../../../generated/test_analysis_context.dart';
+import '../../../generated/type_system_test.dart';
 
 main() {
   defineReflectiveSuite(() {
@@ -28,7 +24,7 @@ main() {
 }
 
 @reflectiveTest
-class IsNonNullableTest extends _NullableBase {
+class IsNonNullableTest extends AbstractTypeSystemNullSafetyTest {
   void isNonNullable(DartType type) {
     expect(typeSystem.isNonNullable(type), isTrue);
   }
@@ -193,7 +189,7 @@ class IsNonNullableTest extends _NullableBase {
 }
 
 @reflectiveTest
-class IsNullableTest extends _NullableBase {
+class IsNullableTest extends AbstractTypeSystemNullSafetyTest {
   void isNotNullable(DartType type) {
     expect(typeSystem.isNullable(type), isFalse);
   }
@@ -358,7 +354,7 @@ class IsNullableTest extends _NullableBase {
 }
 
 @reflectiveTest
-class IsPotentiallyNonNullableTest extends _NullableBase {
+class IsPotentiallyNonNullableTest extends AbstractTypeSystemNullSafetyTest {
   void isNotPotentiallyNonNullable(DartType type) {
     expect(typeSystem.isPotentiallyNonNullable(type), isFalse);
   }
@@ -405,7 +401,7 @@ class IsPotentiallyNonNullableTest extends _NullableBase {
 }
 
 @reflectiveTest
-class IsPotentiallyNullableTest extends _NullableBase {
+class IsPotentiallyNullableTest extends AbstractTypeSystemNullSafetyTest {
   void isNotPotentiallyNullable(DartType type) {
     expect(typeSystem.isPotentiallyNullable(type), isFalse);
   }
@@ -452,7 +448,7 @@ class IsPotentiallyNullableTest extends _NullableBase {
 }
 
 @reflectiveTest
-class IsStrictlyNonNullableTest extends _NullableBase {
+class IsStrictlyNonNullableTest extends AbstractTypeSystemNullSafetyTest {
   void isNotStrictlyNonNullable(DartType type) {
     expect(typeSystem.isStrictlyNonNullable(type), isFalse);
   }
@@ -599,7 +595,7 @@ class IsStrictlyNonNullableTest extends _NullableBase {
 }
 
 @reflectiveTest
-class PromoteToNonNullTest extends _NullableBase {
+class PromoteToNonNullTest extends AbstractTypeSystemNullSafetyTest {
   test_dynamic() {
     _check(dynamicType, dynamicType);
   }
@@ -797,22 +793,3 @@ class PromoteToNonNullTest extends _NullableBase {
     expect(actual.nullabilitySuffix, NullabilitySuffix.none);
   }
 }
-
-abstract class _NullableBase with ElementsTypesMixin {
-  @override
-  TypeProvider typeProvider;
-
-  TypeSystemImpl typeSystem;
-
-  FeatureSet get testFeatureSet {
-    return FeatureSet.forTesting();
-  }
-
-  void setUp() {
-    var analysisContext = TestAnalysisContext(
-      featureSet: testFeatureSet,
-    );
-    typeProvider = analysisContext.typeProviderLegacy;
-    typeSystem = analysisContext.typeSystemLegacy;
-  }
-}

pkg/analyzer/test/src/diagnostics/invalid_annotation_target_test.dart

@@ -47,7 +47,7 @@ mixin M {}
     ]);
   }
 
-  void test_classType_topLevelVariable() async {
+  void test_classType_topLevelVariable_constructor() async {
     writeTestPackageConfigWithMeta();
     await assertErrorsInCode('''
 import 'package:meta/meta_meta.dart';
@@ -64,6 +64,25 @@ int x = 0;
     ]);
   }
 
+  void test_classType_topLevelVariable_topLevelConstant() async {
+    writeTestPackageConfigWithMeta();
+    await assertErrorsInCode('''
+import 'package:meta/meta_meta.dart';
+
+@Target({TargetKind.classType})
+class A {
+  const A();
+}
+
+const a = A();
+
+@a
+int x = 0;
+''', [
+      error(HintCode.INVALID_ANNOTATION_TARGET, 114, 1),
+    ]);
+  }
+
   void test_enumType_class() async {
     writeTestPackageConfigWithMeta();
     await assertErrorsInCode('''

pkg/dev_compiler/lib/src/kernel/compiler.dart

@@ -250,7 +250,7 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
       types,
       hierarchy,
       jsTypeRep,
-      NullableInference(jsTypeRep, staticTypeContext),
+      NullableInference(jsTypeRep, staticTypeContext, options: options),
       staticTypeContext,
       options,
       importToSummary,
@@ -4271,9 +4271,9 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
 
     if (_reifyTearoff(member)) {
       return runtimeCall('bind(#, #)', [jsReceiver, jsName]);
-    } else if (isJsMember(member) &&
-        member is Procedure &&
-        !member.isAccessor) {
+    } else if (member is Procedure &&
+        !member.isAccessor &&
+        isJsMember(member)) {
       return runtimeCall(
           'tearoffInterop(#)', [js_ast.PropertyAccess(jsReceiver, jsName)]);
     } else {
@@ -4472,7 +4472,9 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
   }
 
   bool _isDynamicOrFunction(DartType t) =>
-      t == _coreTypes.functionLegacyRawType || t == const DynamicType();
+      DartTypeEquivalence(_coreTypes, ignoreTopLevelNullability: true)
+          .areEqual(t, _coreTypes.functionNonNullableRawType) ||
+      t == const DynamicType();
 
   js_ast.Expression _emitUnaryOperator(
       Expression expr, Member target, InvocationExpression node) {
@@ -5329,8 +5331,9 @@ class ProgramCompiler extends ComputeOnceConstantVisitor<js_ast.Expression>
       if (jsExpr is js_ast.LiteralString && jsExpr.valueWithoutQuotes.isEmpty) {
         continue;
       }
-      parts.add(e.getStaticType(_staticTypeContext) ==
-                  _types.coreTypes.stringLegacyRawType &&
+      var type = e.getStaticType(_staticTypeContext);
+      parts.add(DartTypeEquivalence(_coreTypes, ignoreTopLevelNullability: true)
+                  .areEqual(type, _coreTypes.stringNonNullableRawType) &&
               !isNullable(e)
           ? jsExpr
           : runtimeCall('str(#)', [jsExpr]));

pkg/dev_compiler/lib/src/kernel/nullable_inference.dart

@@ -5,9 +5,12 @@
 // @dart = 2.9
 
 import 'dart:collection';
+
 import 'package:kernel/core_types.dart';
 import 'package:kernel/kernel.dart';
 import 'package:kernel/type_environment.dart';
+
+import '../compiler/shared_command.dart' show SharedCompilerOptions;
 import 'js_typerep.dart';
 import 'kernel_helpers.dart';
 
@@ -40,8 +43,12 @@ class NullableInference extends ExpressionVisitor<bool> {
 
   final _variableInference = _NullableVariableInference();
 
-  NullableInference(this.jsTypeRep, this._staticTypeContext)
-      : coreTypes = jsTypeRep.coreTypes {
+  final bool _soundNullSafety;
+
+  NullableInference(this.jsTypeRep, this._staticTypeContext,
+      {SharedCompilerOptions options})
+      : coreTypes = jsTypeRep.coreTypes,
+        _soundNullSafety = options?.soundNullSafety ?? false {
     _variableInference._nullInference = this;
   }
 
@@ -85,59 +92,71 @@ class NullableInference extends ExpressionVisitor<bool> {
 
   @override
   bool visitPropertyGet(PropertyGet node) =>
-      _getterIsNullable(node.interfaceTarget);
+      _getterIsNullable(node.interfaceTarget, node);
 
   @override
   bool visitPropertySet(PropertySet node) => isNullable(node.value);
 
   @override
   bool visitSuperPropertyGet(SuperPropertyGet node) =>
-      _getterIsNullable(node.interfaceTarget);
+      _getterIsNullable(node.interfaceTarget, node);
 
   @override
   bool visitSuperPropertySet(SuperPropertySet node) => isNullable(node.value);
 
   @override
-  bool visitStaticGet(StaticGet node) => _getterIsNullable(node.target);
+  bool visitStaticGet(StaticGet node) => _getterIsNullable(node.target, node);
 
   @override
   bool visitStaticSet(StaticSet node) => isNullable(node.value);
 
   @override
   bool visitMethodInvocation(MethodInvocation node) => _invocationIsNullable(
-      node.interfaceTarget, node.name.text, node.receiver);
+      node.interfaceTarget, node.name.text, node, node.receiver);
 
   @override
   bool visitSuperMethodInvocation(SuperMethodInvocation node) =>
-      _invocationIsNullable(node.interfaceTarget, node.name.text);
+      _invocationIsNullable(node.interfaceTarget, node.name.text, node);
 
-  bool _invocationIsNullable(Member target, String name,
+  bool _invocationIsNullable(
+      Member target, String name, InvocationExpression node,
       [Expression receiver]) {
     // TODO(jmesserly): this is not a valid assumption for user-defined equality
     // but it is added to match the behavior of the Analyzer backend.
     // https://github.com/dart-lang/sdk/issues/31854
     if (name == '==') return false;
+    if (_staticallyNonNullable(node.getStaticType(_staticTypeContext))) {
+      return false;
+    }
     if (target == null) return true; // dynamic call
     if (target.name.text == 'toString' &&
         receiver != null &&
         receiver.getStaticType(_staticTypeContext) ==
             coreTypes.stringLegacyRawType) {
       // TODO(jmesserly): `class String` in dart:core does not explicitly
       // declare `toString`, which results in a target of `Object.toString` even
-      // when the reciever type is known to be `String`. So we work around it.
+      // when the receiver type is known to be `String`. So we work around it.
       // (The Analyzer backend of DDC probably has the same issue.)
       return false;
     }
     return _returnValueIsNullable(target);
   }
 
-  bool _getterIsNullable(Member target) {
+  bool _getterIsNullable(Member target, Expression node) {
+    if (_staticallyNonNullable(node.getStaticType(_staticTypeContext))) {
+      return false;
+    }
     if (target == null) return true;
     // tear-offs are not null
     if (target is Procedure && !target.isAccessor) return false;
     return _returnValueIsNullable(target);
   }
 
+  bool _staticallyNonNullable(DartType type) =>
+      _soundNullSafety &&
+      type != null &&
+      type.nullability == Nullability.nonNullable;
+
   bool _returnValueIsNullable(Member target) {
     var targetClass = target.enclosingClass;
     if (targetClass != null) {
@@ -179,7 +198,7 @@ class NullableInference extends ExpressionVisitor<bool> {
             typeString.split('|').contains('Null');
       }
     }
-    return _invocationIsNullable(target, node.name.text);
+    return _invocationIsNullable(target, node.name.text, node);
   }
 
   @override
@@ -202,7 +221,10 @@ class NullableInference extends ExpressionVisitor<bool> {
   bool visitIsExpression(IsExpression node) => false;
 
   @override
-  bool visitAsExpression(AsExpression node) => isNullable(node.operand);
+  bool visitAsExpression(AsExpression node) =>
+      _staticallyNonNullable(node.getStaticType(_staticTypeContext))
+          ? false
+          : isNullable(node.operand);
 
   @override
   bool visitSymbolLiteral(SymbolLiteral node) => false;
@@ -226,7 +248,8 @@ class NullableInference extends ExpressionVisitor<bool> {
   bool visitMapLiteral(MapLiteral node) => false;
 
   @override
-  bool visitAwaitExpression(AwaitExpression node) => true;
+  bool visitAwaitExpression(AwaitExpression node) =>
+      !_staticallyNonNullable(node.getStaticType(_staticTypeContext));
 
   @override
   bool visitFunctionExpression(FunctionExpression node) => false;
@@ -336,7 +359,8 @@ class _NullableVariableInference extends RecursiveVisitor<void> {
   @override
   void visitFunctionNode(FunctionNode node) {
     _functions.add(node);
-    if (_nullInference.allowNotNullDeclarations) {
+    if (_nullInference.allowNotNullDeclarations ||
+        _nullInference._soundNullSafety) {
       visitList(node.positionalParameters, this);
       visitList(node.namedParameters, this);
     }
@@ -362,9 +386,14 @@ class _NullableVariableInference extends RecursiveVisitor<void> {
       }
     }
     var initializer = node.initializer;
-    // A Variable declaration with a FunctionNode as a parent is a function
-    // parameter so we can't trust the initializer as a nullable check.
-    if (node.parent is! FunctionNode) {
+    if (_nullInference._soundNullSafety &&
+        node.type.nullability == Nullability.nonNullable) {
+      // Avoid null checks for variables when the type system guarantees they
+      // can never be null.
+      _notNullLocals.add(node);
+    } else if (node.parent is! FunctionNode) {
+      // A variable declaration with a FunctionNode as a parent is a function
+      // parameter so we can't trust the initializer as a nullable check.
       if (initializer != null) {
         var savedVariable = _variableAssignedTo;
         _variableAssignedTo = node;

pkg/dev_compiler/tool/dartdevc_nnbd_sdk_error_golden.txt

@@ -1,11 +1,11 @@
 ERROR|COMPILE_TIME_ERROR|CONST_CONSTRUCTOR_THROWS_EXCEPTION|lib/core/core.dart|3725|5|94|Const constructors can't throw exceptions.
-ERROR|COMPILE_TIME_ERROR|CONST_CONSTRUCTOR_THROWS_EXCEPTION|lib/core/core.dart|7913|5|97|Const constructors can't throw exceptions.
+ERROR|COMPILE_TIME_ERROR|CONST_CONSTRUCTOR_THROWS_EXCEPTION|lib/core/core.dart|7925|5|97|Const constructors can't throw exceptions.
 ERROR|COMPILE_TIME_ERROR|CONST_CONSTRUCTOR_THROWS_EXCEPTION|lib/core/core.dart|939|5|95|Const constructors can't throw exceptions.
 ERROR|COMPILE_TIME_ERROR|CONST_CONSTRUCTOR_THROWS_EXCEPTION|lib/core/core.dart|972|5|94|Const constructors can't throw exceptions.
-ERROR|COMPILE_TIME_ERROR|INVALID_ASSIGNMENT|lib/_internal/js_dev_runtime/private/interceptors.dart|1348|18|27|A value of type 'double' can't be assigned to a variable of type 'int'.
-ERROR|COMPILE_TIME_ERROR|RETURN_OF_INVALID_TYPE|lib/_internal/js_dev_runtime/private/interceptors.dart|1215|14|38|A value of type 'double' can't be returned from method '%' because it has a return type of 'JSNumber'.
-ERROR|COMPILE_TIME_ERROR|RETURN_OF_INVALID_TYPE|lib/_internal/js_dev_runtime/private/interceptors.dart|1217|14|38|A value of type 'double' can't be returned from method '%' because it has a return type of 'JSNumber'.
+ERROR|COMPILE_TIME_ERROR|INVALID_ASSIGNMENT|lib/_internal/js_dev_runtime/private/interceptors.dart|1358|18|27|A value of type 'double' can't be assigned to a variable of type 'int'.
+ERROR|COMPILE_TIME_ERROR|RETURN_OF_INVALID_TYPE|lib/_internal/js_dev_runtime/private/interceptors.dart|1225|14|38|A value of type 'double' can't be returned from method '%' because it has a return type of 'JSNumber'.
+ERROR|COMPILE_TIME_ERROR|RETURN_OF_INVALID_TYPE|lib/_internal/js_dev_runtime/private/interceptors.dart|1227|14|38|A value of type 'double' can't be returned from method '%' because it has a return type of 'JSNumber'.
 ERROR|SYNTACTIC_ERROR|CONST_FACTORY|lib/core/core.dart|3723|3|5|Only redirecting factory constructors can be declared to be 'const'.
-ERROR|SYNTACTIC_ERROR|CONST_FACTORY|lib/core/core.dart|7911|3|5|Only redirecting factory constructors can be declared to be 'const'.
+ERROR|SYNTACTIC_ERROR|CONST_FACTORY|lib/core/core.dart|7923|3|5|Only redirecting factory constructors can be declared to be 'const'.
 ERROR|SYNTACTIC_ERROR|CONST_FACTORY|lib/core/core.dart|937|3|5|Only redirecting factory constructors can be declared to be 'const'.
 ERROR|SYNTACTIC_ERROR|CONST_FACTORY|lib/core/core.dart|970|3|5|Only redirecting factory constructors can be declared to be 'const'.