[cfe] Add tests for inheritance from opt-out libraries

Change-Id: If139945dfdd808da0c24ac550ecfa235b41d3c23
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/123737
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Paul Berry <paulberry@google.com>

Author: johnniwinther

pkg/_fe_analyzer_shared/test/inheritance/data/from_opt_out/main.dart

@@ -0,0 +1,37 @@
+// Copyright (c) 2019, 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.
+
+/*cfe.library: nnbd=true*/
+
+import 'opt_out.dart';
+
+/*class: Class1:Class1,LegacyClass1,Object*/
+class Class1 extends LegacyClass1 {}
+
+/*class: Class2:Class2<T*>,LegacyClass2<T>,Object*/
+class Class2<T> extends LegacyClass2<T> {}
+
+/*class: Class3a:Class3a<T*>,GenericInterface<T*>,LegacyClass3<T>,Object*/
+class Class3a<T> extends LegacyClass3<T> {}
+
+/*class: Class3b:Class3b<T*>,GenericInterface<T*>,LegacyClass3<T>,Object*/
+class
+// TODO(johnniwinther): Avoid this error.
+/*error: AmbiguousSupertypes*/
+    Class3b<T> extends LegacyClass3<T> implements GenericInterface<T> {}
+
+/*class: Class4a:Class4a,GenericInterface<num*>,LegacyClass4,Object*/
+class Class4a extends LegacyClass4 {}
+
+/*class: Class4b:Class4b,GenericInterface<num!>,Object*/
+class Class4b implements GenericInterface<num> {}
+
+/*class: Class4c:Class4c,GenericInterface<num?>,Object*/
+class Class4c implements GenericInterface<num?> {}
+
+/*class: Class4d:Class4d,GenericInterface<num*>,LegacyClass4,Object*/
+class
+// TODO(johnniwinther): Avoid this error.
+/*error: AmbiguousSupertypes*/
+    Class4d extends LegacyClass4 implements GenericInterface<num> {}

pkg/_fe_analyzer_shared/test/inheritance/data/from_opt_out/opt_out.dart

@@ -0,0 +1,22 @@
+// Copyright (c) 2019, 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.
+
+// @dart=2.5
+
+/*library: nnbd=false*/
+
+/*class: GenericInterface:GenericInterface<T*>,Object*/
+abstract class GenericInterface<T> {}
+
+/*class: LegacyClass1:LegacyClass1,Object*/
+class LegacyClass1 {}
+
+/*class: LegacyClass2:LegacyClass2<T*>,Object*/
+class LegacyClass2<T> {}
+
+/*class: LegacyClass3:GenericInterface<T*>,LegacyClass3<T*>,Object*/
+class LegacyClass3<T> implements GenericInterface<T> {}
+
+/*class: LegacyClass4:GenericInterface<num*>,LegacyClass4,Object*/
+class LegacyClass4 implements GenericInterface<num> {}

pkg/front_end/lib/src/testing/id_testing_helper.dart

@@ -35,11 +35,17 @@ export '../fasta/messages.dart' show FormattedMessage;
 /// Test configuration used for testing CFE in its default state.
 const TestConfig defaultCfeConfig = const TestConfig(cfeMarker, 'cfe');
 
-/// Test configuration used for testing CFE with nnbd.
+/// Test configuration used for testing CFE with nnbd in addition to the
+/// default state.
 const TestConfig cfeNonNullableConfig = const TestConfig(
     cfeWithNnbdMarker, 'cfe with nnbd',
     experimentalFlags: const {ExperimentalFlag.nonNullable: true});
 
+/// Test configuration used for testing CFE with nnbd as the default state.
+const TestConfig cfeNonNullableOnlyConfig = const TestConfig(
+    cfeMarker, 'cfe with nnbd',
+    experimentalFlags: const {ExperimentalFlag.nonNullable: true});
+
 class TestConfig {
   final String marker;
   final String name;

pkg/front_end/lib/src/testing/id_testing_utils.dart

@@ -233,26 +233,68 @@ MemberBuilder lookupExtensionMemberBuilder(
 
 /// Returns a textual representation of the constant [node] to be used in
 /// testing.
-String constantToText(Constant node, {bool isNonNullableByDefault: false}) {
+String constantToText(Constant node,
+    {TypeRepresentation typeRepresentation: TypeRepresentation.legacy}) {
   StringBuffer sb = new StringBuffer();
-  new ConstantToTextVisitor(sb, isNonNullableByDefault).visit(node);
+  new ConstantToTextVisitor(sb, typeRepresentation).visit(node);
   return sb.toString();
 }
 
+enum TypeRepresentation {
+  legacy,
+  explicit,
+  implicitUndetermined,
+  nonNullableByDefault,
+}
+
 /// Returns a textual representation of the type [node] to be used in
 /// testing.
-String typeToText(DartType node, {bool isNonNullableByDefault: false}) {
+String typeToText(DartType node,
+    [TypeRepresentation typeRepresentation = TypeRepresentation.legacy]) {
+  StringBuffer sb = new StringBuffer();
+  new DartTypeToTextVisitor(sb, typeRepresentation).visit(node);
+  return sb.toString();
+}
+
+Set<Class> computeAllSuperclasses(Class node) {
+  Set<Class> set = <Class>{};
+  _getAllSuperclasses(node, set);
+  return set;
+}
+
+void _getAllSuperclasses(Class node, Set<Class> set) {
+  if (set.add(node)) {
+    if (node.supertype != null) {
+      _getAllSuperclasses(node.supertype.classNode, set);
+    }
+    if (node.mixedInType != null) {
+      _getAllSuperclasses(node.mixedInType.classNode, set);
+    }
+    for (Supertype interface in node.implementedTypes) {
+      _getAllSuperclasses(interface.classNode, set);
+    }
+  }
+}
+
+String supertypeToText(Supertype node,
+    [TypeRepresentation typeRepresentation = TypeRepresentation.legacy]) {
   StringBuffer sb = new StringBuffer();
-  new DartTypeToTextVisitor(sb, isNonNullableByDefault).visit(node);
+  sb.write(node.classNode.name);
+  if (node.typeArguments.isNotEmpty) {
+    sb.write('<');
+    new DartTypeToTextVisitor(sb, typeRepresentation)
+        .visitList(node.typeArguments);
+    sb.write('>');
+  }
   return sb.toString();
 }
 
 class ConstantToTextVisitor implements ConstantVisitor<void> {
   final StringBuffer sb;
   final DartTypeToTextVisitor typeToText;
 
-  ConstantToTextVisitor(this.sb, bool isNonNullableByDefault)
-      : typeToText = new DartTypeToTextVisitor(sb, isNonNullableByDefault);
+  ConstantToTextVisitor(this.sb, TypeRepresentation typeRepresentation)
+      : typeToText = new DartTypeToTextVisitor(sb, typeRepresentation);
 
   void visit(Constant node) => node.accept(this);
 
@@ -375,9 +417,9 @@ class ConstantToTextVisitor implements ConstantVisitor<void> {
 
 class DartTypeToTextVisitor implements DartTypeVisitor<void> {
   final StringBuffer sb;
-  final bool isNonNullableByDefault;
+  final TypeRepresentation typeRepresentation;
 
-  DartTypeToTextVisitor(this.sb, this.isNonNullableByDefault);
+  DartTypeToTextVisitor(this.sb, this.typeRepresentation);
 
   void visit(DartType node) => node.accept(this);
 
@@ -421,8 +463,7 @@ class DartTypeToTextVisitor implements DartTypeVisitor<void> {
       sb.write('>');
     }
     if (!isNull(node)) {
-      sb.write(nullabilityToText(node.nullability,
-          isNonNullableByDefault: isNonNullableByDefault));
+      sb.write(nullabilityToText(node.nullability, typeRepresentation));
     }
   }
 
@@ -454,16 +495,14 @@ class DartTypeToTextVisitor implements DartTypeVisitor<void> {
       sb.write('}');
     }
     sb.write(')');
-    sb.write(nullabilityToText(node.nullability,
-        isNonNullableByDefault: isNonNullableByDefault));
+    sb.write(nullabilityToText(node.nullability, typeRepresentation));
     sb.write('->');
     visit(node.returnType);
   }
 
   void visitTypeParameterType(TypeParameterType node) {
     sb.write(node.parameter.name);
-    sb.write(nullabilityToText(node.nullability,
-        isNonNullableByDefault: isNonNullableByDefault));
+    sb.write(nullabilityToText(node.nullability, typeRepresentation));
     if (node.promotedBound != null) {
       sb.write(' & ');
       visit(node.promotedBound);
@@ -477,8 +516,7 @@ class DartTypeToTextVisitor implements DartTypeVisitor<void> {
       visitList(node.typeArguments);
       sb.write('>');
     }
-    sb.write(nullabilityToText(node.nullability,
-        isNonNullableByDefault: isNonNullableByDefault));
+    sb.write(nullabilityToText(node.nullability, typeRepresentation));
   }
 }
 
@@ -546,8 +584,12 @@ String typeVariableBuilderToText(TypeVariableBuilder typeVariable) {
 }
 
 /// Returns a textual representation of [errors] to be used in testing.
-String errorsToText(List<FormattedMessage> errors) {
-  return errors.map((m) => m.message).join(',');
+String errorsToText(List<FormattedMessage> errors, {bool useCodes: false}) {
+  if (useCodes) {
+    return errors.map((m) => m.code).join(',');
+  } else {
+    return errors.map((m) => m.message).join(',');
+  }
 }
 
 /// Returns a textual representation of [descriptor] to be used in testing.
@@ -588,18 +630,39 @@ String extensionMethodDescriptorToText(ExtensionMemberDescriptor descriptor) {
 }
 
 /// Returns a textual representation of [nullability] to be used in testing.
-String nullabilityToText(Nullability nullability,
-    {bool isNonNullableByDefault}) {
-  assert(isNonNullableByDefault != null);
+String nullabilityToText(
+    Nullability nullability, TypeRepresentation typeRepresentation) {
   switch (nullability) {
     case Nullability.nonNullable:
-      return isNonNullableByDefault ? '' : '!';
+      switch (typeRepresentation) {
+        case TypeRepresentation.explicit:
+        case TypeRepresentation.legacy:
+        case TypeRepresentation.implicitUndetermined:
+          return '!';
+        case TypeRepresentation.nonNullableByDefault:
+          return '';
+      }
+      break;
     case Nullability.nullable:
       return '?';
     case Nullability.undetermined:
-      return '%';
+      switch (typeRepresentation) {
+        case TypeRepresentation.implicitUndetermined:
+          return '';
+        default:
+          return '%';
+      }
+      break;
     case Nullability.legacy:
-      return isNonNullableByDefault ? '*' : '';
+      switch (typeRepresentation) {
+        case TypeRepresentation.legacy:
+          return '';
+        case TypeRepresentation.explicit:
+        case TypeRepresentation.nonNullableByDefault:
+        case TypeRepresentation.implicitUndetermined:
+          return '*';
+      }
+      break;
   }
   throw new UnsupportedError('Unexpected nullability: $nullability.');
 }

pkg/front_end/test/flow_analysis/assigned_variables/assigned_variables_test.dart

@@ -10,8 +10,6 @@ import 'package:_fe_analyzer_shared/src/testing/id.dart'
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart'
     show DataInterpreter, runTests;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
-import 'package:front_end/src/api_prototype/experimental_flags.dart'
-    show ExperimentalFlag;
 import 'package:front_end/src/fasta/builder/member_builder.dart';
 import 'package:front_end/src/fasta/source/source_loader.dart';
 
@@ -28,10 +26,8 @@ main(List<String> args) async {
       supportedMarkers: sharedMarkers,
       createUriForFileName: createUriForFileName,
       onFailure: onFailure,
-      runTest: runTestFor(const AssignedVariablesDataComputer(), [
-        new TestConfig(cfeMarker, 'cfe with nnbd',
-            experimentalFlags: const {ExperimentalFlag.nonNullable: true})
-      ]),
+      runTest: runTestFor(
+          const AssignedVariablesDataComputer(), [cfeNonNullableOnlyConfig]),
       skipList: [
         'for.dart',
         'for_element.dart',

pkg/front_end/test/flow_analysis/definite_assignment/definite_assignment_test.dart

@@ -7,9 +7,6 @@ import 'package:_fe_analyzer_shared/src/testing/id.dart' show ActualData, Id;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart'
     show DataInterpreter, runTests;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
-import 'package:front_end/src/api_prototype/experimental_flags.dart'
-    show ExperimentalFlag;
-
 import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/fasta/type_inference/type_inference_engine.dart';
 import 'package:front_end/src/fasta/builder/member_builder.dart';
@@ -25,10 +22,8 @@ main(List<String> args) async {
       supportedMarkers: sharedMarkers,
       createUriForFileName: createUriForFileName,
       onFailure: onFailure,
-      runTest: runTestFor(const DefiniteAssignmentDataComputer(), [
-        new TestConfig(cfeMarker, 'cfe with nnbd',
-            experimentalFlags: const {ExperimentalFlag.nonNullable: true})
-      ]),
+      runTest: runTestFor(
+          const DefiniteAssignmentDataComputer(), [cfeNonNullableOnlyConfig]),
       skipList: [
         // TODO(johnniwinther): Update break/continue handling to support these:
         'do.dart',

pkg/front_end/test/flow_analysis/nullability/nullability_test.dart

@@ -7,9 +7,6 @@ import 'package:_fe_analyzer_shared/src/testing/id.dart' show ActualData, Id;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart'
     show DataInterpreter, runTests;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
-import 'package:front_end/src/api_prototype/experimental_flags.dart'
-    show ExperimentalFlag;
-
 import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:kernel/ast.dart' hide Variance;
 
@@ -21,10 +18,8 @@ main(List<String> args) async {
       supportedMarkers: sharedMarkers,
       createUriForFileName: createUriForFileName,
       onFailure: onFailure,
-      runTest: runTestFor(const NullabilityDataComputer(), [
-        new TestConfig(cfeMarker, 'cfe with nnbd',
-            experimentalFlags: const {ExperimentalFlag.nonNullable: true})
-      ]),
+      runTest: runTestFor(
+          const NullabilityDataComputer(), [cfeNonNullableOnlyConfig]),
       skipList: [
         // TODO(johnniwinther): Run all nullability tests.
         'null_aware_access.dart',

pkg/front_end/test/flow_analysis/reachability/reachability_test.dart

@@ -7,9 +7,6 @@ import 'package:_fe_analyzer_shared/src/testing/id.dart' show ActualData, Id;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart'
     show DataInterpreter, runTests;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart';
-import 'package:front_end/src/api_prototype/experimental_flags.dart'
-    show ExperimentalFlag;
-
 import 'package:front_end/src/testing/id_testing_helper.dart';
 import 'package:front_end/src/fasta/type_inference/type_inference_engine.dart';
 import 'package:front_end/src/fasta/builder/member_builder.dart';
@@ -24,10 +21,8 @@ main(List<String> args) async {
       supportedMarkers: sharedMarkers,
       createUriForFileName: createUriForFileName,
       onFailure: onFailure,
-      runTest: runTestFor(const ReachabilityDataComputer(), [
-        new TestConfig(cfeMarker, 'cfe with nnbd',
-            experimentalFlags: const {ExperimentalFlag.nonNullable: true})
-      ]));
+      runTest: runTestFor(
+          const ReachabilityDataComputer(), [cfeNonNullableOnlyConfig]));
 }
 
 class ReachabilityDataComputer

pkg/front_end/test/flow_analysis/type_promotion/type_promotion_test.dart

@@ -3,9 +3,6 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:io' show Directory, Platform;
-import 'package:front_end/src/api_prototype/experimental_flags.dart'
-    show ExperimentalFlag;
-
 import 'package:_fe_analyzer_shared/src/testing/id.dart' show ActualData, Id;
 import 'package:_fe_analyzer_shared/src/testing/id_testing.dart'
     show DataInterpreter, runTests;
@@ -23,10 +20,8 @@ main(List<String> args) async {
       supportedMarkers: sharedMarkers,
       createUriForFileName: createUriForFileName,
       onFailure: onFailure,
-      runTest: runTestFor(const TypePromotionDataComputer(), [
-        new TestConfig(cfeMarker, 'cfe with nnbd',
-            experimentalFlags: const {ExperimentalFlag.nonNullable: true})
-      ]),
+      runTest: runTestFor(
+          const TypePromotionDataComputer(), [cfeNonNullableOnlyConfig]),
       skipList: [
         // TODO(johnniwinther): Run all type promotion tests.
         'assignment_promoted.dart',
@@ -79,7 +74,7 @@ class _TypePromotionDataInterpreter implements DataInterpreter<DartType> {
 
   @override
   String getText(DartType actualData) =>
-      typeToText(actualData, isNonNullableByDefault: true);
+      typeToText(actualData, TypeRepresentation.nonNullableByDefault);
 
   @override
   String isAsExpected(DartType actualData, String expectedData) {