Version 2.12.0-12.0.dev

Merge commit '416cfa7c41f50b50f5a502ba179e5b45ef08dbca' into 'dev'

Author: Dart CI

pkg/analyzer/lib/src/test_utilities/mock_sdk.dart

@@ -6,6 +6,7 @@ import 'dart:convert';
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
+import 'package:analyzer/src/dart/analysis/experiments.dart';
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
@@ -1103,7 +1104,10 @@ class MockSdk implements DartSdk {
     _versionFile = resourceProvider
         .getFolder(resourceProvider.convertPath(sdkRoot))
         .getChildAssumingFile('version');
-    _versionFile.writeAsStringSync('2.12.0');
+    _versionFile.writeAsStringSync(
+      '${ExperimentStatus.currentVersion.major}.'
+      '${ExperimentStatus.currentVersion.minor}.0',
+    );
 
     for (MockSdkLibrary library in _LIBRARIES) {
       var convertedLibrary = library._toProvider(resourceProvider);

pkg/front_end/lib/src/fasta/builder/procedure_builder.dart

@@ -793,6 +793,7 @@ class RedirectingFactoryBuilder extends ProcedureBuilderImpl {
           List<Expression> positionalArguments = <Expression>[];
           for (VariableDeclaration parameter
               in member.function.positionalParameters) {
+            inferrer.flowAnalysis?.declare(parameter, true);
             positionalArguments.add(new VariableGetImpl(
                 parameter,
                 inferrer.typePromoter.getFactForAccess(parameter, 0),
@@ -802,6 +803,7 @@ class RedirectingFactoryBuilder extends ProcedureBuilderImpl {
           List<NamedExpression> namedArguments = <NamedExpression>[];
           for (VariableDeclaration parameter
               in member.function.namedParameters) {
+            inferrer.flowAnalysis?.declare(parameter, true);
             namedArguments.add(new NamedExpression(
                 parameter.name,
                 new VariableGetImpl(

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

@@ -319,8 +319,8 @@ class BodyBuilder extends ScopeListener<JumpTarget>
 
   /// List of built type aliased generative constructor invocations that
   /// require unaliasing.
-  final List<ConstructorInvocation> typeAliasedConstructorInvocations =
-      <ConstructorInvocation>[];
+  final List<TypeAliasedConstructorInvocationJudgment>
+      typeAliasedConstructorInvocations = [];
 
   /// List of built type aliased factory constructor invocations that require
   /// unaliasing.
@@ -1244,11 +1244,24 @@ class BodyBuilder extends ScopeListener<JumpTarget>
   }
 
   void _unaliasTypeAliasedConstructorInvocations() {
-    for (ConstructorInvocation invocation
+    for (TypeAliasedConstructorInvocationJudgment invocation
         in typeAliasedConstructorInvocations) {
-      // TODO(eernst): Should replace aliased constructor invocations,
-      // such that back ends don't see instance creations on type aliases.
-      invocation.replaceWith(new NullLiteral());
+      DartType unaliasedType = new TypedefType(
+              invocation.typeAliasBuilder.typedef,
+              Nullability.nonNullable,
+              invocation.arguments.types)
+          .unalias;
+      List<DartType> invocationTypeArguments = null;
+      if (unaliasedType is InterfaceType) {
+        invocationTypeArguments = unaliasedType.typeArguments;
+      }
+      Arguments invocationArguments = new ArgumentsImpl(
+          invocation.arguments.positional,
+          types: invocationTypeArguments,
+          named: invocation.arguments.named);
+      invocation.replaceWith(new ConstructorInvocation(
+          invocation.target, invocationArguments,
+          isConst: invocation.isConst));
     }
     typeAliasedConstructorInvocations.clear();
   }

pkg/front_end/testcases/nnbd/issue43918.dart

@@ -0,0 +1,21 @@
+// Copyright (c) 2020, the Dart project authors. Please see the AUTHORS file
+// 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.
+
+abstract class A<T> {
+  factory A(T value) = _A;
+}
+
+class _A<T> implements A<T> {
+  _A(T value);
+}
+
+abstract class B<T> {
+  factory B(int value) = _B;
+}
+
+class _B<T> implements B<T> {
+  _B(int value);
+}
+
+main() {}

pkg/front_end/testcases/nnbd/issue43918.dart.outline.expect

@@ -0,0 +1,24 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+import "dart:core" as core;
+
+abstract class A<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::A::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(self::A::•::T% value) → self::A<self::A::•::T%>
+    let dynamic #redirecting_factory = self::_A::• in let self::A::•::T% #typeArg0 = null in invalid-expression;
+}
+class _A<T extends core::Object? = dynamic> extends core::Object implements self::A<self::_A::T%> {
+  constructor •(self::_A::T% value) → self::_A<self::_A::T%>
+    ;
+}
+abstract class B<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::B::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(core::int value) → self::B<self::B::•::T%>
+    let dynamic #redirecting_factory = self::_B::• in let self::B::•::T% #typeArg0 = null in invalid-expression;
+}
+class _B<T extends core::Object? = dynamic> extends core::Object implements self::B<self::_B::T%> {
+  constructor •(core::int value) → self::_B<self::_B::T%>
+    ;
+}
+static method main() → dynamic
+  ;

pkg/front_end/testcases/nnbd/issue43918.dart.strong.expect

@@ -0,0 +1,25 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+import "dart:core" as core;
+
+abstract class A<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::A::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(self::A::•::T% value) → self::A<self::A::•::T%>
+    let dynamic #redirecting_factory = self::_A::• in let self::A::•::T% #typeArg0 = null in invalid-expression;
+}
+class _A<T extends core::Object? = dynamic> extends core::Object implements self::A<self::_A::T%> {
+  constructor •(self::_A::T% value) → self::_A<self::_A::T%>
+    : super core::Object::•()
+    ;
+}
+abstract class B<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::B::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(core::int value) → self::B<self::B::•::T%>
+    let dynamic #redirecting_factory = self::_B::• in let self::B::•::T% #typeArg0 = null in invalid-expression;
+}
+class _B<T extends core::Object? = dynamic> extends core::Object implements self::B<self::_B::T%> {
+  constructor •(core::int value) → self::_B<self::_B::T%>
+    : super core::Object::•()
+    ;
+}
+static method main() → dynamic {}

pkg/front_end/testcases/nnbd/issue43918.dart.strong.transformed.expect

@@ -0,0 +1,25 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+import "dart:core" as core;
+
+abstract class A<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::A::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(self::A::•::T% value) → self::A<self::A::•::T%>
+    let<BottomType> #redirecting_factory = self::_A::• in let self::A::•::T% #typeArg0 = null in invalid-expression;
+}
+class _A<T extends core::Object? = dynamic> extends core::Object implements self::A<self::_A::T%> {
+  constructor •(self::_A::T% value) → self::_A<self::_A::T%>
+    : super core::Object::•()
+    ;
+}
+abstract class B<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::B::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(core::int value) → self::B<self::B::•::T%>
+    let<BottomType> #redirecting_factory = self::_B::• in let self::B::•::T% #typeArg0 = null in invalid-expression;
+}
+class _B<T extends core::Object? = dynamic> extends core::Object implements self::B<self::_B::T%> {
+  constructor •(core::int value) → self::_B<self::_B::T%>
+    : super core::Object::•()
+    ;
+}
+static method main() → dynamic {}

pkg/front_end/testcases/nnbd/issue43918.dart.textual_outline.expect

@@ -0,0 +1,17 @@
+abstract class A<T> {
+  factory A(T value) = _A;
+}
+
+class _A<T> implements A<T> {
+  _A(T value);
+}
+
+abstract class B<T> {
+  factory B(int value) = _B;
+}
+
+class _B<T> implements B<T> {
+  _B(int value);
+}
+
+main() {}

pkg/front_end/testcases/nnbd/issue43918.dart.textual_outline_modelled.expect

@@ -0,0 +1,17 @@
+abstract class A<T> {
+  factory A(T value) = _A;
+}
+
+abstract class B<T> {
+  factory B(int value) = _B;
+}
+
+class _A<T> implements A<T> {
+  _A(T value);
+}
+
+class _B<T> implements B<T> {
+  _B(int value);
+}
+
+main() {}

pkg/front_end/testcases/nnbd/issue43918.dart.weak.expect

@@ -0,0 +1,25 @@
+library /*isNonNullableByDefault*/;
+import self as self;
+import "dart:core" as core;
+
+abstract class A<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::A::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(self::A::•::T% value) → self::A<self::A::•::T%>
+    let dynamic #redirecting_factory = self::_A::• in let self::A::•::T% #typeArg0 = null in invalid-expression;
+}
+class _A<T extends core::Object? = dynamic> extends core::Object implements self::A<self::_A::T%> {
+  constructor •(self::_A::T% value) → self::_A<self::_A::T%>
+    : super core::Object::•()
+    ;
+}
+abstract class B<T extends core::Object? = dynamic> extends core::Object {
+  static field dynamic _redirecting# = <dynamic>[self::B::•]/*isNullableByDefault*/;
+  static factory •<T extends core::Object? = dynamic>(core::int value) → self::B<self::B::•::T%>
+    let dynamic #redirecting_factory = self::_B::• in let self::B::•::T% #typeArg0 = null in invalid-expression;
+}
+class _B<T extends core::Object? = dynamic> extends core::Object implements self::B<self::_B::T%> {
+  constructor •(core::int value) → self::_B<self::_B::T%>
+    : super core::Object::•()
+    ;
+}
+static method main() → dynamic {}