Version 2.13.0-54.0.dev

Merge commit 'dbce7a60f4c5b7d08a3a7445340fc9f051a797fe' into 'dev'
diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json
index eee3202..f687245 100644
--- a/.dart_tool/package_config.json
+++ b/.dart_tool/package_config.json
@@ -11,7 +11,7 @@
     "constraint, update this by running tools/generate_package_config.dart."
   ],
   "configVersion": 2,
-  "generated": "2021-02-17T14:49:35.996535",
+  "generated": "2021-02-19T10:27:13.251974",
   "generator": "tools/generate_package_config.dart",
   "packages": [
     {
@@ -587,7 +587,7 @@
       "name": "shelf_web_socket",
       "rootUri": "../third_party/pkg/shelf_web_socket",
       "packageUri": "lib/",
-      "languageVersion": "2.0"
+      "languageVersion": "2.1"
     },
     {
       "name": "smith",
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 211e5a8..3f33539 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,70 +15,84 @@
 
 ### Language
 
-*   **Breaking Change** [Null
-    Safety](https://dart.dev/null-safety/understanding-null-safety) is now
-    enabled by default in all packages with a lower sdk constraint of 2.12.0 or
-    greater.  Files that are not subject to language versioning (whether because
-    they are not contained in a pub package, or because the package that they
-    are contained in has no lower sdk constraint) are treated as opted into to
-    null safety by default and may report new errors.  Pub packages may be opted
-    out of null safety by setting a min sdk constraint in pubspec.yaml of 2.9.0
-    or less.  Files may be opted out of null safety by adding `// @dart=2.9` to
-    the beginning of the file.
+*   **Breaking Change** [Null safety][] is now enabled by default in all code
+    that has not opted out. With null safety, types in your code are
+    non-nullable by default. Null can only flow into parts of your program where
+    you want it. With null safety, your runtime null-dereference bugs turn into
+    edit-time analysis errors.
+
+    You can opt out of null safety and preserve your code's previous behavior by
+    setting the lower bound of the SDK constraint in your pubspec to 2.11.0 or
+    earlier to request an earlier [language version][]. You can opt out
+    individual Dart files by adding `// @dart=2.11` to the beginning of the
+    file.
+
+    Files that are opted in to null safety may report new compile-time errors.
+    Opting in to null safety also gives you access to other new language
+    features:
+
+    *   Smarter flow analysis and type promotion
+    *   `required` named parameters
+    *   `late` variables
+    *   The postfix `!` null assertion operator
+    *   The `?..` and `?[]` null-aware operators
 
 *   **Breaking Change** [#44660][]: Fixed an implementation bug where `this`
     would sometimes undergo type promotion in extensions.
 
+[null safety]: https://dart.dev/null-safety/understanding-null-safety
+[language version]: https://dart.dev/guides/language/evolution#language-versioning
 [#44660]: https://github.com/dart-lang/sdk/issues/44660
 
 ### Core libraries
 
 #### `dart:async`
 
-* Adds extension method `onError` on `Future` to allow better typing
-  of error handling.
+*   Add extension method `onError()` on `Future` to allow better typing of error
+    callbacks.
 
 #### `dart:collection`
 
-* Added `UnmodifiableSetView` class, which allows users to guarantee that
-  methods that could change underlying `Set` instance can not be invoked.
+*   Add `UnmodifiableSetView` class, which allows users to guarantee that
+    methods that could change underlying `Set` instance can not be invoked.
 
-* `LinkedList` made it explicit that elements are compared by identity,
-  and updated `contains` to take advantage of this.
+*   Make it explicit that `LinkedList` compares elements by identity, and update
+    `contains()` to take advantage of this.
 
 #### `dart:core`
 
-* Added `unmodifiable` constructor to class `Set`, which allows users to create
-  unmodifiable `Set` instances.
+*   Add `Set.unmodifiable()` constructor, which allows users to create
+    unmodifiable `Set` instances.
 
 #### `dart:io`
 
-* `HttpRequest` will now correctly follow HTTP 308 redirects
-  (`HttpStatus.permanentRedirect`).
+*   `HttpRequest` now correctly follows HTTP 308 redirects
+    (`HttpStatus.permanentRedirect`).
 
 #### `dart:isolate`
 
-* Added `debugName` positional parameter to `ReceivePort` and `RawReceivePort`
-  constructors, a name which can be associated with the port and displayed in
-  tooling.
+*   Add `debugName` positional parameter to `ReceivePort` and `RawReceivePort`
+    constructors, a name which can be associated with the port and displayed in
+    tooling.
 
 #### `dart:html`
 
-* `EventStreamSubscription.cancel` has been updated to retain its synchronous
-  timing when running in both sound and unsound null safety modes. See issue
-  [#44157][] for more details.
+*   `EventStreamSubscription.cancel` has been updated to retain its synchronous
+    timing when running in both sound and unsound null safety modes. See issue
+    [#44157][] for more details.
 
 [#44157]: https://github.com/dart-lang/sdk/issues/44157
 
 ### Dart VM
 
-*   **Breaking Change** [#42312][]: `Dart_WeakPersistentHandle`s will no longer
+*   **Breaking Change** [#42312][]: `Dart_WeakPersistentHandle`s no longer
     auto-delete themselves when the referenced object is garbage collected to
     avoid race conditions, but they are still automatically deleted when the
     isolate group shuts down.
+
 *   **Breaking Change** [#42312][]: `Dart_WeakPersistentHandleFinalizer`
     is renamed to `Dart_HandleFinalizer` and had its `handle` argument removed.
-    All api functions using that type have been updated.
+    All API functions using that type have been updated.
 
 [#42312]: https://github.com/dart-lang/sdk/issues/42312
 
@@ -93,6 +107,7 @@
     Instead, the `Allocator` it is introduced to `dart:ffi`, and also requires
     a constant `T` on invocations. For migration notes see the breaking change
     request.
+
 *   **Breaking Change** [#44622][]: Subtypes of `Struct` without any native
     member are being deprecated in the current stable release (2.12), and are
     planned to be fully removed in the following stable release (2.13).
@@ -103,154 +118,192 @@
 
 ### Dart2JS
 
-* Removed `--no-defer-class-types` and `--no-new-deferred-split`.
+*   Remove `--no-defer-class-types` and `--no-new-deferred-split`.
 
 ### Tools
 
 #### Dartanalyzer
 
-* Removed the `--use-fasta-parser`, `--preview-dart-2`, and
-  `--enable-assert-initializers` command line options. These options haven't
-  been supported in a while and were no-ops.
-* Report diagnostics regarding the
-  [`@internal`](https://pub.dev/documentation/meta/latest/meta/internal-constant.html)
-  annotation.
-* Improve diagnostic-reporting regarding the
-  [`@doNotStore`](https://pub.dev/documentation/meta/latest/meta/doNotStore-constant.html)
-  annotation.
-* Introduce a diagnostic which is reported when a library member named `main`
-  is not a function.
-* Introduce a diagnostic which is reported when a `main` function's first
-  parameter is not a supertype of `List<String>`.
-* Introduce a diagnostic which is reported when an `// ignore` comment contains
-  an error code which is not being reported.
-* Introduce a diagnostic which is reported when an `// ignore` comment contains
-  an error code which cannot be ignored.
-* Introduce a diagnostic which is reported when an `// ignore` comment contains
-  an error code which is already being ignored.
-* Report diagnostics when using
-  [`@visibleForTesting`](https://pub.dev/documentation/meta/latest/meta/visibleForTesting-constant.html)
-  on top-level variables.
-* Fix false positive reports of "unused element" for top-level setters and
-  getters.
-* Fix false positive reports regarding `@deprecated` field formal parameters at
-  their declaration.
-* For null safety, introduce a diagnostic which reports when a null-check will
-  always fail.
-* Fix false positive reports regarding optional parameters on privat
-  constructors being unused.
-* Introduce a diagnostic which is reported when a constructor includes
-  duplicate field formal parameters.
-* Improve the "unused import" diagnostic when multiple import directives share
-  a common prefix.
-* Fix false positive "unused import" diagnostic regarding an import which
-  provides an extension method which is used.
-* For null safety, improve the messaging of "use of nullable value" diagnostics
-  for eight different contexts.
-* Fix false positive reports regarding `@visibleForTesting` members in a "hide"
-  combinator of an import or export directive.
-* Improve the messaging of "invalid override" diagnostics.
-* Introduce a diagnostic which is reported when `Future<T>.catchError` is
-  called with an `onError` callback which does not return `FutureOr<T>`.
+*   Remove the `--use-fasta-parser`, `--preview-dart-2`, and
+    `--enable-assert-initializers` command line options. These options haven't
+    been supported in a while and were no-ops.
+
+*   Report diagnostics regarding the
+    [`@internal`](https://pub.dev/documentation/meta/latest/meta/internal-constant.html)
+    annotation.
+
+*   Improve diagnostic-reporting regarding the
+    [`@doNotStore`](https://pub.dev/documentation/meta/latest/meta/doNotStore-constant.html)
+    annotation.
+
+*   Introduce a diagnostic which is reported when a library member named `main`
+    is not a function.
+
+*   Introduce a diagnostic which is reported when a `main` function's first
+    parameter is not a supertype of `List<String>`.
+
+*   Introduce diagnostics for when an `// ignore` comment contains an error code
+    which is not being reported, cannot be ignored, or is already being ignored.
+
+*   Report diagnostics when using
+    [`@visibleForTesting`](https://pub.dev/documentation/meta/latest/meta/
+    visibleForTesting-constant.html) on top-level variables.
+
+*   Fix false positive reports of "unused element" for top-level setters and
+    getters.
+
+*   Fix false positive reports regarding `@deprecated` field formal parameters
+    at their declaration.
+
+*   For null safety, introduce a diagnostic which reports when a null-check will
+    always fail.
+
+*   Fix false positive reports regarding optional parameters on private
+    constructors being unused.
+
+*   Introduce a diagnostic which is reported when a constructor includes
+    duplicate field formal parameters.
+
+*   Improve the "unused import" diagnostic when multiple import directives share
+    a common prefix.
+
+*   Fix false positive "unused import" diagnostic regarding an import which
+    provides an extension method which is used.
+
+*   For null safety, improve the messaging of "use of nullable value"
+    diagnostics for eight different contexts.
+
+*   Fix false positive reports regarding `@visibleForTesting` members in a
+    "hide" combinator of an import or export directive.
+
+*   Improve the messaging of "invalid override" diagnostics.
+
+*   Introduce a diagnostic which is reported when `Future<T>.catchError` is
+    called with an `onError` callback which does not return `FutureOr<T>`.
 
 #### dartfmt
 
-* Don't duplicate comments on chained if elements.
-* Preserve `?` in initializing formal function-typed parameters.
+*   Don't duplicate comments on chained if elements.
+
+*   Preserve `?` in initializing formal function-typed parameters.
+
+*   Fix performance issue with constructors that have no initializer list.
 
 #### Linter
 
 Updated the Linter to `0.1.129`, which includes:
 
-* New lint: `avoid_dynamic_calls`.
-* (Internal): `avoid_type_to_string` updated to use `addArgumentList` registry API.
-* Miscellaneous documentation improvements.
-* Fixed crash in `prefer_collection_literals` when there is no static parameter
-  element.
-* Fixed false negatives for `prefer_collection_literals` when a LinkedHashSet or
-  LinkedHashMap instantiation is passed as the argument to a function in any
-  position other than the first.
-* Fixed false negatives for `prefer_collection_literals` when a LinkedHashSet or
-  LinkedHashMap instantiation is used in a place with a static type other than
-  Set or Map.
-* (Internal): test updates to the new `PhysicalResourceProvider` API.
-* Fixed false positives in `prefer_constructors_over_static_methods`.
-* Updates to `package_names` to allow leading underscores.
-* Fixed NPEs in `unnecessary_null_checks`.
-* A fixed NPE in `missing_whitespace_between_adjacent_strings`.
-* Updates to `void_checks` for NNBD.
-* A fixed range error in `unnecessary_string_escapes`.
-* A fixed false positives in `unnecessary_null_types`.
-* Fixes to `prefer_constructors_over_static_methods` to respect type parameters.
-* Updates to `always_require_non_null_named_parameters` to be NNBD-aware.
-* Updates tp `unnecessary_nullable_for_final_variable_declarations` to allow dynamic.
-* Updates `overridden_fields` to not report on abstract parent fields.
-* Fixes to `unrelated_type_equality_checks` for NNBD.
-* Improvements to `type_init_formals`to allow types not equal to the field type.
-* Performance improvements to `always_use_package_imports`,
-  `avoid_renaming_method_parameters`, `prefer_relative_imports` and
-  `public_member_api_docs`.
-* (internal): updates to analyzer `0.40.4` APIs
-* New lint: `cast_nullable_to_non_nullable`.
-* New lint: `null_check_on_nullable_type_parameter`.
-* New lint: `tighten_type_of_initializing_formals`.
-* Updates to `public_member_apis` to check generic type aliases.
-* (Internal): updates to adopt new analyzer APIs.
-* Fixed `close_sinks` to handle `this`-prefixed property accesses.
-* New lint: `unnecessary_null_checks`.
-* Fixed `unawaited_futures` to handle `Future` subtypes.
-* New lint: `avoid_type_to_string`.
+*   New lints: `avoid_dynamic_calls`, `cast_nullable_to_non_nullable`,
+    `null_check_on_nullable_type_parameter`,
+    `tighten_type_of_initializing_formals`, `unnecessary_null_checks`, and
+    `avoid_type_to_string`.
+
+*   Fix crash in `prefer_collection_literals` when there is no static parameter
+    element.
+
+*   Fix false negatives for `prefer_collection_literals` when a LinkedHashSet or
+    LinkedHashMap instantiation is passed as the argument to a function in any
+    position other than the first.
+
+*   Fix false negatives for `prefer_collection_literals` when a LinkedHashSet or
+    LinkedHashMap instantiation is used in a place with a static type other than
+    Set or Map.
+
+*   Update to `package_names` to allow leading underscores.
+
+*   Fix crashes in `unnecessary_null_checks` and
+    `missing_whitespace_between_adjacent_strings`.
+
+*   Update to `void_checks` for null safety.
+
+*   Fix range error in `unnecessary_string_escapes`.
+
+*   Fix false positives in `unnecessary_null_types`.
+
+*   Fix to `prefer_constructors_over_static_methods` to respect type
+    parameters.
+
+*   Update to `always_require_non_null_named_parameters` to be null safety-aware.
+
+*   Update to `unnecessary_nullable_for_final_variable_declarations` to allow
+    dynamic.
+
+*   Update `overridden_fields` to not report on abstract parent fields.
+
+*   Fix to `unrelated_type_equality_checks` for null safety.
+
+*   Improvements to `type_init_formals`to allow types not equal to the field
+    type.
+
+*   Updates to `public_member_apis` to check generic type aliases.
+
+*   Fix `close_sinks` to handle `this`-prefixed property accesses.
+
+*   Fix `unawaited_futures` to handle `Future` subtypes.
+
+*   Performance improvements to `always_use_package_imports`,
+    `avoid_renaming_method_parameters`, `prefer_relative_imports` and
+    `public_member_api_docs`.
 
 #### Pub
 
-* **Breaking**: The Dart SDK constraint is now **required** in `pubspec.yaml`.
+*   **Breaking**: The Dart SDK constraint is now **required** in `pubspec.yaml`.
+    You must include a section like:
 
-  You now have to include a section like:
+    ```yaml
+    environment:
+      sdk: '>=2.10.0 <3.0.0'
+    ```
 
-  ```yaml
-  environment:
-    sdk: '>=2.10.0 <3.0.0'
-  ```
+    See [#44072][].
 
-  See [#44072][].
+    For legacy dependencies without an SDK constraint, pub will now assume a
+    default language version of 2.7.
 
-  For legacy dependencies without an sdk constraint pub will now assume a
-  default language version of 2.7.
-* The top level `pub` executable has been deprecated. Use `dart pub` instead.
-  See [dart tool][].
-* New command `dart pub add` that adds  new dependencies to your `pubspec.yaml`.
+*   The top level `pub` executable has been deprecated. Use `dart pub` instead.
+    See [dart tool][].
 
-  And a corresponding `dart pub remove` that removes dependencies.
-* New option `dart pub upgrade --major-versions` will update constraints in
-  your `pubspec.yaml` to match the the _resolvable_ column reported in
-  `dart pub outdated`. This allows users to easily upgrade to latest version for
-  all dependencies where this is possible, even if such upgrade requires an
-  update to the version constraint in `pubspec.yaml`.
+*   New command `dart pub add` that adds new dependencies to your
+    `pubspec.yaml`, and a corresponding `dart pub remove` that removes
+    dependencies.
 
-  It is also possible to only upgrade the major version for a subset of your
-  dependencies using `dart pub upgrade --major-versions <dependencies...>`.
-* New option `dart pub upgrade --null-safety` will attempt to update constraints
-  in your `pubspec.yaml`, such that only null-safety migrated versions of
-  dependencies are allowed.
-* New option `dart pub outdated --mode=null-safety` that will analyze your
-  dependencies for null-safety.
-* `dart pub get` and `dart pub upgrade` will highlight dependencies that have
-  been [discontinued](https://dart.dev/tools/pub/publishing#discontinue) on
-  pub.dev.
-* `dart pub publish` will now check your pubspec keys for likely typos.
-* `dart pub upgrade package_foo` will fetch dependencies, but ignore the
-  `pubspec.lock` for `package_foo`, allowing users to only upgrade a subset of
-  dependencies.
-* New command `dart pub login` that logs in to pub.dev.
-* The `--server` option to `dart pub publish` and `dart pub uploader` have been
-  deprecated. Use `publish_to` in your `pubspec.yaml` or set the
-  `$PUB_HOSTED_URL` environment variable.
-* `pub global activate` no longer re-precompiles if current global installed was
-   same version.
-* The Flutter SDK constraint upper bound is now ignored in pubspecs and
-  deprecated when publishing.
+*   New option `dart pub upgrade --major-versions` will update constraints in
+    your `pubspec.yaml` to match the the _resolvable_ column reported in `dart
+    pub outdated`. This allows users to easily upgrade to latest version for all
+    dependencies where this is possible, even if such upgrade requires an update
+    to the version constraint in `pubspec.yaml`.
 
-  See: [flutter-upper-bound-deprecation][].
+    It is also possible to only upgrade the major version for a subset of your
+    dependencies using `dart pub upgrade --major-versions <dependencies...>`.
+
+*   New option `dart pub upgrade --null-safety` will attempt to update constraints
+    in your `pubspec.yaml`, such that only null-safety migrated versions of
+    dependencies are allowed.
+
+*   New option `dart pub outdated --mode=null-safety` that will analyze your
+    dependencies for null-safety.
+
+*   `dart pub get` and `dart pub upgrade` will highlight dependencies that have
+    been [discontinued](https://dart.dev/tools/pub/publishing#discontinue) on
+    pub.dev.
+
+*   `dart pub publish` will now check your pubspec keys for likely typos.
+
+*   `dart pub upgrade package_foo` fetchs dependencies but ignores the
+    `pubspec.lock` for `package_foo`, allowing users to only upgrade a subset of
+    dependencies.
+
+*   New command `dart pub login` that logs in to pub.dev.
+
+*   The `--server` option to `dart pub publish` and `dart pub uploader` are
+    deprecated. Use `publish_to` in your `pubspec.yaml` or set the
+    `$PUB_HOSTED_URL` environment variable.
+
+*   `pub global activate` no longer re-precompiles if the current global
+    installation was same version.
+
+*   The Flutter SDK constraint upper bound is now ignored in pubspecs and
+    deprecated when publishing. See: [flutter-upper-bound-deprecation][].
 
 [flutter-upper-bound-deprecation]: https://dart.dev/go/flutter-upper-bound-deprecation
 [#44072]: https://github.com/dart-lang/sdk/issues/44072
@@ -621,7 +674,7 @@
 *   **Breaking change** [#40681][]: The `runZoned()` function is split into two
     functions: `runZoned()` and `runZonedGuarded()`, where the latter has a
     required `onError` parameter, and the former has none. This prepares the
-    functions for Null Safety where the two functions will differ in the
+    functions for null safety where the two functions will differ in the
     nullability of their return types.
 
 *   **Breaking change** [#40683][]: Errors passed to
diff --git a/DEPS b/DEPS
index 6b65a53..8da1d43 100644
--- a/DEPS
+++ b/DEPS
@@ -68,13 +68,13 @@
   "gperftools_revision": "180bfa10d7cb38e8b3784d60943d50e8fcef0dcb",
 
   # Revisions of /third_party/* dependencies.
-  "args_rev": "5f5082b7fcc41595d95d7ba002e8f51f352b3b4f",
+  "args_rev": "eb2deca5b4489709acd001a5c7fd2df4f1eed19d",
   "async_rev": "376d418b1b535030fbe3369938d2ffdbb0340a77",
   "bazel_worker_rev": "060c55a933d39798681a4f533b161b81dc48d77e",
   "benchmark_harness_rev": "c546dbd9f639f75cd2f75de8df2eb9f8ea15e8e7",
   "boolean_selector_rev": "665e6921ab246569420376f827bff4585dff0b14",
-  "boringssl_gen_rev": "aaac86738c4f2d1bdf00f54d197f50f247ffee04",
-  "boringssl_rev" : "4dfd5af70191b068aebe567b8e29ce108cee85ce",
+  "boringssl_gen_rev": "7322fc15cc065d8d2957fccce6b62a509dc4d641",
+  "boringssl_rev" : "1607f54fed72c6589d560254626909a64124f091",
   "browser-compat-data_tag": "v1.0.22",
   "charcode_rev": "bcd8a12c315b7a83390e4865ad847ecd9344cba2",
   "chrome_rev" : "19997",
@@ -144,7 +144,7 @@
   "shelf_packages_handler_tag": "2.0.0",
   "shelf_proxy_tag": "0.1.0+7",
   "shelf_rev": "fa5afaa38bd51dedeeaa25b7bfd8822cabbcc57f",
-  "shelf_web_socket_rev": "bf8554ff80089bf88de262503f85dc3610d79ecf",
+  "shelf_web_socket_rev": "dedd6040d45159bd0661eb5252c7e936d6b7514a",
   "source_map_stack_trace_rev": "1c3026f69d9771acf2f8c176a1ab750463309cce",
   "source_maps-0.9.4_rev": "38524",
   "source_maps_rev": "53eb92ccfe6e64924054f83038a534b959b12b3e",
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
index bb921ee..3f89245 100644
--- a/pkg/analysis_server/lib/src/analysis_server.dart
+++ b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -644,7 +644,12 @@
   @override
   nd.AnalysisDriver addAnalysisDriver(Folder folder, ContextRoot contextRoot) {
     var builder = createContextBuilder(folder);
-    var analysisDriver = builder.buildDriver(contextRoot);
+    var workspace = ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      options: builder.builderOptions,
+      rootPath: folder.path,
+    );
+    var analysisDriver = builder.buildDriver(contextRoot, workspace);
     analysisDriver.results.listen((result) {
       var notificationManager = analysisServer.notificationManager;
       var path = result.path;
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 0b408fb..fbca822 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -1105,7 +1105,13 @@
   /// given [folder].
   SourceFactory _createSourceFactory(Folder folder) {
     var builder = callbacks.createContextBuilder(folder);
-    return builder.createSourceFactory(folder.path);
+    var workspace = ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      options: builder.builderOptions,
+      rootPath: folder.path,
+      lookForBazelBuildFileSubstitutes: false,
+    );
+    return builder.createSourceFactory(folder.path, workspace);
   }
 
   /// Clean up and destroy the context associated with the given folder.
@@ -1523,14 +1529,20 @@
     var driver = info.analysisDriver;
     var contextRoot = info.folder.path;
     var builder = callbacks.createContextBuilder(info.folder);
-    var options = builder.getAnalysisOptions(contextRoot,
+    var workspace = ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      options: builder.builderOptions,
+      rootPath: contextRoot,
+      lookForBazelBuildFileSubstitutes: false,
+    );
+    var options = builder.getAnalysisOptions(contextRoot, workspace,
         contextRoot: driver.contextRoot);
     var packages = ContextBuilder.createPackageMap(
       resourceProvider: builder.resourceProvider,
       options: builder.builderOptions,
       rootPath: contextRoot,
     );
-    var factory = builder.createSourceFactory(contextRoot);
+    var factory = builder.createSourceFactory(contextRoot, workspace);
     driver.configure(
       analysisOptions: options,
       packages: packages,
@@ -1554,7 +1566,7 @@
   /// Does nothing if the [driver] is not in a Bazel workspace.
   void _watchBazelFilesIfNeeded(Folder folder, AnalysisDriver analysisDriver) {
     if (!experimentalEnableBazelWatching) return;
-    var workspace = analysisDriver.analysisContext.workspace;
+    var workspace = analysisDriver.analysisContext.contextRoot.workspace;
     if (workspace is BazelWorkspace &&
         !bazelSubscriptions.containsKey(folder)) {
       var subscription = workspace.bazelCandidateFiles.listen(
diff --git a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
index 0adfd67..cc0212f 100644
--- a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
+++ b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
@@ -782,7 +782,12 @@
   @override
   nd.AnalysisDriver addAnalysisDriver(Folder folder, ContextRoot contextRoot) {
     var builder = createContextBuilder(folder);
-    var analysisDriver = builder.buildDriver(contextRoot);
+    var workspace = ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      options: builder.builderOptions,
+      rootPath: folder.path,
+    );
+    var analysisDriver = builder.buildDriver(contextRoot, workspace);
     final textDocumentCapabilities =
         analysisServer.clientCapabilities?.textDocument;
     final supportedDiagnosticTags = HashSet<DiagnosticTag>.of(
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart
index 4e397d4..aa2739b 100644
--- a/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart
+++ b/pkg/analysis_server/lib/src/services/correction/dart/create_constructor.dart
@@ -110,7 +110,7 @@
     // prepare target ClassDeclaration
     var targetElement = constructorElement.enclosingElement;
     var targetResult = await sessionHelper.getElementDeclaration(targetElement);
-    var targetNode = targetResult.node;
+    var targetNode = targetResult?.node;
     if (targetNode is! ClassDeclaration) {
       return;
     }
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart
index 6a765b1..23ad911 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/data_driven/transform_set_manager.dart
@@ -23,7 +23,7 @@
   List<TransformSet> forLibrary(LibraryElement library) {
     var transformSets = <TransformSet>[];
     var analysisContext = library.session.analysisContext;
-    var workspace = analysisContext.workspace;
+    var workspace = analysisContext.contextRoot.workspace;
     var libraryPath = library.source.fullName;
     var package = workspace.findPackageFor(libraryPath);
     if (package == null) {
diff --git a/pkg/analysis_server/test/context_manager_test.dart b/pkg/analysis_server/test/context_manager_test.dart
index 186c249..7acd0c6 100644
--- a/pkg/analysis_server/test/context_manager_test.dart
+++ b/pkg/analysis_server/test/context_manager_test.dart
@@ -2285,7 +2285,12 @@
     builder.byteStore = MemoryByteStore();
     builder.performanceLog = logger;
     builder.fileContentOverlay = FileContentOverlay();
-    currentDriver = builder.buildDriver(contextRoot);
+    var workspace = ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      options: builder.builderOptions,
+      rootPath: path,
+    );
+    currentDriver = builder.buildDriver(contextRoot, workspace);
 
     driverMap[path] = currentDriver;
     currentDriver.exceptions.listen((ExceptionResult result) {
diff --git a/pkg/analysis_server/test/src/services/correction/assist/replace_conditional_with_if_else_test.dart b/pkg/analysis_server/test/src/services/correction/assist/replace_conditional_with_if_else_test.dart
index 1e81306..fa8f8ff 100644
--- a/pkg/analysis_server/test/src/services/correction/assist/replace_conditional_with_if_else_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/assist/replace_conditional_with_if_else_test.dart
@@ -100,4 +100,24 @@
 }
 ''');
   }
+
+  @FailingTest(issue: 'https://github.com/dart-lang/sdk/issues/45030')
+  Future<void> test_variableDeclaration_nullSafe() async {
+    writeTestPackageConfig(languageVersion: '2.12.0');
+    await resolveTestCode('''
+main() {
+  var a = true ? 111 : 222;
+}
+''');
+    await assertHasAssistAt('11 :', '''
+main() {
+  late int a;
+  if (true) {
+    a = 111;
+  } else {
+    a = 222;
+  }
+}
+''');
+  }
 }
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_constructor_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_constructor_test.dart
index b4a31d8..233fa51 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_constructor_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_constructor_test.dart
@@ -80,6 +80,19 @@
 ''', target: a);
   }
 
+  Future<void> test_inPart_partOfName_noLibrary() async {
+    await resolveTestCode('''
+part of my_lib;
+
+class A {}
+
+void f() {
+  A(0);
+}
+''');
+    await assertNoFix();
+  }
+
   Future<void> test_insteadOfSyntheticDefault() async {
     await resolveTestCode('''
 class A {
diff --git a/pkg/analyzer/CHANGELOG.md b/pkg/analyzer/CHANGELOG.md
index 9a7f74d..1ece128 100644
--- a/pkg/analyzer/CHANGELOG.md
+++ b/pkg/analyzer/CHANGELOG.md
@@ -5,6 +5,7 @@
 * Added `Resource.parent2` and deprecated `Resource.parent`.
 * Added `Folder.isRoot`.
 * Added `FolderExtension` with `withAncestors`.
+* Added `ContextRoot.workspace`, deprecated `AnalysisContext.workspace`.
 
 ## 1.0.0
 * Stable null safety release.
diff --git a/pkg/analyzer/lib/dart/analysis/analysis_context.dart b/pkg/analyzer/lib/dart/analysis/analysis_context.dart
index 984ffaa..124fe2d 100644
--- a/pkg/analyzer/lib/dart/analysis/analysis_context.dart
+++ b/pkg/analyzer/lib/dart/analysis/analysis_context.dart
@@ -33,5 +33,6 @@
   Folder? get sdkRoot;
 
   /// Return the workspace for containing the context root.
+  @Deprecated('Use contextRoot.workspace instead')
   Workspace get workspace;
 }
diff --git a/pkg/analyzer/lib/dart/analysis/context_root.dart b/pkg/analyzer/lib/dart/analysis/context_root.dart
index 9767602..fc6862b 100644
--- a/pkg/analyzer/lib/dart/analysis/context_root.dart
+++ b/pkg/analyzer/lib/dart/analysis/context_root.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/workspace/workspace.dart';
 
 /// Information about the root directory associated with an analysis context.
 ///
@@ -43,6 +44,9 @@
   /// The root directory containing the files to be analyzed.
   Folder get root;
 
+  /// Return the workspace that contains this context root.
+  Workspace get workspace;
+
   /// Return the absolute, normalized paths of all of the files that are
   /// contained in this context. These are all of the files that are included
   /// directly or indirectly by one or more of the [includedPaths] and that are
diff --git a/pkg/analyzer/lib/src/context/builder.dart b/pkg/analyzer/lib/src/context/builder.dart
index d879615..8e3378d 100644
--- a/pkg/analyzer/lib/src/context/builder.dart
+++ b/pkg/analyzer/lib/src/context/builder.dart
@@ -5,7 +5,6 @@
 import 'dart:collection';
 import 'dart:core';
 
-import 'package:analyzer/dart/analysis/context_locator.dart' as api;
 import 'package:analyzer/dart/analysis/declared_variables.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
@@ -14,6 +13,7 @@
 import 'package:analyzer/src/context/context_root.dart';
 import 'package:analyzer/src/context/packages.dart';
 import 'package:analyzer/src/dart/analysis/byte_store.dart';
+import 'package:analyzer/src/dart/analysis/context_locator.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart'
     show AnalysisDriver, AnalysisDriverScheduler;
 import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart'
@@ -110,9 +110,10 @@
 
   /// Return an analysis driver that is configured correctly to analyze code in
   /// the directory with the given [path].
-  AnalysisDriver buildDriver(ContextRoot contextRoot) {
+  AnalysisDriver buildDriver(ContextRoot contextRoot, Workspace workspace) {
     String path = contextRoot.root;
-    var options = getAnalysisOptions(path, contextRoot: contextRoot);
+
+    var options = getAnalysisOptions(path, workspace, contextRoot: contextRoot);
     //_processAnalysisOptions(context, optionMap);
 
     SummaryDataStore? summaryData;
@@ -121,12 +122,6 @@
       summaryData = SummaryDataStore(librarySummaryPaths);
     }
 
-    Workspace workspace = ContextBuilder.createWorkspace(
-      resourceProvider: resourceProvider,
-      options: builderOptions,
-      rootPath: path,
-      lookForBazelBuildFileSubstitutes: lookForBazelBuildFileSubstitutes,
-    );
     final sf =
         createSourceFactoryFromWorkspace(workspace, summaryData: summaryData);
 
@@ -150,18 +145,18 @@
     );
 
     // Set API AnalysisContext for the driver.
-    var apiContextRoots = api.ContextLocator(
+    var apiContextRoots = ContextLocatorImpl(
       resourceProvider: resourceProvider,
     ).locateRoots(
       includedPaths: [contextRoot.root],
       excludedPaths: contextRoot.exclude,
+      overrideWorkspace: workspace,
     );
     driver.configure(
       analysisContext: api.DriverBasedAnalysisContext(
         resourceProvider,
         apiContextRoots.first,
         driver,
-        workspace: workspace,
       ),
     );
 
@@ -206,13 +201,8 @@
 //    }
 //  }
 
-  SourceFactory createSourceFactory(String rootPath,
+  SourceFactory createSourceFactory(String rootPath, Workspace workspace,
       {SummaryDataStore? summaryData}) {
-    Workspace workspace = ContextBuilder.createWorkspace(
-      resourceProvider: resourceProvider,
-      options: builderOptions,
-      rootPath: rootPath,
-    );
     DartSdk sdk = findSdk(workspace);
     if (summaryData != null && sdk is SummaryBasedDartSdk) {
       summaryData.addBundle(null, sdk.bundle);
@@ -288,7 +278,7 @@
   /// Return the analysis options that should be used to analyze code in the
   /// directory with the given [path]. Use [verbosePrint] to echo verbose
   /// information about the analysis options selection process.
-  AnalysisOptionsImpl getAnalysisOptions(String path,
+  AnalysisOptionsImpl getAnalysisOptions(String path, Workspace workspace,
       {void Function(String text)? verbosePrint, ContextRoot? contextRoot}) {
     void verbose(String text) {
       if (verbosePrint != null) {
@@ -296,13 +286,6 @@
       }
     }
 
-    // TODO(danrubel) restructure so that we don't create a workspace
-    // both here and in createSourceFactory
-    Workspace workspace = ContextBuilder.createWorkspace(
-      resourceProvider: resourceProvider,
-      options: builderOptions,
-      rootPath: path,
-    );
     SourceFactory sourceFactory = workspace.createSourceFactory(null, null);
     AnalysisOptionsProvider optionsProvider =
         AnalysisOptionsProvider(sourceFactory);
@@ -420,13 +403,19 @@
     }
   }
 
+  /// If [packages] is provided, it will be used for the [Workspace],
+  /// otherwise the packages file from [options] will be used, or discovered
+  /// from [rootPath].
+  ///
+  /// TODO(scheglov) Make [packages] required, remove [options] and discovery.
   static Workspace createWorkspace({
     required ResourceProvider resourceProvider,
     required ContextBuilderOptions options,
+    Packages? packages,
     required String rootPath,
     bool lookForBazelBuildFileSubstitutes = true,
   }) {
-    var packages = ContextBuilder.createPackageMap(
+    packages ??= ContextBuilder.createPackageMap(
       resourceProvider: resourceProvider,
       options: options,
       rootPath: rootPath,
diff --git a/pkg/analyzer/lib/src/dart/analysis/context_builder.dart b/pkg/analyzer/lib/src/dart/analysis/context_builder.dart
index cf3c196..1af6e4f 100644
--- a/pkg/analyzer/lib/src/dart/analysis/context_builder.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/context_builder.dart
@@ -90,7 +90,8 @@
     old.ContextRoot oldContextRoot = old.ContextRoot(
         contextRoot.root.path, contextRoot.excludedPaths.toList(),
         pathContext: resourceProvider.pathContext);
-    AnalysisDriver driver = builder.buildDriver(oldContextRoot);
+    AnalysisDriver driver =
+        builder.buildDriver(oldContextRoot, contextRoot.workspace);
 
     // AnalysisDriver reports results into streams.
     // We need to drain these streams to avoid memory leak.
diff --git a/pkg/analyzer/lib/src/dart/analysis/context_locator.dart b/pkg/analyzer/lib/src/dart/analysis/context_locator.dart
index 0b2ec17..b05e502 100644
--- a/pkg/analyzer/lib/src/dart/analysis/context_locator.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/context_locator.dart
@@ -9,9 +9,14 @@
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart'
     show PhysicalResourceProvider;
+import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
+import 'package:analyzer/src/context/builder.dart' as old;
+import 'package:analyzer/src/context/builder.dart';
+import 'package:analyzer/src/context/packages.dart';
 import 'package:analyzer/src/dart/analysis/context_root.dart';
 import 'package:analyzer/src/task/options.dart';
 import 'package:analyzer/src/util/yaml.dart';
+import 'package:analyzer/src/workspace/workspace.dart';
 import 'package:glob/glob.dart';
 import 'package:path/path.dart';
 import 'package:yaml/yaml.dart';
@@ -40,12 +45,15 @@
       : resourceProvider =
             resourceProvider ?? PhysicalResourceProvider.INSTANCE;
 
+  /// TODO(scheglov) Remove [overrideWorkspace] when DAS uses collection.
   @override
-  List<ContextRoot> locateRoots(
-      {required List<String> includedPaths,
-      List<String>? excludedPaths,
-      String? optionsFile,
-      String? packagesFile}) {
+  List<ContextRoot> locateRoots({
+    required List<String> includedPaths,
+    List<String>? excludedPaths,
+    String? optionsFile,
+    String? packagesFile,
+    Workspace? overrideWorkspace,
+  }) {
     //
     // Compute the list of folders and files that are to be included.
     //
@@ -95,8 +103,11 @@
     }
     List<ContextRoot> roots = <ContextRoot>[];
     for (Folder folder in includedFolders) {
-      ContextRootImpl root = ContextRootImpl(resourceProvider, folder);
-      root.packagesFile = defaultPackagesFile ?? _findPackagesFile(folder);
+      var rootPackagesFile = defaultPackagesFile ?? _findPackagesFile(folder);
+      var workspace =
+          overrideWorkspace ?? _createWorkspace(folder, rootPackagesFile);
+      var root = ContextRootImpl(resourceProvider, folder, workspace);
+      root.packagesFile = rootPackagesFile;
       root.optionsFile = defaultOptionsFile ?? _findOptionsFile(folder);
       root.included.add(folder);
       root.excludedGlobs = _getExcludedGlobs(root);
@@ -108,8 +119,10 @@
     for (File file in includedFiles) {
       Folder parent = file.parent2;
       ContextRoot root = rootMap.putIfAbsent(parent, () {
-        ContextRootImpl root = ContextRootImpl(resourceProvider, parent);
-        root.packagesFile = defaultPackagesFile ?? _findPackagesFile(parent);
+        var rootPackagesFile = defaultPackagesFile ?? _findPackagesFile(parent);
+        var workspace = _createWorkspace(parent, rootPackagesFile);
+        var root = ContextRootImpl(resourceProvider, parent, workspace);
+        root.packagesFile = rootPackagesFile;
         root.optionsFile = defaultOptionsFile ?? _findOptionsFile(parent);
         roots.add(root);
         return root;
@@ -167,8 +180,10 @@
       if (packagesFile != null) {
         localPackagesFile = packagesFile;
       }
-      ContextRootImpl root = ContextRootImpl(resourceProvider, folder);
-      root.packagesFile = localPackagesFile ?? containingRoot.packagesFile;
+      var rootPackagesFile = localPackagesFile ?? containingRoot.packagesFile;
+      var workspace = _createWorkspace(folder, rootPackagesFile);
+      var root = ContextRootImpl(resourceProvider, folder, workspace);
+      root.packagesFile = rootPackagesFile;
       root.optionsFile = localOptionsFile ?? containingRoot.optionsFile;
       root.included.add(folder);
       containingRoot.excluded.add(folder);
@@ -229,6 +244,22 @@
     }
   }
 
+  Workspace _createWorkspace(Folder folder, File? packagesFile) {
+    Packages packages;
+    if (packagesFile != null) {
+      packages = parsePackagesFile(resourceProvider, packagesFile);
+    } else {
+      packages = Packages.empty;
+    }
+
+    return old.ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      packages: packages,
+      options: ContextBuilderOptions(), // TODO(scheglov) remove it
+      rootPath: folder.path,
+    );
+  }
+
   /// Return the analysis options file to be used to analyze files in the given
   /// [folder], or `null` if there is no analysis options file in the given
   /// folder or any parent folder.
@@ -262,9 +293,11 @@
     List<Glob> patterns = [];
     File? optionsFile = root.optionsFile;
     if (optionsFile != null) {
+      var doc = AnalysisOptionsProvider(
+              root.workspace.createSourceFactory(null, null))
+          .getOptionsFromFile(optionsFile);
+
       try {
-        String content = optionsFile.readAsStringSync();
-        YamlNode doc = loadYamlNode(content);
         if (doc is YamlMap) {
           var analyzerOptions = getValue(doc, AnalyzerOptions.analyzer);
           if (analyzerOptions is YamlMap) {
diff --git a/pkg/analyzer/lib/src/dart/analysis/context_root.dart b/pkg/analyzer/lib/src/dart/analysis/context_root.dart
index 6045b3b..583fd5b 100644
--- a/pkg/analyzer/lib/src/dart/analysis/context_root.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/context_root.dart
@@ -4,6 +4,7 @@
 
 import 'package:analyzer/dart/analysis/context_root.dart';
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/workspace/workspace.dart';
 import 'package:glob/glob.dart';
 import 'package:path/path.dart';
 
@@ -16,6 +17,9 @@
   final Folder root;
 
   @override
+  final Workspace workspace;
+
+  @override
   final List<Resource> included = [];
 
   @override
@@ -32,7 +36,7 @@
   File? packagesFile;
 
   /// Initialize a newly created context root.
-  ContextRootImpl(this.resourceProvider, this.root);
+  ContextRootImpl(this.resourceProvider, this.root, this.workspace);
 
   @override
   Iterable<String> get excludedPaths =>
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index a773417..b9e2a2d 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -1508,7 +1508,7 @@
       _resourceProvider,
       name,
       sourceFactory,
-      analysisContext?.workspace,
+      analysisContext?.contextRoot.workspace,
       analysisOptions,
       declaredVariables,
       _saltForUnlinked,
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart b/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart
index 05e4a4b..c1c288d 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver_based_analysis_context.dart
@@ -6,7 +6,6 @@
 import 'package:analyzer/dart/analysis/context_root.dart';
 import 'package:analyzer/dart/analysis/session.dart';
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart' show AnalysisDriver;
 import 'package:analyzer/src/dart/sdk/sdk.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisOptions;
@@ -23,16 +22,14 @@
   /// The driver on which this context is based.
   final AnalysisDriver driver;
 
-  /// The [Workspace] for this context, `null` if not yet created.
-  Workspace? _workspace;
-
   /// Initialize a newly created context that uses the given [resourceProvider]
   /// to access the file system and that is based on the given analysis
   /// [driver].
   DriverBasedAnalysisContext(
-      this.resourceProvider, this.contextRoot, this.driver,
-      {Workspace? workspace})
-      : _workspace = workspace {
+    this.resourceProvider,
+    this.contextRoot,
+    this.driver,
+  ) {
     driver.analysisContext = this;
   }
 
@@ -51,17 +48,9 @@
     return null;
   }
 
+  @Deprecated('Use contextRoot.workspace instead')
   @override
   Workspace get workspace {
-    return _workspace ??= _buildWorkspace();
-  }
-
-  Workspace _buildWorkspace() {
-    var path = contextRoot.root.path;
-    return ContextBuilder.createWorkspace(
-      resourceProvider: resourceProvider,
-      options: ContextBuilderOptions(),
-      rootPath: path,
-    );
+    return contextRoot.workspace;
   }
 }
diff --git a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
index 4a7f9eb..0193a85 100644
--- a/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
+++ b/pkg/analyzer/lib/src/dart/micro/analysis_context.dart
@@ -8,7 +8,6 @@
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/uri_converter.dart';
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/context/builder.dart';
 import 'package:analyzer/src/context/context.dart';
 import 'package:analyzer/src/dart/analysis/context_root.dart';
 import 'package:analyzer/src/dart/analysis/driver.dart';
@@ -27,7 +26,6 @@
   required SourceFactory sourceFactory,
   required ContextRootImpl root,
   required ResourceProvider resourceProvider,
-  required Workspace workspace,
 }) {
   var declaredVariables = DeclaredVariables();
   var synchronousSession = SynchronousSession(
@@ -52,7 +50,6 @@
     declaredVariables,
     sourceFactory,
     resourceProvider,
-    workspace: workspace,
   );
 
   analysisContext2.currentSession = analysisSession;
@@ -111,7 +108,6 @@
   final DeclaredVariables declaredVariables;
 
   final SourceFactory sourceFactory;
-  Workspace? _workspace;
 
   _MicroAnalysisContextImpl(
     this.fileResolver,
@@ -119,9 +115,8 @@
     this.contextRoot,
     this.declaredVariables,
     this.sourceFactory,
-    this.resourceProvider, {
-    Workspace? workspace,
-  }) : _workspace = workspace;
+    this.resourceProvider,
+  );
 
   @override
   AnalysisOptionsImpl get analysisOptions {
@@ -131,22 +126,14 @@
   @override
   Folder? get sdkRoot => null;
 
+  @Deprecated('Use contextRoot.workspace instead')
   @override
   Workspace get workspace {
-    return _workspace ??= _buildWorkspace();
+    return contextRoot.workspace;
   }
 
   @override
   dynamic noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
-
-  Workspace _buildWorkspace() {
-    var path = contextRoot.root.path;
-    return ContextBuilder.createWorkspace(
-      resourceProvider: resourceProvider,
-      options: ContextBuilderOptions(),
-      rootPath: path,
-    );
-  }
 }
 
 class _MicroAnalysisSessionImpl extends AnalysisSessionImpl {
diff --git a/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart b/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart
index a4e2455..dad5a81 100644
--- a/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart
+++ b/pkg/analyzer/lib/src/dart/micro/library_analyzer.dart
@@ -442,7 +442,8 @@
 
   WorkspacePackage? _getPackage(CompilationUnit unit) {
     final libraryPath = _library.source.fullName;
-    var workspace = unit.declaredElement!.session.analysisContext.workspace;
+    final session = unit.declaredElement!.session;
+    final workspace = session.analysisContext.contextRoot.workspace;
     return workspace.findPackageFor(libraryPath);
   }
 
diff --git a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
index 9655636..9e68e5b 100644
--- a/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
+++ b/pkg/analyzer/lib/src/dart/micro/resolve_file.dart
@@ -465,7 +465,7 @@
 
     if (contextObjects == null) {
       var rootFolder = resourceProvider.getFolder(workspace.root);
-      var root = ContextRootImpl(resourceProvider, rootFolder);
+      var root = ContextRootImpl(resourceProvider, rootFolder, workspace);
       root.included.add(rootFolder);
 
       contextObjects = createMicroContextObjects(
@@ -474,7 +474,6 @@
         sourceFactory: sourceFactory,
         root: root,
         resourceProvider: resourceProvider,
-        workspace: workspace,
       );
 
       libraryContext = _LibraryContext(
diff --git a/pkg/analyzer/lib/src/services/available_declarations.dart b/pkg/analyzer/lib/src/services/available_declarations.dart
index b2e9a99..c5ca546 100644
--- a/pkg/analyzer/lib/src/services/available_declarations.dart
+++ b/pkg/analyzer/lib/src/services/available_declarations.dart
@@ -209,7 +209,7 @@
     }
 
     var contextPathList = <String>[];
-    if (!_analysisContext.workspace.isBazel) {
+    if (!_analysisContext.contextRoot.workspace.isBazel) {
       _Package? package;
       for (var candidatePackage in _packages) {
         if (candidatePackage.contains(path)) {
diff --git a/pkg/analyzer/test/src/context/builder_test.dart b/pkg/analyzer/test/src/context/builder_test.dart
index baefdb9..071f9e2 100644
--- a/pkg/analyzer/test/src/context/builder_test.dart
+++ b/pkg/analyzer/test/src/context/builder_test.dart
@@ -110,7 +110,7 @@
     - mock_lint_rule
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -135,7 +135,7 @@
     - mock_lint_rule
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -160,7 +160,7 @@
     - mock_lint_rule
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -180,7 +180,7 @@
     newFile(filePath, content: '''
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -308,7 +308,7 @@
     newFolder('/workspace/bazel-genfiles');
     newFolder(projectPath);
 
-    var factory = builder.createSourceFactory(projectPath) as SourceFactoryImpl;
+    var factory = _createSourceFactory(projectPath);
     expect(factory.resolvers,
         contains(predicate((r) => r is BazelFileUriResolver)));
     expect(factory.resolvers,
@@ -323,7 +323,7 @@
     newFolder(projectPath);
     newFile(join(projectPath, '.packages'));
 
-    var factory = builder.createSourceFactory(projectPath) as SourceFactoryImpl;
+    var factory = _createSourceFactory(projectPath);
     expect(factory.resolvers,
         contains(predicate((r) => r is ResourceUriResolver)));
     expect(factory.resolvers,
@@ -352,7 +352,7 @@
 b:${resourceProvider.pathContext.toUri(packageB)}
 ''');
 
-    SourceFactory factory = builder.createSourceFactory(projectPath);
+    SourceFactory factory = _createSourceFactory(projectPath);
 
     var dartSource = factory.forUri('dart:async')!;
     expect(dartSource, isNotNull);
@@ -380,7 +380,7 @@
 b:${resourceProvider.pathContext.toUri(packageB)}
 ''');
 
-    SourceFactory factory = builder.createSourceFactory(projectPath);
+    SourceFactory factory = _createSourceFactory(projectPath);
 
     var dartSource = factory.forUri('dart:core')!;
     expect(dartSource, isNotNull);
@@ -506,7 +506,7 @@
   rules:
     - mock_lint_rule2
 ''');
-    var options = builder.getAnalysisOptions(convertPath('/root/some/path'));
+    var options = _getAnalysisOptions(builder, convertPath('/root/some/path'));
     _expectEqualOptions(options, expected);
   }
 
@@ -527,7 +527,7 @@
     - mock_lint_rule
 ''');
     String projectPath = convertPath('/some/directory/path');
-    var options = builder.getAnalysisOptions(projectPath);
+    var options = _getAnalysisOptions(builder, projectPath);
     _expectEqualOptions(options, expected);
   }
 
@@ -543,7 +543,7 @@
     - non_existent_lint_rule
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -561,7 +561,7 @@
     implicit-dynamic: false
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -579,7 +579,7 @@
     builder = ContextBuilder(resourceProvider, sdkManager, contentCache,
         options: builderOptions);
     AnalysisOptionsImpl expected = AnalysisOptionsImpl();
-    var options = builder.getAnalysisOptions(projectPath);
+    var options = _getAnalysisOptions(builder, projectPath);
     _expectEqualOptions(options, expected);
   }
 
@@ -617,7 +617,7 @@
     - mock_lint_rule
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -626,7 +626,7 @@
     String filePath = join(path, AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE);
     newFile(filePath, content: ';');
 
-    AnalysisOptions options = builder.getAnalysisOptions(path);
+    AnalysisOptions options = _getAnalysisOptions(builder, path);
     expect(options, isNotNull);
   }
 
@@ -639,7 +639,7 @@
     - non_existent_lint_rule
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, AnalysisOptionsImpl());
   }
 
@@ -654,7 +654,7 @@
     implicit-dynamic: false
 ''');
 
-    var options = builder.getAnalysisOptions(path);
+    var options = _getAnalysisOptions(builder, path);
     _expectEqualOptions(options, expected);
   }
 
@@ -669,7 +669,7 @@
 
     ContextRoot root =
         ContextRoot(path, [], pathContext: resourceProvider.pathContext);
-    builder.getAnalysisOptions(path, contextRoot: root);
+    _getAnalysisOptions(builder, path, contextRoot: root);
     expect(root.optionsFilePath, equals(filePath));
   }
 
@@ -680,13 +680,13 @@
   sdk: ^2.1.0
 ''');
 
-    var options = builder.getAnalysisOptions(projectPath);
+    var options = _getAnalysisOptions(builder, projectPath);
     expect(options.sdkVersionConstraint.toString(), '^2.1.0');
   }
 
   void test_getAnalysisOptions_sdkVersionConstraint_any_noOptionsFile() {
     var projectPath = convertPath('/test');
-    var options = builder.getAnalysisOptions(projectPath);
+    var options = _getAnalysisOptions(builder, projectPath);
     expect(options.sdkVersionConstraint, isNull);
   }
 
@@ -741,6 +741,16 @@
     );
   }
 
+  SourceFactoryImpl _createSourceFactory(String projectPath) {
+    Workspace workspace = ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      options: builderOptions,
+      rootPath: projectPath,
+    );
+    return builder.createSourceFactory(projectPath, workspace)
+        as SourceFactoryImpl;
+  }
+
   Workspace _createWorkspace(String posixPath) {
     return ContextBuilder.createWorkspace(
       resourceProvider: resourceProvider,
@@ -776,6 +786,17 @@
     expect(actual.strictRawTypes, expected.strictRawTypes);
   }
 
+  AnalysisOptionsImpl _getAnalysisOptions(ContextBuilder builder, String path,
+      {ContextRoot? contextRoot}) {
+    Workspace workspace = ContextBuilder.createWorkspace(
+      resourceProvider: resourceProvider,
+      options: builder.builderOptions,
+      rootPath: path,
+    );
+    return builder.getAnalysisOptions(path, workspace,
+        contextRoot: contextRoot);
+  }
+
   Uri _relativeUri(String path, {String? from}) {
     var pathContext = resourceProvider.pathContext;
     String relativePath = pathContext.relative(path, from: from);
diff --git a/pkg/analyzer/test/src/dart/analysis/context_builder_test.dart b/pkg/analyzer/test/src/dart/analysis/context_builder_test.dart
index bf798bc..776814b 100644
--- a/pkg/analyzer/test/src/dart/analysis/context_builder_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/context_builder_test.dart
@@ -10,6 +10,7 @@
 import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
 import 'package:analyzer/src/test_utilities/mock_sdk.dart';
 import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
+import 'package:analyzer/src/workspace/basic.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -36,7 +37,8 @@
   void setUp() {
     var folder = newFolder('/home/test');
     contextBuilder = ContextBuilderImpl(resourceProvider: resourceProvider);
-    contextRoot = ContextRootImpl(resourceProvider, folder);
+    var workspace = BasicWorkspace.find(resourceProvider, {}, folder.path);
+    contextRoot = ContextRootImpl(resourceProvider, folder, workspace);
   }
 
   test_createContext_declaredVariables() {
diff --git a/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart b/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart
index 75fd9e3..116c6f1 100644
--- a/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/context_locator_test.dart
@@ -571,6 +571,88 @@
     ]);
   }
 
+  void test_locateRoots_options_withExclude_wholeFolder_includedOptions() {
+    Folder rootFolder = newFolder('/test/root');
+    File optionsFile = newFile(
+        '/test/root/${ContextLocatorImpl.ANALYSIS_OPTIONS_NAME}',
+        content: '''
+include: has_excludes.yaml
+''');
+    newFile('/test/root/has_excludes.yaml', content: '''
+analyzer:
+  exclude:
+    - data/**
+''');
+
+    File packagesFile = newPackagesFile('/test/root');
+    Folder dataFolder = newFolder('/test/root/data');
+
+    List<ContextRoot> roots =
+        contextLocator.locateRoots(includedPaths: [rootFolder.path]);
+    expect(roots, hasLength(1));
+
+    ContextRoot root = findRoot(roots, rootFolder);
+    expect(root.includedPaths, unorderedEquals([rootFolder.path]));
+    expect(root.excludedPaths, unorderedEquals([dataFolder.path]));
+    expect(root.optionsFile, optionsFile);
+    expect(root.packagesFile, packagesFile);
+
+    _assertNotAnalyzed(root, [
+      '/test/root/data/f.dart',
+      '/test/root/data/foo/f.dart',
+    ]);
+
+    _assertAnalyzed(root, [
+      '/test/root/f.dart',
+    ]);
+  }
+
+  void test_locateRoots_options_withExclude_wholeFolder_includedOptionsMerge() {
+    Folder rootFolder = newFolder('/test/root');
+    File optionsFile = newFile(
+        '/test/root/${ContextLocatorImpl.ANALYSIS_OPTIONS_NAME}',
+        content: '''
+include: has_excludes.yaml
+analyzer:
+  exclude:
+    - bar/**
+''');
+    newFile('/test/root/has_excludes.yaml', content: '''
+analyzer:
+  exclude:
+    - foo/**
+''');
+
+    File packagesFile = newPackagesFile('/test/root');
+    Folder fooFolder = newFolder('/test/root/foo');
+    Folder barFolder = newFolder('/test/root/bar');
+
+    List<ContextRoot> roots =
+        contextLocator.locateRoots(includedPaths: [rootFolder.path]);
+    expect(roots, hasLength(1));
+
+    ContextRoot root = findRoot(roots, rootFolder);
+    expect(root.includedPaths, unorderedEquals([rootFolder.path]));
+    expect(
+      root.excludedPaths,
+      unorderedEquals([fooFolder.path, barFolder.path]),
+    );
+    expect(root.optionsFile, optionsFile);
+    expect(root.packagesFile, packagesFile);
+
+    _assertNotAnalyzed(root, [
+      '/test/root/foo/f.dart',
+      '/test/root/foo/aaa/f.dart',
+      '/test/root/bar/f.dart',
+      '/test/root/bar/aaa/f.dart',
+    ]);
+
+    _assertAnalyzed(root, [
+      '/test/root/f.dart',
+      '/test/root/baz/f.dart',
+    ]);
+  }
+
   void test_locateRoots_options_withExclude_wholeFolder_withItsOptions() {
     Folder rootFolder = newFolder('/test/root');
     File optionsFile = newOptionsFile('/test/root', content: '''
diff --git a/pkg/analyzer/test/src/dart/analysis/context_root_test.dart b/pkg/analyzer/test/src/dart/analysis/context_root_test.dart
index d640ddd..1094e08 100644
--- a/pkg/analyzer/test/src/dart/analysis/context_root_test.dart
+++ b/pkg/analyzer/test/src/dart/analysis/context_root_test.dart
@@ -5,6 +5,8 @@
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/dart/analysis/context_root.dart';
 import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
+import 'package:analyzer/src/workspace/basic.dart';
+import 'package:analyzer/src/workspace/workspace.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -18,12 +20,14 @@
 class ContextRootTest with ResourceProviderMixin {
   late final String rootPath;
   late final Folder rootFolder;
+  late Workspace workspace;
   late ContextRootImpl contextRoot;
 
   void setUp() {
     rootPath = convertPath('/test/root');
     rootFolder = newFolder(rootPath);
-    contextRoot = ContextRootImpl(resourceProvider, rootFolder);
+    workspace = BasicWorkspace.find(resourceProvider, {}, rootPath);
+    contextRoot = ContextRootImpl(resourceProvider, rootFolder, workspace);
     contextRoot.included.add(rootFolder);
   }
 
@@ -84,7 +88,7 @@
     String bPath = convertPath('/test/root/lib/b.dart');
     File aFile = getFile(aPath);
 
-    contextRoot = ContextRootImpl(resourceProvider, rootFolder);
+    contextRoot = ContextRootImpl(resourceProvider, rootFolder, workspace);
     contextRoot.included.add(aFile);
 
     expect(contextRoot.isAnalyzed(aPath), isTrue);
diff --git a/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart b/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart
index d42517f..350f2f6 100644
--- a/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart
+++ b/pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart
@@ -132,27 +132,27 @@
   bool get retainDataForTesting => false;
 
   void assertBasicWorkspaceFor(String path) {
-    var workspace = contextFor(path).workspace;
+    var workspace = contextFor(path).contextRoot.workspace;
     expect(workspace, TypeMatcher<BasicWorkspace>());
   }
 
   void assertBazelWorkspaceFor(String path) {
-    var workspace = contextFor(path).workspace;
+    var workspace = contextFor(path).contextRoot.workspace;
     expect(workspace, TypeMatcher<BazelWorkspace>());
   }
 
   void assertGnWorkspaceFor(String path) {
-    var workspace = contextFor(path).workspace;
+    var workspace = contextFor(path).contextRoot.workspace;
     expect(workspace, TypeMatcher<GnWorkspace>());
   }
 
   void assertPackageBuildWorkspaceFor(String path) {
-    var workspace = contextFor(path).workspace;
+    var workspace = contextFor(path).contextRoot.workspace;
     expect(workspace, TypeMatcher<PackageBuildWorkspace>());
   }
 
   void assertPubWorkspaceFor(String path) {
-    var workspace = contextFor(path).workspace;
+    var workspace = contextFor(path).contextRoot.workspace;
     expect(workspace, TypeMatcher<PubWorkspace>());
   }
 
diff --git a/pkg/analyzer_cli/lib/src/context_cache.dart b/pkg/analyzer_cli/lib/src/context_cache.dart
index ee33541..876239c 100644
--- a/pkg/analyzer_cli/lib/src/context_cache.dart
+++ b/pkg/analyzer_cli/lib/src/context_cache.dart
@@ -107,7 +107,13 @@
   /// This should not be used except behind the getter which caches this result
   /// automatically.
   AnalysisOptionsImpl _getAnalysisOptions() {
-    var contextOptions = builder.getAnalysisOptions(requestedSourceDirectory,
+    var workspace = ContextBuilder.createWorkspace(
+      resourceProvider: builder.resourceProvider,
+      options: builder.builderOptions,
+      rootPath: requestedSourceDirectory,
+    );
+    var contextOptions = builder.getAnalysisOptions(
+        requestedSourceDirectory, workspace,
         verbosePrint: clOptions.verbose ? verbosePrint : null);
 
     _buildContextFeatureSet(contextOptions);
diff --git a/pkg/compiler/lib/src/commandline_options.dart b/pkg/compiler/lib/src/commandline_options.dart
index c01275b..e0c45c8 100644
--- a/pkg/compiler/lib/src/commandline_options.dart
+++ b/pkg/compiler/lib/src/commandline_options.dart
@@ -18,6 +18,7 @@
   static const String disableTypeInference = '--disable-type-inference';
   static const String disableRtiOptimization = '--disable-rti-optimization';
   static const String dumpInfo = '--dump-info';
+  static const String dumpDeferredGraph = '--dump-deferred-graph';
   static const String dumpSsa = '--dump-ssa';
   static const String enableAssertMessage = '--assert-message';
   static const String enableCheckedMode = '--enable-checked-mode';
diff --git a/pkg/compiler/lib/src/deferred_load.dart b/pkg/compiler/lib/src/deferred_load.dart
index 829e2c5..5a41db4 100644
--- a/pkg/compiler/lib/src/deferred_load.dart
+++ b/pkg/compiler/lib/src/deferred_load.dart
@@ -10,6 +10,7 @@
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/type_environment.dart' as ir;
 
+import '../compiler_new.dart' show OutputType;
 import 'common/metrics.dart' show Metric, Metrics, CountMetric, DurationMetric;
 import 'common/tasks.dart' show CompilerTask;
 import 'common.dart';
@@ -69,10 +70,7 @@
     var imports = _imports.toList();
     var otherImports = other._imports.toList();
     for (var i = 0; i < size; i++) {
-      if (imports[i] == otherImports[i]) continue;
-      var a = imports[i].uri.path;
-      var b = otherImports[i].uri.path;
-      var cmp = a.compareTo(b);
+      var cmp = _compareImportEntities(imports[i], otherImports[i]);
       if (cmp != 0) return cmp;
     }
     // TODO(sigmund): make compare stable.  If we hit this point, all imported
@@ -861,9 +859,39 @@
     return _buildResult();
   }
 
+  // Dumps a graph as a list of strings of 0 and 1. There is one 'bit' for each
+  // import entity in the graph, and each string in the list represents an
+  // output unit.
+  void _dumpDeferredGraph() {
+    int id = 0;
+    Map<ImportEntity, int> importMap = {};
+    var entities = _deferredImportDescriptions.keys.toList();
+    entities.sort(_compareImportEntities);
+    for (var key in entities) {
+      importMap[key] = id++;
+    }
+    List<String> graph = [];
+    for (var outputUnit in _allOutputUnits) {
+      if (!outputUnit.isMainOutput) {
+        List<int> representation = List.filled(id, 0);
+        for (var entity in outputUnit._imports) {
+          representation[importMap[entity]] = 1;
+        }
+        graph.add(representation.join());
+      }
+    }
+    compiler.outputProvider.createOutputSink(
+        compiler.options.deferredGraphUri.path, '', OutputType.debug)
+      ..add(graph.join('\n'))
+      ..close();
+  }
+
   OutputUnitData _buildResult() {
     _createOutputUnits();
     Map<String, List<OutputUnit>> hunksToLoad = _setupHunksToLoad();
+    if (compiler.options.deferredGraphUri != null) {
+      _dumpDeferredGraph();
+    }
     Map<ClassEntity, OutputUnit> classMap = {};
     Map<ClassEntity, OutputUnit> classTypeMap = {};
     Map<MemberEntity, OutputUnit> memberMap = {};
@@ -1970,3 +1998,11 @@
     add(node);
   }
 }
+
+int _compareImportEntities(ImportEntity a, ImportEntity b) {
+  if (a == b) {
+    return 0;
+  } else {
+    return a.uri.path.compareTo(b.uri.path);
+  }
+}
diff --git a/pkg/compiler/lib/src/options.dart b/pkg/compiler/lib/src/options.dart
index ddb6dd0..03edd91 100644
--- a/pkg/compiler/lib/src/options.dart
+++ b/pkg/compiler/lib/src/options.dart
@@ -161,6 +161,10 @@
   /// libraries are subdivided.
   Uri deferredMapUri;
 
+  /// Location where to generate an internal format representing the deferred
+  /// graph.
+  Uri deferredGraphUri;
+
   /// The maximum number of deferred fragments to generate. If the number of
   /// fragments exceeds this amount, then they may be merged.
   /// Note: Currently, we only merge fragments in a single dependency chain. We
@@ -466,6 +470,8 @@
           _extractStringOption(options, '--build-id=', _UNDETERMINED_BUILD_ID)
       ..compileForServer = _hasOption(options, Flags.serverMode)
       ..deferredMapUri = _extractUriOption(options, '--deferred-map=')
+      ..deferredGraphUri =
+          _extractUriOption(options, '${Flags.dumpDeferredGraph}=')
       ..fatalWarnings = _hasOption(options, Flags.fatalWarnings)
       ..terseDiagnostics = _hasOption(options, Flags.terse)
       ..suppressWarnings = _hasOption(options, Flags.suppressWarnings)
diff --git a/pkg/compiler/test/deferred/load_mapping_test.dart b/pkg/compiler/test/deferred/load_mapping_test.dart
index 4e6e9af..c158dc4 100644
--- a/pkg/compiler/test/deferred/load_mapping_test.dart
+++ b/pkg/compiler/test/deferred/load_mapping_test.dart
@@ -11,29 +11,53 @@
 import '../helpers/memory_source_file_helper.dart';
 import '../helpers/memory_compiler.dart';
 
+void testLoadMap() async {
+  var collector = new OutputCollector();
+  CompilationResult result = await runCompiler(
+      memorySourceFiles: MEMORY_SOURCE_FILES,
+      options: ['--deferred-map=deferred_map.json'],
+      outputProvider: collector);
+  CompilerImpl compiler = result.compiler;
+  JClosedWorld closedWorld = compiler.backendClosedWorldForTesting;
+  // Ensure a mapping file is output.
+  Expect.isNotNull(
+      collector.getOutput("deferred_map.json", OutputType.deferredMap));
+
+  Map mapping = closedWorld.outputUnitData
+      .computeDeferredMap(compiler.options, closedWorld.elementEnvironment);
+  // Test structure of mapping.
+  Expect.equals("<unnamed>", mapping["main.dart"]["name"]);
+  Expect.equals(2, mapping["main.dart"]["imports"]["lib1"].length);
+  Expect.equals(2, mapping["main.dart"]["imports"]["lib2"].length);
+  Expect.equals(1, mapping["main.dart"]["imports"]["convert"].length);
+  Expect.equals("lib1", mapping["memory:lib1.dart"]["name"]);
+  Expect.equals(1, mapping["memory:lib1.dart"]["imports"]["lib4_1"].length);
+  Expect.equals(1, mapping["memory:lib2.dart"]["imports"]["lib4_2"].length);
+}
+
+void testDumpDeferredGraph() async {
+  var collector = new OutputCollector();
+  await runCompiler(
+      memorySourceFiles: MEMORY_SOURCE_FILES,
+      options: ['--dump-deferred-graph=deferred_graph.txt'],
+      outputProvider: collector);
+  var actual =
+      collector.getOutput("deferred_graph.txt", OutputType.debug).split('\n');
+
+  // This program has 5 deferred imports `convert`, `lib1`, `lib2`, `lib4_1`,
+  // and `lib4_2`. Most are independent of one another, except for `lib1`
+  // and `lib2`, that happen to both use common code (foo3 in lib3). As a
+  // result we expect to have an 6 output files:
+  //  * one for code that is only use by an individual deferred import, and
+  //  * an extra one for the intersection of lib1 and lib2.
+  var expected = ['10000', '01000', '00100', '00010', '00001', '01100'];
+  Expect.listEquals(expected, actual);
+}
+
 void main() {
   asyncTest(() async {
-    var collector = new OutputCollector();
-    CompilationResult result = await runCompiler(
-        memorySourceFiles: MEMORY_SOURCE_FILES,
-        options: ['--deferred-map=deferred_map.json'],
-        outputProvider: collector);
-    CompilerImpl compiler = result.compiler;
-    JClosedWorld closedWorld = compiler.backendClosedWorldForTesting;
-    // Ensure a mapping file is output.
-    Expect.isNotNull(
-        collector.getOutput("deferred_map.json", OutputType.deferredMap));
-
-    Map mapping = closedWorld.outputUnitData
-        .computeDeferredMap(compiler.options, closedWorld.elementEnvironment);
-    // Test structure of mapping.
-    Expect.equals("<unnamed>", mapping["main.dart"]["name"]);
-    Expect.equals(2, mapping["main.dart"]["imports"]["lib1"].length);
-    Expect.equals(2, mapping["main.dart"]["imports"]["lib2"].length);
-    Expect.equals(1, mapping["main.dart"]["imports"]["convert"].length);
-    Expect.equals("lib1", mapping["memory:lib1.dart"]["name"]);
-    Expect.equals(1, mapping["memory:lib1.dart"]["imports"]["lib4_1"].length);
-    Expect.equals(1, mapping["memory:lib2.dart"]["imports"]["lib4_2"].length);
+    testLoadMap();
+    testDumpDeferredGraph();
   });
 }
 
diff --git a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
index 6809bc9..92a5cab 100644
--- a/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/body_builder.dart
@@ -4392,8 +4392,10 @@
     String name = pop();
     List<UnresolvedType> typeArguments = pop();
     if (inMetadata && typeArguments != null) {
-      handleRecoverableError(fasta.messageMetadataTypeArguments,
-          nameLastToken.next, nameLastToken.next);
+      if (!libraryBuilder.enableGenericMetadataInLibrary) {
+        handleRecoverableError(fasta.messageMetadataTypeArguments,
+            nameLastToken.next, nameLastToken.next);
+      }
     }
 
     Object type = pop();
diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
index b973591..b476720 100644
--- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -298,6 +298,7 @@
   Version _enableNonNullableVersionInLibrary;
   bool _enableTripleShiftInLibrary;
   bool _enableExtensionMethodsInLibrary;
+  bool _enableGenericMetadataInLibrary;
 
   bool get enableVarianceInLibrary =>
       _enableVarianceInLibrary ??= loader.target.isExperimentEnabledInLibrary(
@@ -332,6 +333,10 @@
           .isExperimentEnabledInLibrary(
               ExperimentalFlag.extensionMethods, _packageUri ?? importUri);
 
+  bool get enableGenericMetadataInLibrary => _enableGenericMetadataInLibrary ??=
+      loader.target.isExperimentEnabledInLibrary(
+          ExperimentalFlag.genericMetadata, _packageUri ?? importUri);
+
   void updateLibraryNNBDSettings() {
     library.isNonNullableByDefault = isNonNullableByDefault;
     if (enableNonNullableInLibrary) {
diff --git a/pkg/front_end/test/analyser_ignored/load_dill_twice_test.dart b/pkg/front_end/test/analyser_ignored/load_dill_twice_test.dart
index 922ff5d..803f98f 100644
--- a/pkg/front_end/test/analyser_ignored/load_dill_twice_test.dart
+++ b/pkg/front_end/test/analyser_ignored/load_dill_twice_test.dart
@@ -12,7 +12,7 @@
 
 import 'package:kernel/kernel.dart' show Component;
 
-import '../incremental_load_from_dill_suite.dart' show normalCompileToBytes;
+import '../incremental_suite.dart' show normalCompileToBytes;
 
 main() async {
   List<int> bytes = await normalCompileToBytes(
diff --git a/pkg/front_end/test/ast_nodes_has_to_string_test.dart b/pkg/front_end/test/ast_nodes_has_to_string_test.dart
index 028bedf..1750eab 100644
--- a/pkg/front_end/test/ast_nodes_has_to_string_test.dart
+++ b/pkg/front_end/test/ast_nodes_has_to_string_test.dart
@@ -10,7 +10,7 @@
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 
-import 'incremental_load_from_dill_suite.dart' as helper;
+import 'incremental_suite.dart' as helper;
 
 main(List<String> args) async {
   exitCode = 1;
diff --git a/pkg/front_end/test/binary_md_vm_tags_and_version_git_test.dart b/pkg/front_end/test/binary_md_vm_tags_and_version_git_test.dart
index fdf5330..1f8b12d 100644
--- a/pkg/front_end/test/binary_md_vm_tags_and_version_git_test.dart
+++ b/pkg/front_end/test/binary_md_vm_tags_and_version_git_test.dart
@@ -18,8 +18,7 @@
 
 import 'binary_md_dill_reader.dart' show BinaryMdDillReader;
 
-import 'incremental_load_from_dill_suite.dart'
-    show getOptions, normalCompileToComponent;
+import 'incremental_suite.dart' show getOptions, normalCompileToComponent;
 
 import 'utils/io_utils.dart' show computeRepoDir;
 
diff --git a/pkg/front_end/test/compile_dart2js_with_no_sdk_test.dart b/pkg/front_end/test/compile_dart2js_with_no_sdk_test.dart
index 513b868..668ff0a 100644
--- a/pkg/front_end/test/compile_dart2js_with_no_sdk_test.dart
+++ b/pkg/front_end/test/compile_dart2js_with_no_sdk_test.dart
@@ -6,8 +6,7 @@
 
 import 'package:front_end/src/api_prototype/compiler_options.dart';
 
-import 'incremental_load_from_dill_suite.dart'
-    show TestIncrementalCompiler, getOptions;
+import 'incremental_suite.dart' show TestIncrementalCompiler, getOptions;
 
 main() async {
   final Uri dart2jsUrl = Uri.base.resolve("pkg/compiler/bin/dart2js.dart");
diff --git a/pkg/front_end/test/compile_with_no_sdk_test.dart b/pkg/front_end/test/compile_with_no_sdk_test.dart
index 5c7f5ca..1cbbd98 100644
--- a/pkg/front_end/test/compile_with_no_sdk_test.dart
+++ b/pkg/front_end/test/compile_with_no_sdk_test.dart
@@ -7,8 +7,7 @@
 import 'package:front_end/src/api_prototype/compiler_options.dart';
 import 'package:front_end/src/api_prototype/memory_file_system.dart';
 
-import 'incremental_load_from_dill_suite.dart'
-    show TestIncrementalCompiler, getOptions;
+import 'incremental_suite.dart' show TestIncrementalCompiler, getOptions;
 
 main() async {
   await compile("import 'foo.dart' if (dart.library.bar) 'baz.dart';");
diff --git a/pkg/front_end/test/constant_evaluator_benchmark.dart b/pkg/front_end/test/constant_evaluator_benchmark.dart
index 5de0a0a..66a4cdb 100644
--- a/pkg/front_end/test/constant_evaluator_benchmark.dart
+++ b/pkg/front_end/test/constant_evaluator_benchmark.dart
@@ -43,7 +43,7 @@
 
 import "package:vm/target/vm.dart" show VmTarget;
 
-import 'incremental_load_from_dill_suite.dart' show getOptions;
+import 'incremental_suite.dart' show getOptions;
 
 import 'package:front_end/src/fasta/kernel/utils.dart' show serializeComponent;
 
diff --git a/pkg/front_end/test/crashing_test_case_minimizer_impl.dart b/pkg/front_end/test/crashing_test_case_minimizer_impl.dart
index 1d3264e..46a2b61 100644
--- a/pkg/front_end/test/crashing_test_case_minimizer_impl.dart
+++ b/pkg/front_end/test/crashing_test_case_minimizer_impl.dart
@@ -64,7 +64,7 @@
 
 import "package:vm/target/vm.dart" show VmTarget;
 
-import 'incremental_load_from_dill_suite.dart' show getOptions;
+import 'incremental_suite.dart' show getOptions;
 
 import 'parser_test_listener.dart' show ParserTestListener;
 
diff --git a/pkg/front_end/test/dill_round_trip_test.dart b/pkg/front_end/test/dill_round_trip_test.dart
index 2842c9e..894d6d4 100644
--- a/pkg/front_end/test/dill_round_trip_test.dart
+++ b/pkg/front_end/test/dill_round_trip_test.dart
@@ -12,7 +12,7 @@
 
 import 'package:kernel/target/targets.dart' show NoneTarget, TargetFlags;
 
-import 'incremental_load_from_dill_suite.dart'
+import 'incremental_suite.dart'
     show checkIsEqual, getOptions, normalCompilePlain;
 
 main() async {
diff --git a/pkg/front_end/test/fasta/incremental_suite.dart b/pkg/front_end/test/fasta/incremental_dartino_suite.dart
similarity index 100%
rename from pkg/front_end/test/fasta/incremental_suite.dart
rename to pkg/front_end/test/fasta/incremental_dartino_suite.dart
diff --git a/pkg/front_end/test/fasta/strong1_suite.dart b/pkg/front_end/test/fasta/strong1_suite.dart
deleted file mode 100644
index 7fbcb8d..0000000
--- a/pkg/front_end/test/fasta/strong1_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'strong_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 0);
-}
diff --git a/pkg/front_end/test/fasta/strong2_suite.dart b/pkg/front_end/test/fasta/strong2_suite.dart
deleted file mode 100644
index 311509b..0000000
--- a/pkg/front_end/test/fasta/strong2_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'strong_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 1);
-}
diff --git a/pkg/front_end/test/fasta/strong3_suite.dart b/pkg/front_end/test/fasta/strong3_suite.dart
deleted file mode 100644
index 5bb5913..0000000
--- a/pkg/front_end/test/fasta/strong3_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'strong_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 2);
-}
diff --git a/pkg/front_end/test/fasta/strong4_suite.dart b/pkg/front_end/test/fasta/strong4_suite.dart
deleted file mode 100644
index 9db4367..0000000
--- a/pkg/front_end/test/fasta/strong4_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'strong_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 3);
-}
diff --git a/pkg/front_end/test/fasta/strong_suite.dart b/pkg/front_end/test/fasta/strong_suite.dart
new file mode 100644
index 0000000..2d9b9a2
--- /dev/null
+++ b/pkg/front_end/test/fasta/strong_suite.dart
@@ -0,0 +1,26 @@
+// Copyright (c) 2017, 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.md file.
+
+// @dart = 2.9
+
+library fasta.test.strong_test;
+
+import 'testing/suite.dart';
+
+Future<FastaContext> createContext(
+    Chain suite, Map<String, String> environment) {
+  environment[ENABLE_FULL_COMPILE] = "";
+  environment['soundNullSafety'] = "true";
+  return FastaContext.create(suite, environment);
+}
+
+main(List<String> arguments) {
+  internalMain(arguments: arguments);
+}
+
+internalMain(
+    {List<String> arguments = const [], int shards = 1, int shard = 0}) {
+  runMe(arguments, createContext,
+      configurationPath: "../../testing.json", shards: shards, shard: shard);
+}
diff --git a/pkg/front_end/test/fasta/strong_tester.dart b/pkg/front_end/test/fasta/strong_tester.dart
deleted file mode 100644
index 8d862fc..0000000
--- a/pkg/front_end/test/fasta/strong_tester.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2017, 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.md file.
-
-// @dart = 2.9
-
-library fasta.test.strong_test;
-
-import 'dart:io' show Platform;
-
-import 'testing/suite.dart';
-
-const int shardCount = 4;
-
-Future<FastaContext> createContext(
-    Chain suite, Map<String, String> environment) {
-  environment[ENABLE_FULL_COMPILE] = "";
-  environment['soundNullSafety'] = "true";
-  return FastaContext.create(suite, environment);
-}
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments);
-}
-
-internalMain(
-    {List<String> arguments = const [], int shards = 1, int shard = 0}) {
-  runMe(arguments, createContext,
-      configurationPath: "../../testing.json",
-      me: Platform.script.resolve('strong_tester.dart'),
-      shards: shards,
-      shard: shard);
-}
diff --git a/pkg/front_end/test/fasta/weak1_suite.dart b/pkg/front_end/test/fasta/weak1_suite.dart
deleted file mode 100644
index 77f925b..0000000
--- a/pkg/front_end/test/fasta/weak1_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'weak_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 0);
-}
diff --git a/pkg/front_end/test/fasta/weak2_suite.dart b/pkg/front_end/test/fasta/weak2_suite.dart
deleted file mode 100644
index 5c5745e..0000000
--- a/pkg/front_end/test/fasta/weak2_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'weak_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 1);
-}
diff --git a/pkg/front_end/test/fasta/weak3_suite.dart b/pkg/front_end/test/fasta/weak3_suite.dart
deleted file mode 100644
index a4dbb40..0000000
--- a/pkg/front_end/test/fasta/weak3_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'weak_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 2);
-}
diff --git a/pkg/front_end/test/fasta/weak4_suite.dart b/pkg/front_end/test/fasta/weak4_suite.dart
deleted file mode 100644
index fe038c5..0000000
--- a/pkg/front_end/test/fasta/weak4_suite.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-import 'weak_tester.dart';
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments, shards: shardCount, shard: 3);
-}
diff --git a/pkg/front_end/test/fasta/weak_suite.dart b/pkg/front_end/test/fasta/weak_suite.dart
new file mode 100644
index 0000000..4fb7c3a
--- /dev/null
+++ b/pkg/front_end/test/fasta/weak_suite.dart
@@ -0,0 +1,24 @@
+// 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.md file.
+
+// @dart = 2.9
+
+library fasta.test.weak_test;
+
+import 'testing/suite.dart';
+
+Future<FastaContext> createContext(
+    Chain suite, Map<String, String> environment) {
+  environment[ENABLE_FULL_COMPILE] = "";
+  return FastaContext.create(suite, environment);
+}
+
+main(List<String> arguments) {
+  internalMain(arguments: arguments);
+}
+
+internalMain(
+        {List<String> arguments = const [], int shards = 1, int shard = 0}) =>
+    runMe(arguments, createContext,
+        configurationPath: "../../testing.json", shard: shard, shards: shards);
diff --git a/pkg/front_end/test/fasta/weak_tester.dart b/pkg/front_end/test/fasta/weak_tester.dart
deleted file mode 100644
index 6544181..0000000
--- a/pkg/front_end/test/fasta/weak_tester.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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.md file.
-
-// @dart = 2.9
-
-library fasta.test.weak_test;
-
-import 'testing/suite.dart';
-
-const int shardCount = 4;
-
-Future<FastaContext> createContext(
-    Chain suite, Map<String, String> environment) {
-  environment[ENABLE_FULL_COMPILE] = "";
-  return FastaContext.create(suite, environment);
-}
-
-main(List<String> arguments) {
-  internalMain(arguments: arguments);
-}
-
-internalMain(
-        {List<String> arguments = const [], int shards = 1, int shard = 0}) =>
-    runMe(arguments, createContext,
-        configurationPath: "../../testing.json", shard: shard, shards: shards);
diff --git a/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart b/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart
index 13eaccb..1fb8ad1 100644
--- a/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart
+++ b/pkg/front_end/test/incremental_dart2js_load_from_dill_test.dart
@@ -16,7 +16,7 @@
 import 'package:kernel/kernel.dart' show Component;
 import 'package:kernel/target/targets.dart';
 
-import 'incremental_load_from_dill_suite.dart'
+import 'incremental_suite.dart'
     show checkIsEqual, getOptions, initializedCompile, normalCompile;
 
 Directory outDir;
diff --git a/pkg/front_end/test/incremental_dart2js_tester.dart b/pkg/front_end/test/incremental_dart2js_tester.dart
index 8cadcc1..11f7783 100644
--- a/pkg/front_end/test/incremental_dart2js_tester.dart
+++ b/pkg/front_end/test/incremental_dart2js_tester.dart
@@ -14,7 +14,7 @@
 import 'package:kernel/kernel.dart'
     show Component, Library, LibraryPart, Reference;
 
-import 'incremental_load_from_dill_suite.dart' as helper;
+import 'incremental_suite.dart' as helper;
 
 import "incremental_utils.dart" as util;
 
diff --git a/pkg/front_end/test/incremental_flutter_tester.dart b/pkg/front_end/test/incremental_flutter_tester.dart
index 10bb00e..d0dec4c 100644
--- a/pkg/front_end/test/incremental_flutter_tester.dart
+++ b/pkg/front_end/test/incremental_flutter_tester.dart
@@ -24,7 +24,7 @@
 import 'package:kernel/text/ast_to_text.dart'
     show Annotator, NameSystem, Printer;
 
-import 'incremental_load_from_dill_suite.dart' as helper;
+import 'incremental_suite.dart' as helper;
 
 import "package:vm/target/flutter.dart" show FlutterTarget;
 
diff --git a/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart b/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart
index 6f1bc12..552cb48 100644
--- a/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart
+++ b/pkg/front_end/test/incremental_load_from_invalid_dill_test.dart
@@ -45,7 +45,7 @@
 import 'package:kernel/kernel.dart'
     show Component, Library, NonNullableByDefaultCompiledMode;
 
-import 'incremental_load_from_dill_suite.dart' show getOptions;
+import 'incremental_suite.dart' show getOptions;
 
 Future<Null> main() async {
   Tester tester = new Tester();
diff --git a/pkg/front_end/test/incremental_load_from_dill_suite.dart b/pkg/front_end/test/incremental_suite.dart
similarity index 100%
rename from pkg/front_end/test/incremental_load_from_dill_suite.dart
rename to pkg/front_end/test/incremental_suite.dart
diff --git a/pkg/front_end/test/multiple_simultaneous_compiles_test.dart b/pkg/front_end/test/multiple_simultaneous_compiles_test.dart
index 6d3e9e1..c64e9fe 100644
--- a/pkg/front_end/test/multiple_simultaneous_compiles_test.dart
+++ b/pkg/front_end/test/multiple_simultaneous_compiles_test.dart
@@ -10,7 +10,7 @@
 import 'package:front_end/src/fasta/incremental_compiler.dart';
 import 'package:kernel/ast.dart';
 
-import 'incremental_load_from_dill_suite.dart' show getOptions;
+import 'incremental_suite.dart' show getOptions;
 
 main() async {
   Uri compileTarget = Platform.script.resolve("binary_md_dill_reader.dart");
diff --git a/pkg/front_end/test/read_dill_from_binary_md_git_test.dart b/pkg/front_end/test/read_dill_from_binary_md_git_test.dart
index fc73545..fb6ccaf 100644
--- a/pkg/front_end/test/read_dill_from_binary_md_git_test.dart
+++ b/pkg/front_end/test/read_dill_from_binary_md_git_test.dart
@@ -10,8 +10,7 @@
 
 import 'binary_md_dill_reader.dart' show BinaryMdDillReader;
 
-import 'incremental_load_from_dill_suite.dart'
-    show getOptions, normalCompileToBytes;
+import 'incremental_suite.dart' show getOptions, normalCompileToBytes;
 
 import 'utils/io_utils.dart' show computeRepoDir;
 
diff --git a/pkg/front_end/test/split_dill_test.dart b/pkg/front_end/test/split_dill_test.dart
index 24e4782..59d1d91 100644
--- a/pkg/front_end/test/split_dill_test.dart
+++ b/pkg/front_end/test/split_dill_test.dart
@@ -18,8 +18,7 @@
 
 import "package:vm/target/vm.dart" show VmTarget;
 
-import 'incremental_load_from_dill_suite.dart'
-    show getOptions, normalCompileToComponent;
+import 'incremental_suite.dart' show getOptions, normalCompileToComponent;
 
 import 'utils/io_utils.dart' show computeRepoDir;
 
diff --git a/pkg/front_end/test/test_generator_test.dart b/pkg/front_end/test/test_generator_test.dart
index 8e35ddc..449a33f 100644
--- a/pkg/front_end/test/test_generator_test.dart
+++ b/pkg/front_end/test/test_generator_test.dart
@@ -15,7 +15,7 @@
 
 import 'package:kernel/kernel.dart' show Component;
 
-import 'incremental_load_from_dill_suite.dart' as helper;
+import 'incremental_suite.dart' as helper;
 
 main() async {
   TestCompiler compiler = await TestCompiler.initialize();
diff --git a/pkg/front_end/test/unit_test_suites_impl.dart b/pkg/front_end/test/unit_test_suites_impl.dart
index 71215ad..70a67b3 100644
--- a/pkg/front_end/test/unit_test_suites_impl.dart
+++ b/pkg/front_end/test/unit_test_suites_impl.dart
@@ -18,18 +18,18 @@
 import 'package:testing/src/test_description.dart' show TestDescription;
 
 import 'fasta/expression_suite.dart' as expression show createContext;
-import 'fasta/incremental_suite.dart' as incremental show createContext;
+import 'fasta/incremental_dartino_suite.dart' as incremental_dartino
+    show createContext;
 import 'fasta/messages_suite.dart' as messages show createContext;
 import 'fasta/outline_suite.dart' as outline show createContext;
-import 'fasta/strong_tester.dart' as strong show createContext;
+import 'fasta/strong_suite.dart' as strong show createContext;
 import 'fasta/text_serialization_tester.dart' as text_serialization
     show createContext;
 import 'fasta/textual_outline_suite.dart' as textual_outline show createContext;
-import 'fasta/weak_tester.dart' as weak show createContext;
+import 'fasta/weak_suite.dart' as weak show createContext;
 import 'incremental_bulk_compiler_smoke_suite.dart' as incremental_bulk_compiler
     show createContext;
-import 'incremental_load_from_dill_suite.dart' as incremental_load
-    show createContext;
+import 'incremental_suite.dart' as incremental show createContext;
 import 'lint_suite.dart' as lint show createContext;
 import 'parser_suite.dart' as parser show createContext;
 import 'parser_all_suite.dart' as parserAll show createContext;
@@ -333,8 +333,8 @@
     shardCount: 2,
   ),
   const Suite(
-    "fasta/incremental",
-    incremental.createContext,
+    "fasta/incremental_dartino",
+    incremental_dartino.createContext,
     "../../testing.json",
     shardCount: 1,
   ),
@@ -356,7 +356,7 @@
     "fasta/strong",
     strong.createContext,
     "../../testing.json",
-    path: "fasta/strong_tester.dart",
+    path: "fasta/strong_suite.dart",
     shardCount: 2,
   ),
   const Suite(
@@ -366,8 +366,8 @@
     shardCount: 1,
   ),
   const Suite(
-    "incremental_load_from_dill",
-    incremental_load.createContext,
+    "incremental",
+    incremental.createContext,
     "../testing.json",
     shardCount: 2,
   ),
@@ -412,7 +412,7 @@
     "fasta/weak",
     weak.createContext,
     "../../testing.json",
-    path: "fasta/weak_tester.dart",
+    path: "fasta/weak_suite.dart",
     shardCount: 10,
   ),
   const Suite(
diff --git a/pkg/front_end/test/vm_service_for_leak_detection.dart b/pkg/front_end/test/vm_service_for_leak_detection.dart
index 6df63cc..19dbbdb 100644
--- a/pkg/front_end/test/vm_service_for_leak_detection.dart
+++ b/pkg/front_end/test/vm_service_for_leak_detection.dart
@@ -50,12 +50,10 @@
   } else {
     heapHelper.start([
       "--enable-asserts",
-      Platform.script
-          .resolve("incremental_load_from_dill_suite.dart")
-          .toString(),
+      Platform.script.resolve("incremental_suite.dart").toString(),
       "-DaddDebugBreaks=true",
       "--",
-      "incremental_load_from_dill/no_outline_change_38",
+      "incremental/no_outline_change_38",
     ]);
   }
 }
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart b/pkg/front_end/testcases/general/ffi_sample.dart
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart
rename to pkg/front_end/testcases/general/ffi_sample.dart
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.textual_outline.expect b/pkg/front_end/testcases/general/ffi_sample.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.textual_outline.expect
rename to pkg/front_end/testcases/general/ffi_sample.dart.textual_outline.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general/ffi_sample.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/general/ffi_sample.dart.textual_outline_modelled.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.weak.expect b/pkg/front_end/testcases/general/ffi_sample.dart.weak.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.weak.expect
rename to pkg/front_end/testcases/general/ffi_sample.dart.weak.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.weak.outline.expect b/pkg/front_end/testcases/general/ffi_sample.dart.weak.outline.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.weak.outline.expect
rename to pkg/front_end/testcases/general/ffi_sample.dart.weak.outline.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.weak.transformed.expect b/pkg/front_end/testcases/general/ffi_sample.dart.weak.transformed.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/ffi_sample.dart.weak.transformed.expect
rename to pkg/front_end/testcases/general/ffi_sample.dart.weak.transformed.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart b/pkg/front_end/testcases/general/future_or_null.dart
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart
rename to pkg/front_end/testcases/general/future_or_null.dart
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.textual_outline.expect b/pkg/front_end/testcases/general/future_or_null.dart.textual_outline.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.textual_outline.expect
rename to pkg/front_end/testcases/general/future_or_null.dart.textual_outline.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general/future_or_null.dart.textual_outline_modelled.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.textual_outline_modelled.expect
rename to pkg/front_end/testcases/general/future_or_null.dart.textual_outline_modelled.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.weak.expect b/pkg/front_end/testcases/general/future_or_null.dart.weak.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.weak.expect
rename to pkg/front_end/testcases/general/future_or_null.dart.weak.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.weak.outline.expect b/pkg/front_end/testcases/general/future_or_null.dart.weak.outline.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.weak.outline.expect
rename to pkg/front_end/testcases/general/future_or_null.dart.weak.outline.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general/future_or_null.dart.weak.transformed.expect
similarity index 100%
rename from pkg/front_end/testcases/general_nnbd_opt_out/future_or_null_test.dart.weak.transformed.expect
rename to pkg/front_end/testcases/general/future_or_null.dart.weak.transformed.expect
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart b/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart
deleted file mode 100644
index 43bba94..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart
+++ /dev/null
@@ -1,707 +0,0 @@
-// Copyright 2011 Google Inc. All Rights Reserved.
-// Copyright 1996 John Maloney and Mario Wolczko
-//
-// This file is part of GNU Smalltalk.
-//
-// GNU Smalltalk is free software; you can redistribute it and/or modify it
-// under the terms of the GNU General Public License as published by the Free
-// Software Foundation; either version 2, or (at your option) any later version.
-//
-// GNU Smalltalk is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-// details.
-//
-// You should have received a copy of the GNU General Public License along with
-// GNU Smalltalk; see the file COPYING.  If not, write to the Free Software
-// Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-// Translated first from Smalltalk to JavaScript, and finally to
-// Dart by Google 2008-2010.
-
-// @dart=2.6
-
-/**
- * A Dart implementation of the DeltaBlue constraint-solving
- * algorithm, as described in:
- *
- * "The DeltaBlue Algorithm: An Incremental Constraint Hierarchy Solver"
- *   Bjorn N. Freeman-Benson and John Maloney
- *   January 1990 Communications of the ACM,
- *   also available as University of Washington TR 89-08-06.
- *
- * Beware: this benchmark is written in a grotesque style where
- * the constraint model is built by side-effects from constructors.
- * I've kept it this way to avoid deviating too much from the original
- * implementation.
- */
-
-main() {
-  new DeltaBlue().run();
-}
-
-/// Benchmark class required to report results.
-class DeltaBlue {
-  void run() {
-    chainTest(100);
-    projectionTest(100);
-  }
-}
-
-/**
- * Strengths are used to measure the relative importance of constraints.
- * New strengths may be inserted in the strength hierarchy without
- * disrupting current constraints.  Strengths cannot be created outside
- * this class, so == can be used for value comparison.
- */
-class Strength {
-  final int value;
-  final String name;
-
-  const Strength(this.value, this.name);
-
-  Strength nextWeaker() => const <Strength>[
-        STRONG_PREFERRED,
-        PREFERRED,
-        STRONG_DEFAULT,
-        NORMAL,
-        WEAK_DEFAULT,
-        WEAKEST
-      ][value];
-
-  static bool stronger(Strength s1, Strength s2) {
-    return s1.value < s2.value;
-  }
-
-  static bool weaker(Strength s1, Strength s2) {
-    return s1.value > s2.value;
-  }
-
-  static Strength weakest(Strength s1, Strength s2) {
-    return weaker(s1, s2) ? s1 : s2;
-  }
-
-  static Strength strongest(Strength s1, Strength s2) {
-    return stronger(s1, s2) ? s1 : s2;
-  }
-}
-
-// Compile time computed constants.
-const REQUIRED = const Strength(0, "required");
-const STRONG_PREFERRED = const Strength(1, "strongPreferred");
-const PREFERRED = const Strength(2, "preferred");
-const STRONG_DEFAULT = const Strength(3, "strongDefault");
-const NORMAL = const Strength(4, "normal");
-const WEAK_DEFAULT = const Strength(5, "weakDefault");
-const WEAKEST = const Strength(6, "weakest");
-
-abstract class Constraint {
-  final Strength strength;
-
-  const Constraint(this.strength);
-
-  bool isSatisfied();
-  void markUnsatisfied();
-  void addToGraph();
-  void removeFromGraph();
-  void chooseMethod(int mark);
-  void markInputs(int mark);
-  bool inputsKnown(int mark);
-  Variable output();
-  void execute();
-  void recalculate();
-
-  /// Activate this constraint and attempt to satisfy it.
-  void addConstraint() {
-    addToGraph();
-    planner.incrementalAdd(this);
-  }
-
-  /**
-   * Attempt to find a way to enforce this constraint. If successful,
-   * record the solution, perhaps modifying the current dataflow
-   * graph. Answer the constraint that this constraint overrides, if
-   * there is one, or nil, if there isn't.
-   * Assume: I am not already satisfied.
-   */
-  Constraint satisfy(mark) {
-    chooseMethod(mark);
-    if (!isSatisfied()) {
-      if (strength == REQUIRED) {
-        print("Could not satisfy a required constraint!");
-      }
-      return null;
-    }
-    markInputs(mark);
-    Variable out = output();
-    Constraint overridden = out.determinedBy;
-    if (overridden != null) overridden.markUnsatisfied();
-    out.determinedBy = this;
-    if (!planner.addPropagate(this, mark)) print("Cycle encountered");
-    out.mark = mark;
-    return overridden;
-  }
-
-  void destroyConstraint() {
-    if (isSatisfied()) planner.incrementalRemove(this);
-    removeFromGraph();
-  }
-
-  /**
-   * Normal constraints are not input constraints.  An input constraint
-   * is one that depends on external state, such as the mouse, the
-   * keyboard, a clock, or some arbitrary piece of imperative code.
-   */
-  bool isInput() => false;
-}
-
-/**
- * Abstract superclass for constraints having a single possible output variable.
- */
-abstract class UnaryConstraint extends Constraint {
-  final Variable myOutput;
-  bool satisfied = false;
-
-  UnaryConstraint(this.myOutput, Strength strength) : super(strength) {
-    addConstraint();
-  }
-
-  /// Adds this constraint to the constraint graph
-  void addToGraph() {
-    myOutput.addConstraint(this);
-    satisfied = false;
-  }
-
-  /// Decides if this constraint can be satisfied and records that decision.
-  void chooseMethod(int mark) {
-    satisfied = (myOutput.mark != mark) &&
-        Strength.stronger(strength, myOutput.walkStrength);
-  }
-
-  /// Returns true if this constraint is satisfied in the current solution.
-  bool isSatisfied() => satisfied;
-
-  void markInputs(int mark) {
-    // has no inputs.
-  }
-
-  /// Returns the current output variable.
-  Variable output() => myOutput;
-
-  /**
-   * Calculate the walkabout strength, the stay flag, and, if it is
-   * 'stay', the value for the current output of this constraint. Assume
-   * this constraint is satisfied.
-   */
-  void recalculate() {
-    myOutput.walkStrength = strength;
-    myOutput.stay = !isInput();
-    if (myOutput.stay) execute(); // Stay optimization.
-  }
-
-  /// Records that this constraint is unsatisfied.
-  void markUnsatisfied() {
-    satisfied = false;
-  }
-
-  bool inputsKnown(int mark) => true;
-
-  void removeFromGraph() {
-    if (myOutput != null) myOutput.removeConstraint(this);
-    satisfied = false;
-  }
-}
-
-/**
- * Variables that should, with some level of preference, stay the same.
- * Planners may exploit the fact that instances, if satisfied, will not
- * change their output during plan execution.  This is called "stay
- * optimization".
- */
-class StayConstraint extends UnaryConstraint {
-  StayConstraint(Variable v, Strength str) : super(v, str);
-
-  void execute() {
-    // Stay constraints do nothing.
-  }
-}
-
-/**
- * A unary input constraint used to mark a variable that the client
- * wishes to change.
- */
-class EditConstraint extends UnaryConstraint {
-  EditConstraint(Variable v, Strength str) : super(v, str);
-
-  /// Edits indicate that a variable is to be changed by imperative code.
-  bool isInput() => true;
-
-  void execute() {
-    // Edit constraints do nothing.
-  }
-}
-
-// Directions.
-const int NONE = 1;
-const int FORWARD = 2;
-const int BACKWARD = 0;
-
-/**
- * Abstract superclass for constraints having two possible output
- * variables.
- */
-abstract class BinaryConstraint extends Constraint {
-  Variable v1;
-  Variable v2;
-  int direction = NONE;
-
-  BinaryConstraint(this.v1, this.v2, Strength strength) : super(strength) {
-    addConstraint();
-  }
-
-  /**
-   * Decides if this constraint can be satisfied and which way it
-   * should flow based on the relative strength of the variables related,
-   * and record that decision.
-   */
-  void chooseMethod(int mark) {
-    if (v1.mark == mark) {
-      direction =
-          (v2.mark != mark && Strength.stronger(strength, v2.walkStrength))
-              ? FORWARD
-              : NONE;
-    }
-    if (v2.mark == mark) {
-      direction =
-          (v1.mark != mark && Strength.stronger(strength, v1.walkStrength))
-              ? BACKWARD
-              : NONE;
-    }
-    if (Strength.weaker(v1.walkStrength, v2.walkStrength)) {
-      direction =
-          Strength.stronger(strength, v1.walkStrength) ? BACKWARD : NONE;
-    } else {
-      direction =
-          Strength.stronger(strength, v2.walkStrength) ? FORWARD : BACKWARD;
-    }
-  }
-
-  /// Add this constraint to the constraint graph.
-  void addToGraph() {
-    v1.addConstraint(this);
-    v2.addConstraint(this);
-    direction = NONE;
-  }
-
-  /// Answer true if this constraint is satisfied in the current solution.
-  bool isSatisfied() => direction != NONE;
-
-  /// Mark the input variable with the given mark.
-  void markInputs(int mark) {
-    input().mark = mark;
-  }
-
-  /// Returns the current input variable
-  Variable input() => direction == FORWARD ? v1 : v2;
-
-  /// Returns the current output variable.
-  Variable output() => direction == FORWARD ? v2 : v1;
-
-  /**
-   * Calculate the walkabout strength, the stay flag, and, if it is
-   * 'stay', the value for the current output of this
-   * constraint. Assume this constraint is satisfied.
-   */
-  void recalculate() {
-    Variable ihn = input(), out = output();
-    out.walkStrength = Strength.weakest(strength, ihn.walkStrength);
-    out.stay = ihn.stay;
-    if (out.stay) execute();
-  }
-
-  /// Record the fact that this constraint is unsatisfied.
-  void markUnsatisfied() {
-    direction = NONE;
-  }
-
-  bool inputsKnown(int mark) {
-    Variable i = input();
-    return i.mark == mark || i.stay || i.determinedBy == null;
-  }
-
-  void removeFromGraph() {
-    if (v1 != null) v1.removeConstraint(this);
-    if (v2 != null) v2.removeConstraint(this);
-    direction = NONE;
-  }
-}
-
-/**
- * Relates two variables by the linear scaling relationship: "v2 =
- * (v1 * scale) + offset". Either v1 or v2 may be changed to maintain
- * this relationship but the scale factor and offset are considered
- * read-only.
- */
-
-class ScaleConstraint extends BinaryConstraint {
-  final Variable scale;
-  final Variable offset;
-
-  ScaleConstraint(
-      Variable src, this.scale, this.offset, Variable dest, Strength strength)
-      : super(src, dest, strength);
-
-  /// Adds this constraint to the constraint graph.
-  void addToGraph() {
-    super.addToGraph();
-    scale.addConstraint(this);
-    offset.addConstraint(this);
-  }
-
-  void removeFromGraph() {
-    super.removeFromGraph();
-    if (scale != null) scale.removeConstraint(this);
-    if (offset != null) offset.removeConstraint(this);
-  }
-
-  void markInputs(int mark) {
-    super.markInputs(mark);
-    scale.mark = offset.mark = mark;
-  }
-
-  /// Enforce this constraint. Assume that it is satisfied.
-  void execute() {
-    if (direction == FORWARD) {
-      v2.value = v1.value * scale.value + offset.value;
-    } else {
-      v1.value = (v2.value - offset.value) ~/ scale.value;
-    }
-  }
-
-  /**
-   * Calculate the walkabout strength, the stay flag, and, if it is
-   * 'stay', the value for the current output of this constraint. Assume
-   * this constraint is satisfied.
-   */
-  void recalculate() {
-    Variable ihn = input(), out = output();
-    out.walkStrength = Strength.weakest(strength, ihn.walkStrength);
-    out.stay = ihn.stay && scale.stay && offset.stay;
-    if (out.stay) execute();
-  }
-}
-
-/**
- * Constrains two variables to have the same value.
- */
-class EqualityConstraint extends BinaryConstraint {
-  EqualityConstraint(Variable v1, Variable v2, Strength strength)
-      : super(v1, v2, strength);
-
-  /// Enforce this constraint. Assume that it is satisfied.
-  void execute() {
-    output().value = input().value;
-  }
-}
-
-/**
- * A constrained variable. In addition to its value, it maintain the
- * structure of the constraint graph, the current dataflow graph, and
- * various parameters of interest to the DeltaBlue incremental
- * constraint solver.
- **/
-class Variable {
-  List<Constraint> constraints = <Constraint>[];
-  Constraint determinedBy;
-  int mark = 0;
-  Strength walkStrength = WEAKEST;
-  bool stay = true;
-  int value;
-  final String name;
-
-  Variable(this.name, this.value);
-
-  /**
-   * Add the given constraint to the set of all constraints that refer
-   * this variable.
-   */
-  void addConstraint(Constraint c) {
-    constraints.add(c);
-  }
-
-  /// Removes all traces of c from this variable.
-  void removeConstraint(Constraint c) {
-    constraints.remove(c);
-    if (determinedBy == c) determinedBy = null;
-  }
-}
-
-class Planner {
-  int currentMark = 0;
-
-  /**
-   * Attempt to satisfy the given constraint and, if successful,
-   * incrementally update the dataflow graph.  Details: If satisfying
-   * the constraint is successful, it may override a weaker constraint
-   * on its output. The algorithm attempts to resatisfy that
-   * constraint using some other method. This process is repeated
-   * until either a) it reaches a variable that was not previously
-   * determined by any constraint or b) it reaches a constraint that
-   * is too weak to be satisfied using any of its methods. The
-   * variables of constraints that have been processed are marked with
-   * a unique mark value so that we know where we've been. This allows
-   * the algorithm to avoid getting into an infinite loop even if the
-   * constraint graph has an inadvertent cycle.
-   */
-  void incrementalAdd(Constraint c) {
-    int mark = newMark();
-    for (Constraint overridden = c.satisfy(mark);
-        overridden != null;
-        overridden = overridden.satisfy(mark));
-  }
-
-  /**
-   * Entry point for retracting a constraint. Remove the given
-   * constraint and incrementally update the dataflow graph.
-   * Details: Retracting the given constraint may allow some currently
-   * unsatisfiable downstream constraint to be satisfied. We therefore collect
-   * a list of unsatisfied downstream constraints and attempt to
-   * satisfy each one in turn. This list is traversed by constraint
-   * strength, strongest first, as a heuristic for avoiding
-   * unnecessarily adding and then overriding weak constraints.
-   * Assume: [c] is satisfied.
-   */
-  void incrementalRemove(Constraint c) {
-    Variable out = c.output();
-    c.markUnsatisfied();
-    c.removeFromGraph();
-    List<Constraint> unsatisfied = removePropagateFrom(out);
-    Strength strength = REQUIRED;
-    do {
-      for (int i = 0; i < unsatisfied.length; i++) {
-        Constraint u = unsatisfied[i];
-        if (u.strength == strength) incrementalAdd(u);
-      }
-      strength = strength.nextWeaker();
-    } while (strength != WEAKEST);
-  }
-
-  /// Select a previously unused mark value.
-  int newMark() => ++currentMark;
-
-  /**
-   * Extract a plan for resatisfaction starting from the given source
-   * constraints, usually a set of input constraints. This method
-   * assumes that stay optimization is desired; the plan will contain
-   * only constraints whose output variables are not stay. Constraints
-   * that do no computation, such as stay and edit constraints, are
-   * not included in the plan.
-   * Details: The outputs of a constraint are marked when it is added
-   * to the plan under construction. A constraint may be appended to
-   * the plan when all its input variables are known. A variable is
-   * known if either a) the variable is marked (indicating that has
-   * been computed by a constraint appearing earlier in the plan), b)
-   * the variable is 'stay' (i.e. it is a constant at plan execution
-   * time), or c) the variable is not determined by any
-   * constraint. The last provision is for past states of history
-   * variables, which are not stay but which are also not computed by
-   * any constraint.
-   * Assume: [sources] are all satisfied.
-   */
-  Plan makePlan(List<Constraint> sources) {
-    int mark = newMark();
-    Plan plan = new Plan();
-    List<Constraint> todo = sources;
-    while (todo.length > 0) {
-      Constraint c = todo.removeLast();
-      if (c.output().mark != mark && c.inputsKnown(mark)) {
-        plan.addConstraint(c);
-        c.output().mark = mark;
-        addConstraintsConsumingTo(c.output(), todo);
-      }
-    }
-    return plan;
-  }
-
-  /**
-   * Extract a plan for resatisfying starting from the output of the
-   * given [constraints], usually a set of input constraints.
-   */
-  Plan extractPlanFromConstraints(List<Constraint> constraints) {
-    List<Constraint> sources = <Constraint>[];
-    for (int i = 0; i < constraints.length; i++) {
-      Constraint c = constraints[i];
-      // if not in plan already and eligible for inclusion.
-      if (c.isInput() && c.isSatisfied()) sources.add(c);
-    }
-    return makePlan(sources);
-  }
-
-  /**
-   * Recompute the walkabout strengths and stay flags of all variables
-   * downstream of the given constraint and recompute the actual
-   * values of all variables whose stay flag is true. If a cycle is
-   * detected, remove the given constraint and answer
-   * false. Otherwise, answer true.
-   * Details: Cycles are detected when a marked variable is
-   * encountered downstream of the given constraint. The sender is
-   * assumed to have marked the inputs of the given constraint with
-   * the given mark. Thus, encountering a marked node downstream of
-   * the output constraint means that there is a path from the
-   * constraint's output to one of its inputs.
-   */
-  bool addPropagate(Constraint c, int mark) {
-    List<Constraint> todo = <Constraint>[c];
-    while (todo.length > 0) {
-      Constraint d = todo.removeLast();
-      if (d.output().mark == mark) {
-        incrementalRemove(c);
-        return false;
-      }
-      d.recalculate();
-      addConstraintsConsumingTo(d.output(), todo);
-    }
-    return true;
-  }
-
-  /**
-   * Update the walkabout strengths and stay flags of all variables
-   * downstream of the given constraint. Answer a collection of
-   * unsatisfied constraints sorted in order of decreasing strength.
-   */
-  List<Constraint> removePropagateFrom(Variable out) {
-    out.determinedBy = null;
-    out.walkStrength = WEAKEST;
-    out.stay = true;
-    List<Constraint> unsatisfied = <Constraint>[];
-    List<Variable> todo = <Variable>[out];
-    while (todo.length > 0) {
-      Variable v = todo.removeLast();
-      for (int i = 0; i < v.constraints.length; i++) {
-        Constraint c = v.constraints[i];
-        if (!c.isSatisfied()) unsatisfied.add(c);
-      }
-      Constraint determining = v.determinedBy;
-      for (int i = 0; i < v.constraints.length; i++) {
-        Constraint next = v.constraints[i];
-        if (next != determining && next.isSatisfied()) {
-          next.recalculate();
-          todo.add(next.output());
-        }
-      }
-    }
-    return unsatisfied;
-  }
-
-  void addConstraintsConsumingTo(Variable v, List<Constraint> coll) {
-    Constraint determining = v.determinedBy;
-    for (int i = 0; i < v.constraints.length; i++) {
-      Constraint c = v.constraints[i];
-      if (c != determining && c.isSatisfied()) coll.add(c);
-    }
-  }
-}
-
-/**
- * A Plan is an ordered list of constraints to be executed in sequence
- * to resatisfy all currently satisfiable constraints in the face of
- * one or more changing inputs.
- */
-class Plan {
-  List<Constraint> list = <Constraint>[];
-
-  void addConstraint(Constraint c) {
-    list.add(c);
-  }
-
-  int size() => list.length;
-
-  void execute() {
-    for (int i = 0; i < list.length; i++) {
-      list[i].execute();
-    }
-  }
-}
-
-/**
- * This is the standard DeltaBlue benchmark. A long chain of equality
- * constraints is constructed with a stay constraint on one end. An
- * edit constraint is then added to the opposite end and the time is
- * measured for adding and removing this constraint, and extracting
- * and executing a constraint satisfaction plan. There are two cases.
- * In case 1, the added constraint is stronger than the stay
- * constraint and values must propagate down the entire length of the
- * chain. In case 2, the added constraint is weaker than the stay
- * constraint so it cannot be accommodated. The cost in this case is,
- * of course, very low. Typical situations lie somewhere between these
- * two extremes.
- */
-void chainTest(int n) {
-  planner = new Planner();
-  Variable prev = null, first = null, last = null;
-  // Build chain of n equality constraints.
-  for (int i = 0; i <= n; i++) {
-    Variable v = new Variable("v$i", 0);
-    if (prev != null) new EqualityConstraint(prev, v, REQUIRED);
-    if (i == 0) first = v;
-    if (i == n) last = v;
-    prev = v;
-  }
-  new StayConstraint(last, STRONG_DEFAULT);
-  EditConstraint edit = new EditConstraint(first, PREFERRED);
-  Plan plan = planner.extractPlanFromConstraints(<Constraint>[edit]);
-  for (int i = 0; i < 100; i++) {
-    first.value = i;
-    plan.execute();
-    if (last.value != i) {
-      print("Chain test failed:");
-      print("Expected last value to be $i but it was ${last.value}.");
-    }
-  }
-}
-
-/**
- * This test constructs a two sets of variables related to each
- * other by a simple linear transformation (scale and offset). The
- * time is measured to change a variable on either side of the
- * mapping and to change the scale and offset factors.
- */
-void projectionTest(int n) {
-  planner = new Planner();
-  Variable scale = new Variable("scale", 10);
-  Variable offset = new Variable("offset", 1000);
-  Variable src = null, dst = null;
-
-  List<Variable> dests = <Variable>[];
-  for (int i = 0; i < n; i++) {
-    src = new Variable("src", i);
-    dst = new Variable("dst", i);
-    dests.add(dst);
-    new StayConstraint(src, NORMAL);
-    new ScaleConstraint(src, scale, offset, dst, REQUIRED);
-  }
-  change(src, 17);
-  if (dst.value != 1170) print("Projection 1 failed");
-  change(dst, 1050);
-  if (src.value != 5) print("Projection 2 failed");
-  change(scale, 5);
-  for (int i = 0; i < n - 1; i++) {
-    if (dests[i].value != i * 5 + 1000) print("Projection 3 failed");
-  }
-  change(offset, 2000);
-  for (int i = 0; i < n - 1; i++) {
-    if (dests[i].value != i * 5 + 2000) print("Projection 4 failed");
-  }
-}
-
-void change(Variable v, int newValue) {
-  EditConstraint edit = new EditConstraint(v, PREFERRED);
-  Plan plan = planner.extractPlanFromConstraints(<EditConstraint>[edit]);
-  for (int i = 0; i < 10; i++) {
-    v.value = newValue;
-    plan.execute();
-  }
-  edit.destroyConstraint();
-}
-
-Planner planner;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.textual_outline.expect
deleted file mode 100644
index 55a63ae..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.textual_outline.expect
+++ /dev/null
@@ -1,154 +0,0 @@
-// @dart = 2.6
-main() {}
-
-class DeltaBlue {
-  void run() {}
-}
-
-class Strength {
-  final int value;
-  final String name;
-  const Strength(this.value, this.name);
-  Strength nextWeaker() => const <Strength>[
-        STRONG_PREFERRED,
-        PREFERRED,
-        STRONG_DEFAULT,
-        NORMAL,
-        WEAK_DEFAULT,
-        WEAKEST
-      ][value];
-  static bool stronger(Strength s1, Strength s2) {}
-  static bool weaker(Strength s1, Strength s2) {}
-  static Strength weakest(Strength s1, Strength s2) {}
-  static Strength strongest(Strength s1, Strength s2) {}
-}
-
-const REQUIRED = const Strength(0, "required");
-const STRONG_PREFERRED = const Strength(1, "strongPreferred");
-const PREFERRED = const Strength(2, "preferred");
-const STRONG_DEFAULT = const Strength(3, "strongDefault");
-const NORMAL = const Strength(4, "normal");
-const WEAK_DEFAULT = const Strength(5, "weakDefault");
-const WEAKEST = const Strength(6, "weakest");
-
-abstract class Constraint {
-  final Strength strength;
-  const Constraint(this.strength);
-  bool isSatisfied();
-  void markUnsatisfied();
-  void addToGraph();
-  void removeFromGraph();
-  void chooseMethod(int mark);
-  void markInputs(int mark);
-  bool inputsKnown(int mark);
-  Variable output();
-  void execute();
-  void recalculate();
-  void addConstraint() {}
-  Constraint satisfy(mark) {}
-  void destroyConstraint() {}
-  bool isInput() => false;
-}
-
-abstract class UnaryConstraint extends Constraint {
-  final Variable myOutput;
-  bool satisfied = false;
-  UnaryConstraint(this.myOutput, Strength strength) : super(strength) {}
-  void addToGraph() {}
-  void chooseMethod(int mark) {}
-  bool isSatisfied() => satisfied;
-  void markInputs(int mark) {}
-  Variable output() => myOutput;
-  void recalculate() {}
-  void markUnsatisfied() {}
-  bool inputsKnown(int mark) => true;
-  void removeFromGraph() {}
-}
-
-class StayConstraint extends UnaryConstraint {
-  StayConstraint(Variable v, Strength str) : super(v, str);
-  void execute() {}
-}
-
-class EditConstraint extends UnaryConstraint {
-  EditConstraint(Variable v, Strength str) : super(v, str);
-  bool isInput() => true;
-  void execute() {}
-}
-
-const int NONE = 1;
-const int FORWARD = 2;
-const int BACKWARD = 0;
-
-abstract class BinaryConstraint extends Constraint {
-  Variable v1;
-  Variable v2;
-  int direction = NONE;
-  BinaryConstraint(this.v1, this.v2, Strength strength) : super(strength) {}
-  void chooseMethod(int mark) {}
-  void addToGraph() {}
-  bool isSatisfied() => direction != NONE;
-  void markInputs(int mark) {}
-  Variable input() => direction == FORWARD ? v1 : v2;
-  Variable output() => direction == FORWARD ? v2 : v1;
-  void recalculate() {}
-  void markUnsatisfied() {}
-  bool inputsKnown(int mark) {}
-  void removeFromGraph() {}
-}
-
-class ScaleConstraint extends BinaryConstraint {
-  final Variable scale;
-  final Variable offset;
-  ScaleConstraint(
-      Variable src, this.scale, this.offset, Variable dest, Strength strength)
-      : super(src, dest, strength);
-  void addToGraph() {}
-  void removeFromGraph() {}
-  void markInputs(int mark) {}
-  void execute() {}
-  void recalculate() {}
-}
-
-class EqualityConstraint extends BinaryConstraint {
-  EqualityConstraint(Variable v1, Variable v2, Strength strength)
-      : super(v1, v2, strength);
-  void execute() {}
-}
-
-class Variable {
-  List<Constraint> constraints = <Constraint>[];
-  Constraint determinedBy;
-  int mark = 0;
-  Strength walkStrength = WEAKEST;
-  bool stay = true;
-  int value;
-  final String name;
-  Variable(this.name, this.value);
-  void addConstraint(Constraint c) {}
-  void removeConstraint(Constraint c) {}
-}
-
-class Planner {
-  int currentMark = 0;
-  void incrementalAdd(Constraint c) {}
-  void incrementalRemove(Constraint c) {}
-  int newMark() => ++currentMark;
-  Plan makePlan(List<Constraint> sources) {}
-  Plan extractPlanFromConstraints(List<Constraint> constraints) {}
-  bool addPropagate(Constraint c, int mark) {}
-  List<Constraint> removePropagateFrom(Variable out) {}
-  void addConstraintsConsumingTo(Variable v, List<Constraint> coll) {}
-}
-
-class Plan {
-  List<Constraint> list = <Constraint>[];
-  void addConstraint(Constraint c) {}
-  int size() => list.length;
-  void execute() {}
-}
-
-void chainTest(int n) {}
-void projectionTest(int n) {}
-void change(Variable v, int newValue) {}
-Planner planner;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.textual_outline_modelled.expect
deleted file mode 100644
index 65dc50b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,152 +0,0 @@
-// @dart = 2.6
-Planner planner;
-
-abstract class BinaryConstraint extends Constraint {
-  BinaryConstraint(this.v1, this.v2, Strength strength) : super(strength) {}
-  Variable input() => direction == FORWARD ? v1 : v2;
-  Variable output() => direction == FORWARD ? v2 : v1;
-  Variable v1;
-  Variable v2;
-  bool inputsKnown(int mark) {}
-  bool isSatisfied() => direction != NONE;
-  int direction = NONE;
-  void addToGraph() {}
-  void chooseMethod(int mark) {}
-  void markInputs(int mark) {}
-  void markUnsatisfied() {}
-  void recalculate() {}
-  void removeFromGraph() {}
-}
-
-abstract class Constraint {
-  Constraint satisfy(mark) {}
-  Variable output();
-  bool inputsKnown(int mark);
-  bool isInput() => false;
-  bool isSatisfied();
-  const Constraint(this.strength);
-  final Strength strength;
-  void addConstraint() {}
-  void addToGraph();
-  void chooseMethod(int mark);
-  void destroyConstraint() {}
-  void execute();
-  void markInputs(int mark);
-  void markUnsatisfied();
-  void recalculate();
-  void removeFromGraph();
-}
-
-abstract class UnaryConstraint extends Constraint {
-  UnaryConstraint(this.myOutput, Strength strength) : super(strength) {}
-  Variable output() => myOutput;
-  bool inputsKnown(int mark) => true;
-  bool isSatisfied() => satisfied;
-  bool satisfied = false;
-  final Variable myOutput;
-  void addToGraph() {}
-  void chooseMethod(int mark) {}
-  void markInputs(int mark) {}
-  void markUnsatisfied() {}
-  void recalculate() {}
-  void removeFromGraph() {}
-}
-
-class DeltaBlue {
-  void run() {}
-}
-
-class EditConstraint extends UnaryConstraint {
-  EditConstraint(Variable v, Strength str) : super(v, str);
-  bool isInput() => true;
-  void execute() {}
-}
-
-class EqualityConstraint extends BinaryConstraint {
-  EqualityConstraint(Variable v1, Variable v2, Strength strength)
-      : super(v1, v2, strength);
-  void execute() {}
-}
-
-class Plan {
-  List<Constraint> list = <Constraint>[];
-  int size() => list.length;
-  void addConstraint(Constraint c) {}
-  void execute() {}
-}
-
-class Planner {
-  List<Constraint> removePropagateFrom(Variable out) {}
-  Plan extractPlanFromConstraints(List<Constraint> constraints) {}
-  Plan makePlan(List<Constraint> sources) {}
-  bool addPropagate(Constraint c, int mark) {}
-  int currentMark = 0;
-  int newMark() => ++currentMark;
-  void addConstraintsConsumingTo(Variable v, List<Constraint> coll) {}
-  void incrementalAdd(Constraint c) {}
-  void incrementalRemove(Constraint c) {}
-}
-
-class ScaleConstraint extends BinaryConstraint {
-  ScaleConstraint(
-      Variable src, this.scale, this.offset, Variable dest, Strength strength)
-      : super(src, dest, strength);
-  final Variable offset;
-  final Variable scale;
-  void addToGraph() {}
-  void execute() {}
-  void markInputs(int mark) {}
-  void recalculate() {}
-  void removeFromGraph() {}
-}
-
-class StayConstraint extends UnaryConstraint {
-  StayConstraint(Variable v, Strength str) : super(v, str);
-  void execute() {}
-}
-
-class Strength {
-  Strength nextWeaker() => const <Strength>[
-        STRONG_PREFERRED,
-        PREFERRED,
-        STRONG_DEFAULT,
-        NORMAL,
-        WEAK_DEFAULT,
-        WEAKEST
-      ][value];
-  const Strength(this.value, this.name);
-  final String name;
-  final int value;
-  static Strength strongest(Strength s1, Strength s2) {}
-  static Strength weakest(Strength s1, Strength s2) {}
-  static bool stronger(Strength s1, Strength s2) {}
-  static bool weaker(Strength s1, Strength s2) {}
-}
-
-class Variable {
-  Constraint determinedBy;
-  List<Constraint> constraints = <Constraint>[];
-  Strength walkStrength = WEAKEST;
-  Variable(this.name, this.value);
-  bool stay = true;
-  final String name;
-  int mark = 0;
-  int value;
-  void addConstraint(Constraint c) {}
-  void removeConstraint(Constraint c) {}
-}
-
-const NORMAL = const Strength(4, "normal");
-const PREFERRED = const Strength(2, "preferred");
-const REQUIRED = const Strength(0, "required");
-const STRONG_DEFAULT = const Strength(3, "strongDefault");
-const STRONG_PREFERRED = const Strength(1, "strongPreferred");
-const WEAKEST = const Strength(6, "weakest");
-const WEAK_DEFAULT = const Strength(5, "weakDefault");
-const int BACKWARD = 0;
-const int FORWARD = 2;
-const int NONE = 1;
-main() {}
-void chainTest(int n) {}
-void change(Variable v, int newValue) {}
-void projectionTest(int n) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.expect
deleted file mode 100644
index 2f3b038..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.expect
+++ /dev/null
@@ -1,541 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class DeltaBlue extends core::Object {
-  synthetic constructor •() → self::DeltaBlue*
-    : super core::Object::•()
-    ;
-  method run() → void {
-    self::chainTest(100);
-    self::projectionTest(100);
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Strength extends core::Object /*hasConstConstructor*/  {
-  final field core::int* value;
-  final field core::String* name;
-  const constructor •(core::int* value, core::String* name) → self::Strength*
-    : self::Strength::value = value, self::Strength::name = name, super core::Object::•()
-    ;
-  method nextWeaker() → self::Strength*
-    return (#C19).{core::List::[]}(this.{self::Strength::value});
-  static method stronger(self::Strength* s1, self::Strength* s2) → core::bool* {
-    return s1.{self::Strength::value}.{core::num::<}(s2.{self::Strength::value});
-  }
-  static method weaker(self::Strength* s1, self::Strength* s2) → core::bool* {
-    return s1.{self::Strength::value}.{core::num::>}(s2.{self::Strength::value});
-  }
-  static method weakest(self::Strength* s1, self::Strength* s2) → self::Strength* {
-    return self::Strength::weaker(s1, s2) ?{self::Strength*} s1 : s2;
-  }
-  static method strongest(self::Strength* s1, self::Strength* s2) → self::Strength* {
-    return self::Strength::stronger(s1, s2) ?{self::Strength*} s1 : s2;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Constraint extends core::Object /*hasConstConstructor*/  {
-  final field self::Strength* strength;
-  const constructor •(self::Strength* strength) → self::Constraint*
-    : self::Constraint::strength = strength, super core::Object::•()
-    ;
-  abstract method isSatisfied() → core::bool*;
-  abstract method markUnsatisfied() → void;
-  abstract method addToGraph() → void;
-  abstract method removeFromGraph() → void;
-  abstract method chooseMethod(core::int* mark) → void;
-  abstract method markInputs(core::int* mark) → void;
-  abstract method inputsKnown(core::int* mark) → core::bool*;
-  abstract method output() → self::Variable*;
-  abstract method execute() → void;
-  abstract method recalculate() → void;
-  method addConstraint() → void {
-    this.{self::Constraint::addToGraph}();
-    self::planner.{self::Planner::incrementalAdd}(this);
-  }
-  method satisfy(dynamic mark) → self::Constraint* {
-    this.{self::Constraint::chooseMethod}(mark as{TypeError,ForDynamic} core::int*);
-    if(!this.{self::Constraint::isSatisfied}()) {
-      if(this.{self::Constraint::strength}.{self::Strength::==}(#C22)) {
-        core::print("Could not satisfy a required constraint!");
-      }
-      return null;
-    }
-    this.{self::Constraint::markInputs}(mark as{TypeError,ForDynamic} core::int*);
-    self::Variable* out = this.{self::Constraint::output}();
-    self::Constraint* overridden = out.{self::Variable::determinedBy};
-    if(!overridden.{self::Constraint::==}(null))
-      overridden.{self::Constraint::markUnsatisfied}();
-    out.{self::Variable::determinedBy} = this;
-    if(!self::planner.{self::Planner::addPropagate}(this, mark as{TypeError,ForDynamic} core::int*))
-      core::print("Cycle encountered");
-    out.{self::Variable::mark} = mark as{TypeError,ForDynamic} core::int*;
-    return overridden;
-  }
-  method destroyConstraint() → void {
-    if(this.{self::Constraint::isSatisfied}())
-      self::planner.{self::Planner::incrementalRemove}(this);
-    this.{self::Constraint::removeFromGraph}();
-  }
-  method isInput() → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class UnaryConstraint extends self::Constraint {
-  final field self::Variable* myOutput;
-  field core::bool* satisfied = false;
-  constructor •(self::Variable* myOutput, self::Strength* strength) → self::UnaryConstraint*
-    : self::UnaryConstraint::myOutput = myOutput, super self::Constraint::•(strength) {
-    this.{self::Constraint::addConstraint}();
-  }
-  method addToGraph() → void {
-    this.{self::UnaryConstraint::myOutput}.{self::Variable::addConstraint}(this);
-    this.{self::UnaryConstraint::satisfied} = false;
-  }
-  method chooseMethod(core::int* mark) → void {
-    this.{self::UnaryConstraint::satisfied} = !this.{self::UnaryConstraint::myOutput}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::UnaryConstraint::myOutput}.{self::Variable::walkStrength});
-  }
-  method isSatisfied() → core::bool*
-    return this.{self::UnaryConstraint::satisfied};
-  method markInputs(core::int* mark) → void {}
-  method output() → self::Variable*
-    return this.{self::UnaryConstraint::myOutput};
-  method recalculate() → void {
-    this.{self::UnaryConstraint::myOutput}.{self::Variable::walkStrength} = this.{self::Constraint::strength};
-    this.{self::UnaryConstraint::myOutput}.{self::Variable::stay} = !this.{self::Constraint::isInput}();
-    if(this.{self::UnaryConstraint::myOutput}.{self::Variable::stay})
-      this.{self::Constraint::execute}();
-  }
-  method markUnsatisfied() → void {
-    this.{self::UnaryConstraint::satisfied} = false;
-  }
-  method inputsKnown(core::int* mark) → core::bool*
-    return true;
-  method removeFromGraph() → void {
-    if(!this.{self::UnaryConstraint::myOutput}.{self::Variable::==}(null))
-      this.{self::UnaryConstraint::myOutput}.{self::Variable::removeConstraint}(this);
-    this.{self::UnaryConstraint::satisfied} = false;
-  }
-}
-class StayConstraint extends self::UnaryConstraint {
-  constructor •(self::Variable* v, self::Strength* str) → self::StayConstraint*
-    : super self::UnaryConstraint::•(v, str)
-    ;
-  method execute() → void {}
-}
-class EditConstraint extends self::UnaryConstraint {
-  constructor •(self::Variable* v, self::Strength* str) → self::EditConstraint*
-    : super self::UnaryConstraint::•(v, str)
-    ;
-  method isInput() → core::bool*
-    return true;
-  method execute() → void {}
-}
-abstract class BinaryConstraint extends self::Constraint {
-  field self::Variable* v1;
-  field self::Variable* v2;
-  field core::int* direction = #C1;
-  constructor •(self::Variable* v1, self::Variable* v2, self::Strength* strength) → self::BinaryConstraint*
-    : self::BinaryConstraint::v1 = v1, self::BinaryConstraint::v2 = v2, super self::Constraint::•(strength) {
-    this.{self::Constraint::addConstraint}();
-  }
-  method chooseMethod(core::int* mark) → void {
-    if(this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int*} #C4 : #C1;
-    }
-    if(this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int*} #C20 : #C1;
-    }
-    if(self::Strength::weaker(this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength})) {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int*} #C20 : #C1;
-    }
-    else {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int*} #C4 : #C20;
-    }
-  }
-  method addToGraph() → void {
-    this.{self::BinaryConstraint::v1}.{self::Variable::addConstraint}(this);
-    this.{self::BinaryConstraint::v2}.{self::Variable::addConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
-  }
-  method isSatisfied() → core::bool*
-    return !this.{self::BinaryConstraint::direction}.{core::num::==}(#C1);
-  method markInputs(core::int* mark) → void {
-    this.{self::BinaryConstraint::input}().{self::Variable::mark} = mark;
-  }
-  method input() → self::Variable*
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable*} this.{self::BinaryConstraint::v1} : this.{self::BinaryConstraint::v2};
-  method output() → self::Variable*
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable*} this.{self::BinaryConstraint::v2} : this.{self::BinaryConstraint::v1};
-  method recalculate() → void {
-    self::Variable* ihn = this.{self::BinaryConstraint::input}();
-    self::Variable* out = this.{self::BinaryConstraint::output}();
-    out.{self::Variable::walkStrength} = self::Strength::weakest(this.{self::Constraint::strength}, ihn.{self::Variable::walkStrength});
-    out.{self::Variable::stay} = ihn.{self::Variable::stay};
-    if(out.{self::Variable::stay})
-      this.{self::Constraint::execute}();
-  }
-  method markUnsatisfied() → void {
-    this.{self::BinaryConstraint::direction} = #C1;
-  }
-  method inputsKnown(core::int* mark) → core::bool* {
-    self::Variable* i = this.{self::BinaryConstraint::input}();
-    return i.{self::Variable::mark}.{core::num::==}(mark) || i.{self::Variable::stay} || i.{self::Variable::determinedBy}.{self::Constraint::==}(null);
-  }
-  method removeFromGraph() → void {
-    if(!this.{self::BinaryConstraint::v1}.{self::Variable::==}(null))
-      this.{self::BinaryConstraint::v1}.{self::Variable::removeConstraint}(this);
-    if(!this.{self::BinaryConstraint::v2}.{self::Variable::==}(null))
-      this.{self::BinaryConstraint::v2}.{self::Variable::removeConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
-  }
-}
-class ScaleConstraint extends self::BinaryConstraint {
-  final field self::Variable* scale;
-  final field self::Variable* offset;
-  constructor •(self::Variable* src, self::Variable* scale, self::Variable* offset, self::Variable* dest, self::Strength* strength) → self::ScaleConstraint*
-    : self::ScaleConstraint::scale = scale, self::ScaleConstraint::offset = offset, super self::BinaryConstraint::•(src, dest, strength)
-    ;
-  method addToGraph() → void {
-    super.{self::BinaryConstraint::addToGraph}();
-    this.{self::ScaleConstraint::scale}.{self::Variable::addConstraint}(this);
-    this.{self::ScaleConstraint::offset}.{self::Variable::addConstraint}(this);
-  }
-  method removeFromGraph() → void {
-    super.{self::BinaryConstraint::removeFromGraph}();
-    if(!this.{self::ScaleConstraint::scale}.{self::Variable::==}(null))
-      this.{self::ScaleConstraint::scale}.{self::Variable::removeConstraint}(this);
-    if(!this.{self::ScaleConstraint::offset}.{self::Variable::==}(null))
-      this.{self::ScaleConstraint::offset}.{self::Variable::removeConstraint}(this);
-  }
-  method markInputs(core::int* mark) → void {
-    super.{self::BinaryConstraint::markInputs}(mark);
-    this.{self::ScaleConstraint::scale}.{self::Variable::mark} = this.{self::ScaleConstraint::offset}.{self::Variable::mark} = mark;
-  }
-  method execute() → void {
-    if(this.{self::BinaryConstraint::direction}.{core::num::==}(#C4)) {
-      this.{self::BinaryConstraint::v2}.{self::Variable::value} = this.{self::BinaryConstraint::v1}.{self::Variable::value}.{core::num::*}(this.{self::ScaleConstraint::scale}.{self::Variable::value}).{core::num::+}(this.{self::ScaleConstraint::offset}.{self::Variable::value});
-    }
-    else {
-      this.{self::BinaryConstraint::v1}.{self::Variable::value} = this.{self::BinaryConstraint::v2}.{self::Variable::value}.{core::num::-}(this.{self::ScaleConstraint::offset}.{self::Variable::value}).{core::num::~/}(this.{self::ScaleConstraint::scale}.{self::Variable::value});
-    }
-  }
-  method recalculate() → void {
-    self::Variable* ihn = this.{self::BinaryConstraint::input}();
-    self::Variable* out = this.{self::BinaryConstraint::output}();
-    out.{self::Variable::walkStrength} = self::Strength::weakest(this.{self::Constraint::strength}, ihn.{self::Variable::walkStrength});
-    out.{self::Variable::stay} = ihn.{self::Variable::stay} && this.{self::ScaleConstraint::scale}.{self::Variable::stay} && this.{self::ScaleConstraint::offset}.{self::Variable::stay};
-    if(out.{self::Variable::stay})
-      this.{self::ScaleConstraint::execute}();
-  }
-}
-class EqualityConstraint extends self::BinaryConstraint {
-  constructor •(self::Variable* v1, self::Variable* v2, self::Strength* strength) → self::EqualityConstraint*
-    : super self::BinaryConstraint::•(v1, v2, strength)
-    ;
-  method execute() → void {
-    this.{self::BinaryConstraint::output}().{self::Variable::value} = this.{self::BinaryConstraint::input}().{self::Variable::value};
-  }
-}
-class Variable extends core::Object {
-  field core::List<self::Constraint*>* constraints = <self::Constraint*>[];
-  field self::Constraint* determinedBy = null;
-  field core::int* mark = 0;
-  field self::Strength* walkStrength = #C18;
-  field core::bool* stay = true;
-  field core::int* value;
-  final field core::String* name;
-  constructor •(core::String* name, core::int* value) → self::Variable*
-    : self::Variable::name = name, self::Variable::value = value, super core::Object::•()
-    ;
-  method addConstraint(self::Constraint* c) → void {
-    this.{self::Variable::constraints}.{core::List::add}(c);
-  }
-  method removeConstraint(self::Constraint* c) → void {
-    this.{self::Variable::constraints}.{core::List::remove}(c);
-    if(this.{self::Variable::determinedBy}.{self::Constraint::==}(c))
-      this.{self::Variable::determinedBy} = null;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Planner extends core::Object {
-  field core::int* currentMark = 0;
-  synthetic constructor •() → self::Planner*
-    : super core::Object::•()
-    ;
-  method incrementalAdd(self::Constraint* c) → void {
-    core::int* mark = this.{self::Planner::newMark}();
-    for (self::Constraint* overridden = c.{self::Constraint::satisfy}(mark); !overridden.{self::Constraint::==}(null); overridden = overridden.{self::Constraint::satisfy}(mark))
-      ;
-  }
-  method incrementalRemove(self::Constraint* c) → void {
-    self::Variable* out = c.{self::Constraint::output}();
-    c.{self::Constraint::markUnsatisfied}();
-    c.{self::Constraint::removeFromGraph}();
-    core::List<self::Constraint*>* unsatisfied = this.{self::Planner::removePropagateFrom}(out);
-    self::Strength* strength = #C22;
-    do {
-      for (core::int* i = 0; i.{core::num::<}(unsatisfied.{core::List::length}); i = i.{core::num::+}(1)) {
-        self::Constraint* u = unsatisfied.{core::List::[]}(i);
-        if(u.{self::Constraint::strength}.{self::Strength::==}(strength))
-          this.{self::Planner::incrementalAdd}(u);
-      }
-      strength = strength.{self::Strength::nextWeaker}();
-    }
-    while (!strength.{self::Strength::==}(#C18))
-  }
-  method newMark() → core::int*
-    return this.{self::Planner::currentMark} = this.{self::Planner::currentMark}.{core::num::+}(1);
-  method makePlan(core::List<self::Constraint*>* sources) → self::Plan* {
-    core::int* mark = this.{self::Planner::newMark}();
-    self::Plan* plan = new self::Plan::•();
-    core::List<self::Constraint*>* todo = sources;
-    while (todo.{core::List::length}.{core::num::>}(0)) {
-      self::Constraint* c = todo.{core::List::removeLast}();
-      if(!c.{self::Constraint::output}().{self::Variable::mark}.{core::num::==}(mark) && c.{self::Constraint::inputsKnown}(mark)) {
-        plan.{self::Plan::addConstraint}(c);
-        c.{self::Constraint::output}().{self::Variable::mark} = mark;
-        this.{self::Planner::addConstraintsConsumingTo}(c.{self::Constraint::output}(), todo);
-      }
-    }
-    return plan;
-  }
-  method extractPlanFromConstraints(core::List<self::Constraint*>* constraints) → self::Plan* {
-    core::List<self::Constraint*>* sources = <self::Constraint*>[];
-    for (core::int* i = 0; i.{core::num::<}(constraints.{core::List::length}); i = i.{core::num::+}(1)) {
-      self::Constraint* c = constraints.{core::List::[]}(i);
-      if(c.{self::Constraint::isInput}() && c.{self::Constraint::isSatisfied}())
-        sources.{core::List::add}(c);
-    }
-    return this.{self::Planner::makePlan}(sources);
-  }
-  method addPropagate(self::Constraint* c, core::int* mark) → core::bool* {
-    core::List<self::Constraint*>* todo = <self::Constraint*>[c];
-    while (todo.{core::List::length}.{core::num::>}(0)) {
-      self::Constraint* d = todo.{core::List::removeLast}();
-      if(d.{self::Constraint::output}().{self::Variable::mark}.{core::num::==}(mark)) {
-        this.{self::Planner::incrementalRemove}(c);
-        return false;
-      }
-      d.{self::Constraint::recalculate}();
-      this.{self::Planner::addConstraintsConsumingTo}(d.{self::Constraint::output}(), todo);
-    }
-    return true;
-  }
-  method removePropagateFrom(self::Variable* out) → core::List<self::Constraint*>* {
-    out.{self::Variable::determinedBy} = null;
-    out.{self::Variable::walkStrength} = #C18;
-    out.{self::Variable::stay} = true;
-    core::List<self::Constraint*>* unsatisfied = <self::Constraint*>[];
-    core::List<self::Variable*>* todo = <self::Variable*>[out];
-    while (todo.{core::List::length}.{core::num::>}(0)) {
-      self::Variable* v = todo.{core::List::removeLast}();
-      for (core::int* i = 0; i.{core::num::<}(v.{self::Variable::constraints}.{core::List::length}); i = i.{core::num::+}(1)) {
-        self::Constraint* c = v.{self::Variable::constraints}.{core::List::[]}(i);
-        if(!c.{self::Constraint::isSatisfied}())
-          unsatisfied.{core::List::add}(c);
-      }
-      self::Constraint* determining = v.{self::Variable::determinedBy};
-      for (core::int* i = 0; i.{core::num::<}(v.{self::Variable::constraints}.{core::List::length}); i = i.{core::num::+}(1)) {
-        self::Constraint* next = v.{self::Variable::constraints}.{core::List::[]}(i);
-        if(!next.{self::Constraint::==}(determining) && next.{self::Constraint::isSatisfied}()) {
-          next.{self::Constraint::recalculate}();
-          todo.{core::List::add}(next.{self::Constraint::output}());
-        }
-      }
-    }
-    return unsatisfied;
-  }
-  method addConstraintsConsumingTo(self::Variable* v, core::List<self::Constraint*>* coll) → void {
-    self::Constraint* determining = v.{self::Variable::determinedBy};
-    for (core::int* i = 0; i.{core::num::<}(v.{self::Variable::constraints}.{core::List::length}); i = i.{core::num::+}(1)) {
-      self::Constraint* c = v.{self::Variable::constraints}.{core::List::[]}(i);
-      if(!c.{self::Constraint::==}(determining) && c.{self::Constraint::isSatisfied}())
-        coll.{core::List::add}(c);
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Plan extends core::Object {
-  field core::List<self::Constraint*>* list = <self::Constraint*>[];
-  synthetic constructor •() → self::Plan*
-    : super core::Object::•()
-    ;
-  method addConstraint(self::Constraint* c) → void {
-    this.{self::Plan::list}.{core::List::add}(c);
-  }
-  method size() → core::int*
-    return this.{self::Plan::list}.{core::List::length};
-  method execute() → void {
-    for (core::int* i = 0; i.{core::num::<}(this.{self::Plan::list}.{core::List::length}); i = i.{core::num::+}(1)) {
-      this.{self::Plan::list}.{core::List::[]}(i).{self::Constraint::execute}();
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field self::Strength* REQUIRED = #C22;
-static const field self::Strength* STRONG_PREFERRED = #C3;
-static const field self::Strength* PREFERRED = #C6;
-static const field self::Strength* STRONG_DEFAULT = #C9;
-static const field self::Strength* NORMAL = #C12;
-static const field self::Strength* WEAK_DEFAULT = #C15;
-static const field self::Strength* WEAKEST = #C18;
-static const field core::int* NONE = #C1;
-static const field core::int* FORWARD = #C4;
-static const field core::int* BACKWARD = #C20;
-static field self::Planner* planner;
-static method main() → dynamic {
-  new self::DeltaBlue::•().{self::DeltaBlue::run}();
-}
-static method chainTest(core::int* n) → void {
-  self::planner = new self::Planner::•();
-  self::Variable* prev = null;
-  self::Variable* first = null;
-  self::Variable* last = null;
-  for (core::int* i = 0; i.{core::num::<=}(n); i = i.{core::num::+}(1)) {
-    self::Variable* v = new self::Variable::•("v${i}", 0);
-    if(!prev.{self::Variable::==}(null))
-      new self::EqualityConstraint::•(prev, v, #C22);
-    if(i.{core::num::==}(0))
-      first = v;
-    if(i.{core::num::==}(n))
-      last = v;
-    prev = v;
-  }
-  new self::StayConstraint::•(last, #C9);
-  self::EditConstraint* edit = new self::EditConstraint::•(first, #C6);
-  self::Plan* plan = self::planner.{self::Planner::extractPlanFromConstraints}(<self::Constraint*>[edit]);
-  for (core::int* i = 0; i.{core::num::<}(100); i = i.{core::num::+}(1)) {
-    first.{self::Variable::value} = i;
-    plan.{self::Plan::execute}();
-    if(!last.{self::Variable::value}.{core::num::==}(i)) {
-      core::print("Chain test failed:");
-      core::print("Expected last value to be ${i} but it was ${last.{self::Variable::value}}.");
-    }
-  }
-}
-static method projectionTest(core::int* n) → void {
-  self::planner = new self::Planner::•();
-  self::Variable* scale = new self::Variable::•("scale", 10);
-  self::Variable* offset = new self::Variable::•("offset", 1000);
-  self::Variable* src = null;
-  self::Variable* dst = null;
-  core::List<self::Variable*>* dests = <self::Variable*>[];
-  for (core::int* i = 0; i.{core::num::<}(n); i = i.{core::num::+}(1)) {
-    src = new self::Variable::•("src", i);
-    dst = new self::Variable::•("dst", i);
-    dests.{core::List::add}(dst);
-    new self::StayConstraint::•(src, #C12);
-    new self::ScaleConstraint::•(src, scale, offset, dst, #C22);
-  }
-  self::change(src, 17);
-  if(!dst.{self::Variable::value}.{core::num::==}(1170))
-    core::print("Projection 1 failed");
-  self::change(dst, 1050);
-  if(!src.{self::Variable::value}.{core::num::==}(5))
-    core::print("Projection 2 failed");
-  self::change(scale, 5);
-  for (core::int* i = 0; i.{core::num::<}(n.{core::num::-}(1)); i = i.{core::num::+}(1)) {
-    if(!dests.{core::List::[]}(i).{self::Variable::value}.{core::num::==}(i.{core::num::*}(5).{core::num::+}(1000)))
-      core::print("Projection 3 failed");
-  }
-  self::change(offset, 2000);
-  for (core::int* i = 0; i.{core::num::<}(n.{core::num::-}(1)); i = i.{core::num::+}(1)) {
-    if(!dests.{core::List::[]}(i).{self::Variable::value}.{core::num::==}(i.{core::num::*}(5).{core::num::+}(2000)))
-      core::print("Projection 4 failed");
-  }
-}
-static method change(self::Variable* v, core::int* newValue) → void {
-  self::EditConstraint* edit = new self::EditConstraint::•(v, #C6);
-  self::Plan* plan = self::planner.{self::Planner::extractPlanFromConstraints}(<self::EditConstraint*>[edit]);
-  for (core::int* i = 0; i.{core::num::<}(10); i = i.{core::num::+}(1)) {
-    v.{self::Variable::value} = newValue;
-    plan.{self::Plan::execute}();
-  }
-  edit.{self::Constraint::destroyConstraint}();
-}
-
-constants  {
-  #C1 = 1
-  #C2 = "strongPreferred"
-  #C3 = self::Strength {value:#C1, name:#C2}
-  #C4 = 2
-  #C5 = "preferred"
-  #C6 = self::Strength {value:#C4, name:#C5}
-  #C7 = 3
-  #C8 = "strongDefault"
-  #C9 = self::Strength {value:#C7, name:#C8}
-  #C10 = 4
-  #C11 = "normal"
-  #C12 = self::Strength {value:#C10, name:#C11}
-  #C13 = 5
-  #C14 = "weakDefault"
-  #C15 = self::Strength {value:#C13, name:#C14}
-  #C16 = 6
-  #C17 = "weakest"
-  #C18 = self::Strength {value:#C16, name:#C17}
-  #C19 = <self::Strength*>[#C3, #C6, #C9, #C12, #C15, #C18]
-  #C20 = 0
-  #C21 = "required"
-  #C22 = self::Strength {value:#C20, name:#C21}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///DeltaBlue.dart:
-- Strength. (from org-dartlang-testcase:///DeltaBlue.dart:61:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.outline.expect
deleted file mode 100644
index a1719a9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.outline.expect
+++ /dev/null
@@ -1,275 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class DeltaBlue extends core::Object {
-  synthetic constructor •() → self::DeltaBlue*
-    ;
-  method run() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Strength extends core::Object /*hasConstConstructor*/  {
-  final field core::int* value;
-  final field core::String* name;
-  const constructor •(core::int* value, core::String* name) → self::Strength*
-    : self::Strength::value = value, self::Strength::name = name, super core::Object::•()
-    ;
-  method nextWeaker() → self::Strength*
-    ;
-  static method stronger(self::Strength* s1, self::Strength* s2) → core::bool*
-    ;
-  static method weaker(self::Strength* s1, self::Strength* s2) → core::bool*
-    ;
-  static method weakest(self::Strength* s1, self::Strength* s2) → self::Strength*
-    ;
-  static method strongest(self::Strength* s1, self::Strength* s2) → self::Strength*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Constraint extends core::Object /*hasConstConstructor*/  {
-  final field self::Strength* strength;
-  const constructor •(self::Strength* strength) → self::Constraint*
-    : self::Constraint::strength = strength, super core::Object::•()
-    ;
-  abstract method isSatisfied() → core::bool*;
-  abstract method markUnsatisfied() → void;
-  abstract method addToGraph() → void;
-  abstract method removeFromGraph() → void;
-  abstract method chooseMethod(core::int* mark) → void;
-  abstract method markInputs(core::int* mark) → void;
-  abstract method inputsKnown(core::int* mark) → core::bool*;
-  abstract method output() → self::Variable*;
-  abstract method execute() → void;
-  abstract method recalculate() → void;
-  method addConstraint() → void
-    ;
-  method satisfy(dynamic mark) → self::Constraint*
-    ;
-  method destroyConstraint() → void
-    ;
-  method isInput() → core::bool*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class UnaryConstraint extends self::Constraint {
-  final field self::Variable* myOutput;
-  field core::bool* satisfied;
-  constructor •(self::Variable* myOutput, self::Strength* strength) → self::UnaryConstraint*
-    ;
-  method addToGraph() → void
-    ;
-  method chooseMethod(core::int* mark) → void
-    ;
-  method isSatisfied() → core::bool*
-    ;
-  method markInputs(core::int* mark) → void
-    ;
-  method output() → self::Variable*
-    ;
-  method recalculate() → void
-    ;
-  method markUnsatisfied() → void
-    ;
-  method inputsKnown(core::int* mark) → core::bool*
-    ;
-  method removeFromGraph() → void
-    ;
-}
-class StayConstraint extends self::UnaryConstraint {
-  constructor •(self::Variable* v, self::Strength* str) → self::StayConstraint*
-    ;
-  method execute() → void
-    ;
-}
-class EditConstraint extends self::UnaryConstraint {
-  constructor •(self::Variable* v, self::Strength* str) → self::EditConstraint*
-    ;
-  method isInput() → core::bool*
-    ;
-  method execute() → void
-    ;
-}
-abstract class BinaryConstraint extends self::Constraint {
-  field self::Variable* v1;
-  field self::Variable* v2;
-  field core::int* direction;
-  constructor •(self::Variable* v1, self::Variable* v2, self::Strength* strength) → self::BinaryConstraint*
-    ;
-  method chooseMethod(core::int* mark) → void
-    ;
-  method addToGraph() → void
-    ;
-  method isSatisfied() → core::bool*
-    ;
-  method markInputs(core::int* mark) → void
-    ;
-  method input() → self::Variable*
-    ;
-  method output() → self::Variable*
-    ;
-  method recalculate() → void
-    ;
-  method markUnsatisfied() → void
-    ;
-  method inputsKnown(core::int* mark) → core::bool*
-    ;
-  method removeFromGraph() → void
-    ;
-}
-class ScaleConstraint extends self::BinaryConstraint {
-  final field self::Variable* scale;
-  final field self::Variable* offset;
-  constructor •(self::Variable* src, self::Variable* scale, self::Variable* offset, self::Variable* dest, self::Strength* strength) → self::ScaleConstraint*
-    ;
-  method addToGraph() → void
-    ;
-  method removeFromGraph() → void
-    ;
-  method markInputs(core::int* mark) → void
-    ;
-  method execute() → void
-    ;
-  method recalculate() → void
-    ;
-}
-class EqualityConstraint extends self::BinaryConstraint {
-  constructor •(self::Variable* v1, self::Variable* v2, self::Strength* strength) → self::EqualityConstraint*
-    ;
-  method execute() → void
-    ;
-}
-class Variable extends core::Object {
-  field core::List<self::Constraint*>* constraints;
-  field self::Constraint* determinedBy;
-  field core::int* mark;
-  field self::Strength* walkStrength;
-  field core::bool* stay;
-  field core::int* value;
-  final field core::String* name;
-  constructor •(core::String* name, core::int* value) → self::Variable*
-    ;
-  method addConstraint(self::Constraint* c) → void
-    ;
-  method removeConstraint(self::Constraint* c) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Planner extends core::Object {
-  field core::int* currentMark;
-  synthetic constructor •() → self::Planner*
-    ;
-  method incrementalAdd(self::Constraint* c) → void
-    ;
-  method incrementalRemove(self::Constraint* c) → void
-    ;
-  method newMark() → core::int*
-    ;
-  method makePlan(core::List<self::Constraint*>* sources) → self::Plan*
-    ;
-  method extractPlanFromConstraints(core::List<self::Constraint*>* constraints) → self::Plan*
-    ;
-  method addPropagate(self::Constraint* c, core::int* mark) → core::bool*
-    ;
-  method removePropagateFrom(self::Variable* out) → core::List<self::Constraint*>*
-    ;
-  method addConstraintsConsumingTo(self::Variable* v, core::List<self::Constraint*>* coll) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Plan extends core::Object {
-  field core::List<self::Constraint*>* list;
-  synthetic constructor •() → self::Plan*
-    ;
-  method addConstraint(self::Constraint* c) → void
-    ;
-  method size() → core::int*
-    ;
-  method execute() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field self::Strength* REQUIRED = const self::Strength::•(0, "required");
-static const field self::Strength* STRONG_PREFERRED = const self::Strength::•(1, "strongPreferred");
-static const field self::Strength* PREFERRED = const self::Strength::•(2, "preferred");
-static const field self::Strength* STRONG_DEFAULT = const self::Strength::•(3, "strongDefault");
-static const field self::Strength* NORMAL = const self::Strength::•(4, "normal");
-static const field self::Strength* WEAK_DEFAULT = const self::Strength::•(5, "weakDefault");
-static const field self::Strength* WEAKEST = const self::Strength::•(6, "weakest");
-static const field core::int* NONE = 1;
-static const field core::int* FORWARD = 2;
-static const field core::int* BACKWARD = 0;
-static field self::Planner* planner;
-static method main() → dynamic
-  ;
-static method chainTest(core::int* n) → void
-  ;
-static method projectionTest(core::int* n) → void
-  ;
-static method change(self::Variable* v, core::int* newValue) → void
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///DeltaBlue.dart:90:24 -> InstanceConstant(const Strength{Strength.value: 0, Strength.name: "required"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///DeltaBlue.dart:91:32 -> InstanceConstant(const Strength{Strength.value: 1, Strength.name: "strongPreferred"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///DeltaBlue.dart:92:25 -> InstanceConstant(const Strength{Strength.value: 2, Strength.name: "preferred"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///DeltaBlue.dart:93:30 -> InstanceConstant(const Strength{Strength.value: 3, Strength.name: "strongDefault"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///DeltaBlue.dart:94:22 -> InstanceConstant(const Strength{Strength.value: 4, Strength.name: "normal"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///DeltaBlue.dart:95:28 -> InstanceConstant(const Strength{Strength.value: 5, Strength.name: "weakDefault"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///DeltaBlue.dart:96:23 -> InstanceConstant(const Strength{Strength.value: 6, Strength.name: "weakest"})
-Extra constant evaluation: evaluated: 10, effectively constant: 7
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.transformed.expect
deleted file mode 100644
index 20311a0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/DeltaBlue.dart.weak.transformed.expect
+++ /dev/null
@@ -1,541 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class DeltaBlue extends core::Object {
-  synthetic constructor •() → self::DeltaBlue*
-    : super core::Object::•()
-    ;
-  method run() → void {
-    self::chainTest(100);
-    self::projectionTest(100);
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Strength extends core::Object /*hasConstConstructor*/  {
-  final field core::int* value;
-  final field core::String* name;
-  const constructor •(core::int* value, core::String* name) → self::Strength*
-    : self::Strength::value = value, self::Strength::name = name, super core::Object::•()
-    ;
-  method nextWeaker() → self::Strength*
-    return (#C19).{core::List::[]}(this.{self::Strength::value});
-  static method stronger(self::Strength* s1, self::Strength* s2) → core::bool* {
-    return s1.{self::Strength::value}.{core::num::<}(s2.{self::Strength::value});
-  }
-  static method weaker(self::Strength* s1, self::Strength* s2) → core::bool* {
-    return s1.{self::Strength::value}.{core::num::>}(s2.{self::Strength::value});
-  }
-  static method weakest(self::Strength* s1, self::Strength* s2) → self::Strength* {
-    return self::Strength::weaker(s1, s2) ?{self::Strength*} s1 : s2;
-  }
-  static method strongest(self::Strength* s1, self::Strength* s2) → self::Strength* {
-    return self::Strength::stronger(s1, s2) ?{self::Strength*} s1 : s2;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Constraint extends core::Object /*hasConstConstructor*/  {
-  final field self::Strength* strength;
-  const constructor •(self::Strength* strength) → self::Constraint*
-    : self::Constraint::strength = strength, super core::Object::•()
-    ;
-  abstract method isSatisfied() → core::bool*;
-  abstract method markUnsatisfied() → void;
-  abstract method addToGraph() → void;
-  abstract method removeFromGraph() → void;
-  abstract method chooseMethod(core::int* mark) → void;
-  abstract method markInputs(core::int* mark) → void;
-  abstract method inputsKnown(core::int* mark) → core::bool*;
-  abstract method output() → self::Variable*;
-  abstract method execute() → void;
-  abstract method recalculate() → void;
-  method addConstraint() → void {
-    this.{self::Constraint::addToGraph}();
-    self::planner.{self::Planner::incrementalAdd}(this);
-  }
-  method satisfy(dynamic mark) → self::Constraint* {
-    this.{self::Constraint::chooseMethod}(mark as{TypeError,ForDynamic} core::int*);
-    if(!this.{self::Constraint::isSatisfied}()) {
-      if(this.{self::Constraint::strength}.{self::Strength::==}(#C22)) {
-        core::print("Could not satisfy a required constraint!");
-      }
-      return null;
-    }
-    this.{self::Constraint::markInputs}(mark as{TypeError,ForDynamic} core::int*);
-    self::Variable* out = this.{self::Constraint::output}();
-    self::Constraint* overridden = out.{self::Variable::determinedBy};
-    if(!overridden.{self::Constraint::==}(null))
-      overridden.{self::Constraint::markUnsatisfied}();
-    out.{self::Variable::determinedBy} = this;
-    if(!self::planner.{self::Planner::addPropagate}(this, mark as{TypeError,ForDynamic} core::int*))
-      core::print("Cycle encountered");
-    out.{self::Variable::mark} = mark as{TypeError,ForDynamic} core::int*;
-    return overridden;
-  }
-  method destroyConstraint() → void {
-    if(this.{self::Constraint::isSatisfied}())
-      self::planner.{self::Planner::incrementalRemove}(this);
-    this.{self::Constraint::removeFromGraph}();
-  }
-  method isInput() → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class UnaryConstraint extends self::Constraint {
-  final field self::Variable* myOutput;
-  field core::bool* satisfied = false;
-  constructor •(self::Variable* myOutput, self::Strength* strength) → self::UnaryConstraint*
-    : self::UnaryConstraint::myOutput = myOutput, super self::Constraint::•(strength) {
-    this.{self::Constraint::addConstraint}();
-  }
-  method addToGraph() → void {
-    this.{self::UnaryConstraint::myOutput}.{self::Variable::addConstraint}(this);
-    this.{self::UnaryConstraint::satisfied} = false;
-  }
-  method chooseMethod(core::int* mark) → void {
-    this.{self::UnaryConstraint::satisfied} = !this.{self::UnaryConstraint::myOutput}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::UnaryConstraint::myOutput}.{self::Variable::walkStrength});
-  }
-  method isSatisfied() → core::bool*
-    return this.{self::UnaryConstraint::satisfied};
-  method markInputs(core::int* mark) → void {}
-  method output() → self::Variable*
-    return this.{self::UnaryConstraint::myOutput};
-  method recalculate() → void {
-    this.{self::UnaryConstraint::myOutput}.{self::Variable::walkStrength} = this.{self::Constraint::strength};
-    this.{self::UnaryConstraint::myOutput}.{self::Variable::stay} = !this.{self::Constraint::isInput}();
-    if(this.{self::UnaryConstraint::myOutput}.{self::Variable::stay})
-      this.{self::Constraint::execute}();
-  }
-  method markUnsatisfied() → void {
-    this.{self::UnaryConstraint::satisfied} = false;
-  }
-  method inputsKnown(core::int* mark) → core::bool*
-    return true;
-  method removeFromGraph() → void {
-    if(!this.{self::UnaryConstraint::myOutput}.{self::Variable::==}(null))
-      this.{self::UnaryConstraint::myOutput}.{self::Variable::removeConstraint}(this);
-    this.{self::UnaryConstraint::satisfied} = false;
-  }
-}
-class StayConstraint extends self::UnaryConstraint {
-  constructor •(self::Variable* v, self::Strength* str) → self::StayConstraint*
-    : super self::UnaryConstraint::•(v, str)
-    ;
-  method execute() → void {}
-}
-class EditConstraint extends self::UnaryConstraint {
-  constructor •(self::Variable* v, self::Strength* str) → self::EditConstraint*
-    : super self::UnaryConstraint::•(v, str)
-    ;
-  method isInput() → core::bool*
-    return true;
-  method execute() → void {}
-}
-abstract class BinaryConstraint extends self::Constraint {
-  field self::Variable* v1;
-  field self::Variable* v2;
-  field core::int* direction = #C1;
-  constructor •(self::Variable* v1, self::Variable* v2, self::Strength* strength) → self::BinaryConstraint*
-    : self::BinaryConstraint::v1 = v1, self::BinaryConstraint::v2 = v2, super self::Constraint::•(strength) {
-    this.{self::Constraint::addConstraint}();
-  }
-  method chooseMethod(core::int* mark) → void {
-    if(this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int*} #C4 : #C1;
-    }
-    if(this.{self::BinaryConstraint::v2}.{self::Variable::mark}.{core::num::==}(mark)) {
-      this.{self::BinaryConstraint::direction} = !this.{self::BinaryConstraint::v1}.{self::Variable::mark}.{core::num::==}(mark) && self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int*} #C20 : #C1;
-    }
-    if(self::Strength::weaker(this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength})) {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v1}.{self::Variable::walkStrength}) ?{core::int*} #C20 : #C1;
-    }
-    else {
-      this.{self::BinaryConstraint::direction} = self::Strength::stronger(this.{self::Constraint::strength}, this.{self::BinaryConstraint::v2}.{self::Variable::walkStrength}) ?{core::int*} #C4 : #C20;
-    }
-  }
-  method addToGraph() → void {
-    this.{self::BinaryConstraint::v1}.{self::Variable::addConstraint}(this);
-    this.{self::BinaryConstraint::v2}.{self::Variable::addConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
-  }
-  method isSatisfied() → core::bool*
-    return !this.{self::BinaryConstraint::direction}.{core::num::==}(#C1);
-  method markInputs(core::int* mark) → void {
-    this.{self::BinaryConstraint::input}().{self::Variable::mark} = mark;
-  }
-  method input() → self::Variable*
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable*} this.{self::BinaryConstraint::v1} : this.{self::BinaryConstraint::v2};
-  method output() → self::Variable*
-    return this.{self::BinaryConstraint::direction}.{core::num::==}(#C4) ?{self::Variable*} this.{self::BinaryConstraint::v2} : this.{self::BinaryConstraint::v1};
-  method recalculate() → void {
-    self::Variable* ihn = this.{self::BinaryConstraint::input}();
-    self::Variable* out = this.{self::BinaryConstraint::output}();
-    out.{self::Variable::walkStrength} = self::Strength::weakest(this.{self::Constraint::strength}, ihn.{self::Variable::walkStrength});
-    out.{self::Variable::stay} = ihn.{self::Variable::stay};
-    if(out.{self::Variable::stay})
-      this.{self::Constraint::execute}();
-  }
-  method markUnsatisfied() → void {
-    this.{self::BinaryConstraint::direction} = #C1;
-  }
-  method inputsKnown(core::int* mark) → core::bool* {
-    self::Variable* i = this.{self::BinaryConstraint::input}();
-    return i.{self::Variable::mark}.{core::num::==}(mark) || i.{self::Variable::stay} || i.{self::Variable::determinedBy}.{self::Constraint::==}(null);
-  }
-  method removeFromGraph() → void {
-    if(!this.{self::BinaryConstraint::v1}.{self::Variable::==}(null))
-      this.{self::BinaryConstraint::v1}.{self::Variable::removeConstraint}(this);
-    if(!this.{self::BinaryConstraint::v2}.{self::Variable::==}(null))
-      this.{self::BinaryConstraint::v2}.{self::Variable::removeConstraint}(this);
-    this.{self::BinaryConstraint::direction} = #C1;
-  }
-}
-class ScaleConstraint extends self::BinaryConstraint {
-  final field self::Variable* scale;
-  final field self::Variable* offset;
-  constructor •(self::Variable* src, self::Variable* scale, self::Variable* offset, self::Variable* dest, self::Strength* strength) → self::ScaleConstraint*
-    : self::ScaleConstraint::scale = scale, self::ScaleConstraint::offset = offset, super self::BinaryConstraint::•(src, dest, strength)
-    ;
-  method addToGraph() → void {
-    super.{self::BinaryConstraint::addToGraph}();
-    this.{self::ScaleConstraint::scale}.{self::Variable::addConstraint}(this);
-    this.{self::ScaleConstraint::offset}.{self::Variable::addConstraint}(this);
-  }
-  method removeFromGraph() → void {
-    super.{self::BinaryConstraint::removeFromGraph}();
-    if(!this.{self::ScaleConstraint::scale}.{self::Variable::==}(null))
-      this.{self::ScaleConstraint::scale}.{self::Variable::removeConstraint}(this);
-    if(!this.{self::ScaleConstraint::offset}.{self::Variable::==}(null))
-      this.{self::ScaleConstraint::offset}.{self::Variable::removeConstraint}(this);
-  }
-  method markInputs(core::int* mark) → void {
-    super.{self::BinaryConstraint::markInputs}(mark);
-    this.{self::ScaleConstraint::scale}.{self::Variable::mark} = this.{self::ScaleConstraint::offset}.{self::Variable::mark} = mark;
-  }
-  method execute() → void {
-    if(this.{self::BinaryConstraint::direction}.{core::num::==}(#C4)) {
-      this.{self::BinaryConstraint::v2}.{self::Variable::value} = this.{self::BinaryConstraint::v1}.{self::Variable::value}.{core::num::*}(this.{self::ScaleConstraint::scale}.{self::Variable::value}).{core::num::+}(this.{self::ScaleConstraint::offset}.{self::Variable::value});
-    }
-    else {
-      this.{self::BinaryConstraint::v1}.{self::Variable::value} = this.{self::BinaryConstraint::v2}.{self::Variable::value}.{core::num::-}(this.{self::ScaleConstraint::offset}.{self::Variable::value}).{core::num::~/}(this.{self::ScaleConstraint::scale}.{self::Variable::value});
-    }
-  }
-  method recalculate() → void {
-    self::Variable* ihn = this.{self::BinaryConstraint::input}();
-    self::Variable* out = this.{self::BinaryConstraint::output}();
-    out.{self::Variable::walkStrength} = self::Strength::weakest(this.{self::Constraint::strength}, ihn.{self::Variable::walkStrength});
-    out.{self::Variable::stay} = ihn.{self::Variable::stay} && this.{self::ScaleConstraint::scale}.{self::Variable::stay} && this.{self::ScaleConstraint::offset}.{self::Variable::stay};
-    if(out.{self::Variable::stay})
-      this.{self::ScaleConstraint::execute}();
-  }
-}
-class EqualityConstraint extends self::BinaryConstraint {
-  constructor •(self::Variable* v1, self::Variable* v2, self::Strength* strength) → self::EqualityConstraint*
-    : super self::BinaryConstraint::•(v1, v2, strength)
-    ;
-  method execute() → void {
-    this.{self::BinaryConstraint::output}().{self::Variable::value} = this.{self::BinaryConstraint::input}().{self::Variable::value};
-  }
-}
-class Variable extends core::Object {
-  field core::List<self::Constraint*>* constraints = core::_GrowableList::•<self::Constraint*>(0);
-  field self::Constraint* determinedBy = null;
-  field core::int* mark = 0;
-  field self::Strength* walkStrength = #C18;
-  field core::bool* stay = true;
-  field core::int* value;
-  final field core::String* name;
-  constructor •(core::String* name, core::int* value) → self::Variable*
-    : self::Variable::name = name, self::Variable::value = value, super core::Object::•()
-    ;
-  method addConstraint(self::Constraint* c) → void {
-    this.{self::Variable::constraints}.{core::List::add}(c);
-  }
-  method removeConstraint(self::Constraint* c) → void {
-    this.{self::Variable::constraints}.{core::List::remove}(c);
-    if(this.{self::Variable::determinedBy}.{self::Constraint::==}(c))
-      this.{self::Variable::determinedBy} = null;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Planner extends core::Object {
-  field core::int* currentMark = 0;
-  synthetic constructor •() → self::Planner*
-    : super core::Object::•()
-    ;
-  method incrementalAdd(self::Constraint* c) → void {
-    core::int* mark = this.{self::Planner::newMark}();
-    for (self::Constraint* overridden = c.{self::Constraint::satisfy}(mark); !overridden.{self::Constraint::==}(null); overridden = overridden.{self::Constraint::satisfy}(mark))
-      ;
-  }
-  method incrementalRemove(self::Constraint* c) → void {
-    self::Variable* out = c.{self::Constraint::output}();
-    c.{self::Constraint::markUnsatisfied}();
-    c.{self::Constraint::removeFromGraph}();
-    core::List<self::Constraint*>* unsatisfied = this.{self::Planner::removePropagateFrom}(out);
-    self::Strength* strength = #C22;
-    do {
-      for (core::int* i = 0; i.{core::num::<}(unsatisfied.{core::List::length}); i = i.{core::num::+}(1)) {
-        self::Constraint* u = unsatisfied.{core::List::[]}(i);
-        if(u.{self::Constraint::strength}.{self::Strength::==}(strength))
-          this.{self::Planner::incrementalAdd}(u);
-      }
-      strength = strength.{self::Strength::nextWeaker}();
-    }
-    while (!strength.{self::Strength::==}(#C18))
-  }
-  method newMark() → core::int*
-    return this.{self::Planner::currentMark} = this.{self::Planner::currentMark}.{core::num::+}(1);
-  method makePlan(core::List<self::Constraint*>* sources) → self::Plan* {
-    core::int* mark = this.{self::Planner::newMark}();
-    self::Plan* plan = new self::Plan::•();
-    core::List<self::Constraint*>* todo = sources;
-    while (todo.{core::List::length}.{core::num::>}(0)) {
-      self::Constraint* c = todo.{core::List::removeLast}();
-      if(!c.{self::Constraint::output}().{self::Variable::mark}.{core::num::==}(mark) && c.{self::Constraint::inputsKnown}(mark)) {
-        plan.{self::Plan::addConstraint}(c);
-        c.{self::Constraint::output}().{self::Variable::mark} = mark;
-        this.{self::Planner::addConstraintsConsumingTo}(c.{self::Constraint::output}(), todo);
-      }
-    }
-    return plan;
-  }
-  method extractPlanFromConstraints(core::List<self::Constraint*>* constraints) → self::Plan* {
-    core::List<self::Constraint*>* sources = core::_GrowableList::•<self::Constraint*>(0);
-    for (core::int* i = 0; i.{core::num::<}(constraints.{core::List::length}); i = i.{core::num::+}(1)) {
-      self::Constraint* c = constraints.{core::List::[]}(i);
-      if(c.{self::Constraint::isInput}() && c.{self::Constraint::isSatisfied}())
-        sources.{core::List::add}(c);
-    }
-    return this.{self::Planner::makePlan}(sources);
-  }
-  method addPropagate(self::Constraint* c, core::int* mark) → core::bool* {
-    core::List<self::Constraint*>* todo = core::_GrowableList::_literal1<self::Constraint*>(c);
-    while (todo.{core::List::length}.{core::num::>}(0)) {
-      self::Constraint* d = todo.{core::List::removeLast}();
-      if(d.{self::Constraint::output}().{self::Variable::mark}.{core::num::==}(mark)) {
-        this.{self::Planner::incrementalRemove}(c);
-        return false;
-      }
-      d.{self::Constraint::recalculate}();
-      this.{self::Planner::addConstraintsConsumingTo}(d.{self::Constraint::output}(), todo);
-    }
-    return true;
-  }
-  method removePropagateFrom(self::Variable* out) → core::List<self::Constraint*>* {
-    out.{self::Variable::determinedBy} = null;
-    out.{self::Variable::walkStrength} = #C18;
-    out.{self::Variable::stay} = true;
-    core::List<self::Constraint*>* unsatisfied = core::_GrowableList::•<self::Constraint*>(0);
-    core::List<self::Variable*>* todo = core::_GrowableList::_literal1<self::Variable*>(out);
-    while (todo.{core::List::length}.{core::num::>}(0)) {
-      self::Variable* v = todo.{core::List::removeLast}();
-      for (core::int* i = 0; i.{core::num::<}(v.{self::Variable::constraints}.{core::List::length}); i = i.{core::num::+}(1)) {
-        self::Constraint* c = v.{self::Variable::constraints}.{core::List::[]}(i);
-        if(!c.{self::Constraint::isSatisfied}())
-          unsatisfied.{core::List::add}(c);
-      }
-      self::Constraint* determining = v.{self::Variable::determinedBy};
-      for (core::int* i = 0; i.{core::num::<}(v.{self::Variable::constraints}.{core::List::length}); i = i.{core::num::+}(1)) {
-        self::Constraint* next = v.{self::Variable::constraints}.{core::List::[]}(i);
-        if(!next.{self::Constraint::==}(determining) && next.{self::Constraint::isSatisfied}()) {
-          next.{self::Constraint::recalculate}();
-          todo.{core::List::add}(next.{self::Constraint::output}());
-        }
-      }
-    }
-    return unsatisfied;
-  }
-  method addConstraintsConsumingTo(self::Variable* v, core::List<self::Constraint*>* coll) → void {
-    self::Constraint* determining = v.{self::Variable::determinedBy};
-    for (core::int* i = 0; i.{core::num::<}(v.{self::Variable::constraints}.{core::List::length}); i = i.{core::num::+}(1)) {
-      self::Constraint* c = v.{self::Variable::constraints}.{core::List::[]}(i);
-      if(!c.{self::Constraint::==}(determining) && c.{self::Constraint::isSatisfied}())
-        coll.{core::List::add}(c);
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Plan extends core::Object {
-  field core::List<self::Constraint*>* list = core::_GrowableList::•<self::Constraint*>(0);
-  synthetic constructor •() → self::Plan*
-    : super core::Object::•()
-    ;
-  method addConstraint(self::Constraint* c) → void {
-    this.{self::Plan::list}.{core::List::add}(c);
-  }
-  method size() → core::int*
-    return this.{self::Plan::list}.{core::List::length};
-  method execute() → void {
-    for (core::int* i = 0; i.{core::num::<}(this.{self::Plan::list}.{core::List::length}); i = i.{core::num::+}(1)) {
-      this.{self::Plan::list}.{core::List::[]}(i).{self::Constraint::execute}();
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field self::Strength* REQUIRED = #C22;
-static const field self::Strength* STRONG_PREFERRED = #C3;
-static const field self::Strength* PREFERRED = #C6;
-static const field self::Strength* STRONG_DEFAULT = #C9;
-static const field self::Strength* NORMAL = #C12;
-static const field self::Strength* WEAK_DEFAULT = #C15;
-static const field self::Strength* WEAKEST = #C18;
-static const field core::int* NONE = #C1;
-static const field core::int* FORWARD = #C4;
-static const field core::int* BACKWARD = #C20;
-static field self::Planner* planner;
-static method main() → dynamic {
-  new self::DeltaBlue::•().{self::DeltaBlue::run}();
-}
-static method chainTest(core::int* n) → void {
-  self::planner = new self::Planner::•();
-  self::Variable* prev = null;
-  self::Variable* first = null;
-  self::Variable* last = null;
-  for (core::int* i = 0; i.{core::num::<=}(n); i = i.{core::num::+}(1)) {
-    self::Variable* v = new self::Variable::•("v${i}", 0);
-    if(!prev.{self::Variable::==}(null))
-      new self::EqualityConstraint::•(prev, v, #C22);
-    if(i.{core::num::==}(0))
-      first = v;
-    if(i.{core::num::==}(n))
-      last = v;
-    prev = v;
-  }
-  new self::StayConstraint::•(last, #C9);
-  self::EditConstraint* edit = new self::EditConstraint::•(first, #C6);
-  self::Plan* plan = self::planner.{self::Planner::extractPlanFromConstraints}(core::_GrowableList::_literal1<self::Constraint*>(edit));
-  for (core::int* i = 0; i.{core::num::<}(100); i = i.{core::num::+}(1)) {
-    first.{self::Variable::value} = i;
-    plan.{self::Plan::execute}();
-    if(!last.{self::Variable::value}.{core::num::==}(i)) {
-      core::print("Chain test failed:");
-      core::print("Expected last value to be ${i} but it was ${last.{self::Variable::value}}.");
-    }
-  }
-}
-static method projectionTest(core::int* n) → void {
-  self::planner = new self::Planner::•();
-  self::Variable* scale = new self::Variable::•("scale", 10);
-  self::Variable* offset = new self::Variable::•("offset", 1000);
-  self::Variable* src = null;
-  self::Variable* dst = null;
-  core::List<self::Variable*>* dests = core::_GrowableList::•<self::Variable*>(0);
-  for (core::int* i = 0; i.{core::num::<}(n); i = i.{core::num::+}(1)) {
-    src = new self::Variable::•("src", i);
-    dst = new self::Variable::•("dst", i);
-    dests.{core::List::add}(dst);
-    new self::StayConstraint::•(src, #C12);
-    new self::ScaleConstraint::•(src, scale, offset, dst, #C22);
-  }
-  self::change(src, 17);
-  if(!dst.{self::Variable::value}.{core::num::==}(1170))
-    core::print("Projection 1 failed");
-  self::change(dst, 1050);
-  if(!src.{self::Variable::value}.{core::num::==}(5))
-    core::print("Projection 2 failed");
-  self::change(scale, 5);
-  for (core::int* i = 0; i.{core::num::<}(n.{core::num::-}(1)); i = i.{core::num::+}(1)) {
-    if(!dests.{core::List::[]}(i).{self::Variable::value}.{core::num::==}(i.{core::num::*}(5).{core::num::+}(1000)))
-      core::print("Projection 3 failed");
-  }
-  self::change(offset, 2000);
-  for (core::int* i = 0; i.{core::num::<}(n.{core::num::-}(1)); i = i.{core::num::+}(1)) {
-    if(!dests.{core::List::[]}(i).{self::Variable::value}.{core::num::==}(i.{core::num::*}(5).{core::num::+}(2000)))
-      core::print("Projection 4 failed");
-  }
-}
-static method change(self::Variable* v, core::int* newValue) → void {
-  self::EditConstraint* edit = new self::EditConstraint::•(v, #C6);
-  self::Plan* plan = self::planner.{self::Planner::extractPlanFromConstraints}(core::_GrowableList::_literal1<self::EditConstraint*>(edit));
-  for (core::int* i = 0; i.{core::num::<}(10); i = i.{core::num::+}(1)) {
-    v.{self::Variable::value} = newValue;
-    plan.{self::Plan::execute}();
-  }
-  edit.{self::Constraint::destroyConstraint}();
-}
-
-constants  {
-  #C1 = 1
-  #C2 = "strongPreferred"
-  #C3 = self::Strength {value:#C1, name:#C2}
-  #C4 = 2
-  #C5 = "preferred"
-  #C6 = self::Strength {value:#C4, name:#C5}
-  #C7 = 3
-  #C8 = "strongDefault"
-  #C9 = self::Strength {value:#C7, name:#C8}
-  #C10 = 4
-  #C11 = "normal"
-  #C12 = self::Strength {value:#C10, name:#C11}
-  #C13 = 5
-  #C14 = "weakDefault"
-  #C15 = self::Strength {value:#C13, name:#C14}
-  #C16 = 6
-  #C17 = "weakest"
-  #C18 = self::Strength {value:#C16, name:#C17}
-  #C19 = <self::Strength*>[#C3, #C6, #C9, #C12, #C15, #C18]
-  #C20 = 0
-  #C21 = "required"
-  #C22 = self::Strength {value:#C20, name:#C21}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///DeltaBlue.dart:
-- Strength. (from org-dartlang-testcase:///DeltaBlue.dart:61:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart
deleted file mode 100644
index 68f2968..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class Interface1 {
-  void interfaceMethod1() {}
-}
-
-class Interface2 {
-  void interfaceMethod2() {}
-
-  var interfaceMethod1;
-}
-
-class Interface3 {
-  void interfaceMethod3() {}
-}
-
-abstract class A implements Interface1, Interface2, Interface3 {
-  aMethod() {}
-  abstractMethod();
-  void set property1(_);
-  void set property2(_);
-  void set property3(_);
-}
-
-abstract class B extends A {
-  final property1 = null;
-  aMethod() {}
-  bMethod() {}
-}
-
-class MyClass extends B {
-  var property2;
-  aaMethod() {}
-  aMethod() {}
-  bMethod() {}
-  cMethod() {}
-}
-
-// This class should have no errors, as it has a non-trivial noSuchMethod.
-class MyMock1 extends B {
-  noSuchMethod(_) => null;
-}
-
-// This class should have no errors, as the abstract method doesn't override
-// the non-trivial noSuchMethod inherited from MyMock1.
-class MyMock2 extends MyMock1 {
-  noSuchMethod(_);
-}
-
-// This class should have an error, the abstract method isn't considered
-// non-trivial.
-class MyMock3 extends B {
-  noSuchMethod(_);
-}
-
-class C {
-  void interfaceMethod1(_) {}
-}
-
-// This class should have an error, the method C.interfaceMethod1 conflicts
-// with the field Interface2.interfaceMethod1.
-abstract class D extends C implements Interface2 {}
-
-class E {
-  void set interfaceMethod1(_) {}
-}
-
-// This class should have an error, the setter E.interfaceMethod1 conflicts
-// with the method Interface1.interfaceMethod1.
-abstract class F extends E implements Interface1 {}
-
-class Foo {
-  void foo() {}
-}
-
-class G {
-  Object get foo => null;
-}
-
-// This class should have an error, the getter G.foo conflicts with the method
-// Foo.foo.
-abstract class H extends G implements Foo {}
-
-class Bar {
-  Object get foo => null;
-}
-
-class I {
-  Object foo() {}
-}
-
-// This class should have an error, the getter Bar.foo conflicts with the
-// method I.foo.
-abstract class J extends I implements Bar {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.textual_outline.expect
deleted file mode 100644
index 020c9cd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.textual_outline.expect
+++ /dev/null
@@ -1,81 +0,0 @@
-// @dart = 2.6
-class Interface1 {
-  void interfaceMethod1() {}
-}
-
-class Interface2 {
-  void interfaceMethod2() {}
-  var interfaceMethod1;
-}
-
-class Interface3 {
-  void interfaceMethod3() {}
-}
-
-abstract class A implements Interface1, Interface2, Interface3 {
-  aMethod() {}
-  abstractMethod();
-  void set property1(_);
-  void set property2(_);
-  void set property3(_);
-}
-
-abstract class B extends A {
-  final property1 = null;
-  aMethod() {}
-  bMethod() {}
-}
-
-class MyClass extends B {
-  var property2;
-  aaMethod() {}
-  aMethod() {}
-  bMethod() {}
-  cMethod() {}
-}
-
-class MyMock1 extends B {
-  noSuchMethod(_) => null;
-}
-
-class MyMock2 extends MyMock1 {
-  noSuchMethod(_);
-}
-
-class MyMock3 extends B {
-  noSuchMethod(_);
-}
-
-class C {
-  void interfaceMethod1(_) {}
-}
-
-abstract class D extends C implements Interface2 {}
-
-class E {
-  void set interfaceMethod1(_) {}
-}
-
-abstract class F extends E implements Interface1 {}
-
-class Foo {
-  void foo() {}
-}
-
-class G {
-  Object get foo => null;
-}
-
-abstract class H extends G implements Foo {}
-
-class Bar {
-  Object get foo => null;
-}
-
-class I {
-  Object foo() {}
-}
-
-abstract class J extends I implements Bar {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6b5b578..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,81 +0,0 @@
-// @dart = 2.6
-abstract class A implements Interface1, Interface2, Interface3 {
-  aMethod() {}
-  abstractMethod();
-  void set property1(_);
-  void set property2(_);
-  void set property3(_);
-}
-
-abstract class B extends A {
-  aMethod() {}
-  bMethod() {}
-  final property1 = null;
-}
-
-abstract class D extends C implements Interface2 {}
-
-abstract class F extends E implements Interface1 {}
-
-abstract class H extends G implements Foo {}
-
-abstract class J extends I implements Bar {}
-
-class Bar {
-  Object get foo => null;
-}
-
-class C {
-  void interfaceMethod1(_) {}
-}
-
-class E {
-  void set interfaceMethod1(_) {}
-}
-
-class Foo {
-  void foo() {}
-}
-
-class G {
-  Object get foo => null;
-}
-
-class I {
-  Object foo() {}
-}
-
-class Interface1 {
-  void interfaceMethod1() {}
-}
-
-class Interface2 {
-  var interfaceMethod1;
-  void interfaceMethod2() {}
-}
-
-class Interface3 {
-  void interfaceMethod3() {}
-}
-
-class MyClass extends B {
-  aMethod() {}
-  aaMethod() {}
-  bMethod() {}
-  cMethod() {}
-  var property2;
-}
-
-class MyMock1 extends B {
-  noSuchMethod(_) => null;
-}
-
-class MyMock2 extends MyMock1 {
-  noSuchMethod(_);
-}
-
-class MyMock3 extends B {
-  noSuchMethod(_);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.weak.expect
deleted file mode 100644
index 999fa79..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.weak.expect
+++ /dev/null
@@ -1,442 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:21:16: Error: Can't inherit members that conflict with each other.
-// abstract class A implements Interface1, Interface2, Interface3 {
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:29:16: Error: Can't inherit members that conflict with each other.
-// abstract class B extends A {
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:35:7: Error: Can't inherit members that conflict with each other.
-// class MyClass extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:35:7: Error: The non-abstract class 'MyClass' is missing implementations for these members:
-//  - A.abstractMethod
-//  - A.property1=
-//  - A.property3=
-//  - Interface1.interfaceMethod1
-//  - Interface2.interfaceMethod1
-//  - Interface2.interfaceMethod2
-//  - Interface3.interfaceMethod3
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class MyClass extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:23:3: Context: 'A.abstractMethod' is defined here.
-//   abstractMethod();
-//   ^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:24:12: Context: 'A.property1=' is defined here.
-//   void set property1(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:26:12: Context: 'A.property3=' is defined here.
-//   void set property3(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: 'Interface1.interfaceMethod1' is defined here.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: 'Interface2.interfaceMethod1' is defined here.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:12:8: Context: 'Interface2.interfaceMethod2' is defined here.
-//   void interfaceMethod2() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:18:8: Context: 'Interface3.interfaceMethod3' is defined here.
-//   void interfaceMethod3() {}
-//        ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:44:7: Error: Can't inherit members that conflict with each other.
-// class MyMock1 extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:50:7: Error: Can't inherit members that conflict with each other.
-// class MyMock2 extends MyMock1 {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:56:7: Error: Can't inherit members that conflict with each other.
-// class MyMock3 extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:56:7: Error: The non-abstract class 'MyMock3' is missing implementations for these members:
-//  - A.abstractMethod
-//  - A.property1=
-//  - A.property2=
-//  - A.property3=
-//  - Interface1.interfaceMethod1
-//  - Interface2.interfaceMethod1
-//  - Interface2.interfaceMethod2
-//  - Interface3.interfaceMethod3
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class MyMock3 extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:23:3: Context: 'A.abstractMethod' is defined here.
-//   abstractMethod();
-//   ^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:24:12: Context: 'A.property1=' is defined here.
-//   void set property1(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:25:12: Context: 'A.property2=' is defined here.
-//   void set property2(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:26:12: Context: 'A.property3=' is defined here.
-//   void set property3(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: 'Interface1.interfaceMethod1' is defined here.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: 'Interface2.interfaceMethod1' is defined here.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:12:8: Context: 'Interface2.interfaceMethod2' is defined here.
-//   void interfaceMethod2() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:18:8: Context: 'Interface3.interfaceMethod3' is defined here.
-//   void interfaceMethod3() {}
-//        ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:66:16: Error: Can't inherit members that conflict with each other.
-// abstract class D extends C implements Interface2 {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is one inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:61:8: Context: This is the other inherited member.
-//   void interfaceMethod1(_) {}
-//        ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:74:16: Error: Can't inherit members that conflict with each other.
-// abstract class F extends E implements Interface1 {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:69:12: Context: This is the other inherited member.
-//   void set interfaceMethod1(_) {}
-//            ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:86:16: Error: Can't inherit members that conflict with each other.
-// abstract class H extends G implements Foo {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:77:8: Context: This is one inherited member.
-//   void foo() {}
-//        ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:81:14: Context: This is the other inherited member.
-//   Object get foo => null;
-//              ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:98:16: Error: Can't inherit members that conflict with each other.
-// abstract class J extends I implements Bar {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:89:14: Context: This is one inherited member.
-//   Object get foo => null;
-//              ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:93:10: Context: This is the other inherited member.
-//   Object foo() {}
-//          ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Interface1 extends core::Object {
-  synthetic constructor •() → self::Interface1*
-    : super core::Object::•()
-    ;
-  method interfaceMethod1() → void {}
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Interface2 extends core::Object {
-  field dynamic interfaceMethod1 = null;
-  synthetic constructor •() → self::Interface2*
-    : super core::Object::•()
-    ;
-  method interfaceMethod2() → void {}
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Interface3 extends core::Object {
-  synthetic constructor •() → self::Interface3*
-    : super core::Object::•()
-    ;
-  method interfaceMethod3() → void {}
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class A extends core::Object implements self::Interface1, self::Interface2, self::Interface3 {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method aMethod() → dynamic {}
-  abstract method abstractMethod() → dynamic;
-  abstract set property1(dynamic _) → void;
-  abstract set property2(dynamic _) → void;
-  abstract set property3(dynamic _) → void;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends self::A {
-  final field dynamic property1 = null;
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method aMethod() → dynamic {}
-  method bMethod() → dynamic {}
-}
-class MyClass extends self::B {
-  field dynamic property2 = null;
-  synthetic constructor •() → self::MyClass*
-    : super self::B::•()
-    ;
-  method aaMethod() → dynamic {}
-  method aMethod() → dynamic {}
-  method bMethod() → dynamic {}
-  method cMethod() → dynamic {}
-}
-class MyMock1 extends self::B {
-  synthetic constructor •() → self::MyMock1*
-    : super self::B::•()
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    return null;
-  no-such-method-forwarder method interfaceMethod2() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-  no-such-method-forwarder method abstractMethod() → dynamic
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4))) as{TypeError,ForDynamic} dynamic;
-  no-such-method-forwarder method interfaceMethod1() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C6, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-  no-such-method-forwarder method interfaceMethod3() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C7, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-  no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C8, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-  no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C9, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-  no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C10, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-  no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#C11, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-}
-class MyMock2 extends self::MyMock1 {
-  synthetic constructor •() → self::MyMock2*
-    : super self::MyMock1::•()
-    ;
-  abstract method noSuchMethod(core::Invocation* _) → dynamic;
-}
-class MyMock3 extends self::B {
-  synthetic constructor •() → self::MyMock3*
-    : super self::B::•()
-    ;
-  abstract method noSuchMethod(core::Invocation* _) → dynamic;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method interfaceMethod1(dynamic _) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D extends self::C implements self::Interface2 {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-class E extends core::Object {
-  synthetic constructor •() → self::E*
-    : super core::Object::•()
-    ;
-  set interfaceMethod1(dynamic _) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class F extends self::E implements self::Interface1 {
-  synthetic constructor •() → self::F*
-    : super self::E::•()
-    ;
-}
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  method foo() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class G extends core::Object {
-  synthetic constructor •() → self::G*
-    : super core::Object::•()
-    ;
-  get foo() → core::Object*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H extends self::G implements self::Foo {
-  synthetic constructor •() → self::H*
-    : super self::G::•()
-    ;
-}
-class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  get foo() → core::Object*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class I extends core::Object {
-  synthetic constructor •() → self::I*
-    : super core::Object::•()
-    ;
-  method foo() → core::Object* {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class J extends self::I implements self::Bar {
-  synthetic constructor •() → self::J*
-    : super self::I::•()
-    ;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = #interfaceMethod2
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-  #C5 = #abstractMethod
-  #C6 = #interfaceMethod1
-  #C7 = #interfaceMethod3
-  #C8 = #property3=
-  #C9 = #interfaceMethod1=
-  #C10 = #property1=
-  #C11 = #property2=
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.weak.outline.expect
deleted file mode 100644
index d363b6c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart.weak.outline.expect
+++ /dev/null
@@ -1,456 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:21:16: Error: Can't inherit members that conflict with each other.
-// abstract class A implements Interface1, Interface2, Interface3 {
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:29:16: Error: Can't inherit members that conflict with each other.
-// abstract class B extends A {
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:35:7: Error: Can't inherit members that conflict with each other.
-// class MyClass extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:35:7: Error: The non-abstract class 'MyClass' is missing implementations for these members:
-//  - A.abstractMethod
-//  - A.property1=
-//  - A.property3=
-//  - Interface1.interfaceMethod1
-//  - Interface2.interfaceMethod1
-//  - Interface2.interfaceMethod2
-//  - Interface3.interfaceMethod3
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class MyClass extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:23:3: Context: 'A.abstractMethod' is defined here.
-//   abstractMethod();
-//   ^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:24:12: Context: 'A.property1=' is defined here.
-//   void set property1(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:26:12: Context: 'A.property3=' is defined here.
-//   void set property3(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: 'Interface1.interfaceMethod1' is defined here.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: 'Interface2.interfaceMethod1' is defined here.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:12:8: Context: 'Interface2.interfaceMethod2' is defined here.
-//   void interfaceMethod2() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:18:8: Context: 'Interface3.interfaceMethod3' is defined here.
-//   void interfaceMethod3() {}
-//        ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:44:7: Error: Can't inherit members that conflict with each other.
-// class MyMock1 extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:50:7: Error: Can't inherit members that conflict with each other.
-// class MyMock2 extends MyMock1 {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:56:7: Error: Can't inherit members that conflict with each other.
-// class MyMock3 extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is the other inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:56:7: Error: The non-abstract class 'MyMock3' is missing implementations for these members:
-//  - A.abstractMethod
-//  - A.property1=
-//  - A.property2=
-//  - A.property3=
-//  - Interface1.interfaceMethod1
-//  - Interface2.interfaceMethod1
-//  - Interface2.interfaceMethod2
-//  - Interface3.interfaceMethod3
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class MyMock3 extends B {
-//       ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:23:3: Context: 'A.abstractMethod' is defined here.
-//   abstractMethod();
-//   ^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:24:12: Context: 'A.property1=' is defined here.
-//   void set property1(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:25:12: Context: 'A.property2=' is defined here.
-//   void set property2(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:26:12: Context: 'A.property3=' is defined here.
-//   void set property3(_);
-//            ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: 'Interface1.interfaceMethod1' is defined here.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: 'Interface2.interfaceMethod1' is defined here.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:12:8: Context: 'Interface2.interfaceMethod2' is defined here.
-//   void interfaceMethod2() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:18:8: Context: 'Interface3.interfaceMethod3' is defined here.
-//   void interfaceMethod3() {}
-//        ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:66:16: Error: Can't inherit members that conflict with each other.
-// abstract class D extends C implements Interface2 {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:14:7: Context: This is one inherited member.
-//   var interfaceMethod1;
-//       ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:61:8: Context: This is the other inherited member.
-//   void interfaceMethod1(_) {}
-//        ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:74:16: Error: Can't inherit members that conflict with each other.
-// abstract class F extends E implements Interface1 {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:8:8: Context: This is one inherited member.
-//   void interfaceMethod1() {}
-//        ^^^^^^^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:69:12: Context: This is the other inherited member.
-//   void set interfaceMethod1(_) {}
-//            ^^^^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:86:16: Error: Can't inherit members that conflict with each other.
-// abstract class H extends G implements Foo {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:77:8: Context: This is one inherited member.
-//   void foo() {}
-//        ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:81:14: Context: This is the other inherited member.
-//   Object get foo => null;
-//              ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:98:16: Error: Can't inherit members that conflict with each other.
-// abstract class J extends I implements Bar {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:89:14: Context: This is one inherited member.
-//   Object get foo => null;
-//              ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/abstract_members.dart:93:10: Context: This is the other inherited member.
-//   Object foo() {}
-//          ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Interface1 extends core::Object {
-  synthetic constructor •() → self::Interface1*
-    ;
-  method interfaceMethod1() → void
-    ;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Interface2 extends core::Object {
-  field dynamic interfaceMethod1;
-  synthetic constructor •() → self::Interface2*
-    ;
-  method interfaceMethod2() → void
-    ;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Interface3 extends core::Object {
-  synthetic constructor •() → self::Interface3*
-    ;
-  method interfaceMethod3() → void
-    ;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class A extends core::Object implements self::Interface1, self::Interface2, self::Interface3 {
-  synthetic constructor •() → self::A*
-    ;
-  method aMethod() → dynamic
-    ;
-  abstract method abstractMethod() → dynamic;
-  abstract set property1(dynamic _) → void;
-  abstract set property2(dynamic _) → void;
-  abstract set property3(dynamic _) → void;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends self::A {
-  final field dynamic property1;
-  synthetic constructor •() → self::B*
-    ;
-  method aMethod() → dynamic
-    ;
-  method bMethod() → dynamic
-    ;
-}
-class MyClass extends self::B {
-  field dynamic property2;
-  synthetic constructor •() → self::MyClass*
-    ;
-  method aaMethod() → dynamic
-    ;
-  method aMethod() → dynamic
-    ;
-  method bMethod() → dynamic
-    ;
-  method cMethod() → dynamic
-    ;
-}
-class MyMock1 extends self::B {
-  synthetic constructor •() → self::MyMock1*
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    ;
-  no-such-method-forwarder method interfaceMethod2() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod2, 0, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-  no-such-method-forwarder method abstractMethod() → dynamic
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#abstractMethod, 0, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{}))) as{TypeError,ForDynamic} dynamic;
-  no-such-method-forwarder method interfaceMethod1() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1, 0, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-  no-such-method-forwarder method interfaceMethod3() → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod3, 0, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-  no-such-method-forwarder set property3(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property3=, 2, const <core::Type*>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-  no-such-method-forwarder set interfaceMethod1(dynamic value) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod1=, 2, const <core::Type*>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-  no-such-method-forwarder set property1(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property1=, 2, const <core::Type*>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-  no-such-method-forwarder set property2(dynamic _) → void
-    return this.{self::MyMock1::noSuchMethod}(new core::_InvocationMirror::_withType(#property2=, 2, const <core::Type*>[], core::List::unmodifiable<dynamic>(<dynamic>[_]), core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-}
-class MyMock2 extends self::MyMock1 {
-  synthetic constructor •() → self::MyMock2*
-    ;
-  abstract method noSuchMethod(core::Invocation* _) → dynamic;
-}
-class MyMock3 extends self::B {
-  synthetic constructor •() → self::MyMock3*
-    ;
-  abstract method noSuchMethod(core::Invocation* _) → dynamic;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method interfaceMethod1(dynamic _) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D extends self::C implements self::Interface2 {
-  synthetic constructor •() → self::D*
-    ;
-}
-class E extends core::Object {
-  synthetic constructor •() → self::E*
-    ;
-  set interfaceMethod1(dynamic _) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class F extends self::E implements self::Interface1 {
-  synthetic constructor •() → self::F*
-    ;
-}
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    ;
-  method foo() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class G extends core::Object {
-  synthetic constructor •() → self::G*
-    ;
-  get foo() → core::Object*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H extends self::G implements self::Foo {
-  synthetic constructor •() → self::H*
-    ;
-}
-class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    ;
-  get foo() → core::Object*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class I extends core::Object {
-  synthetic constructor •() → self::I*
-    ;
-  method foo() → core::Object*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class J extends self::I implements self::Bar {
-  synthetic constructor •() → self::J*
-    ;
-}
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:12:8 -> SymbolConstant(#interfaceMethod2)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:12:8 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:12:8 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:12:8 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:23:3 -> SymbolConstant(#abstractMethod)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:23:3 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:23:3 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:23:3 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:8:8 -> SymbolConstant(#interfaceMethod1)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:8:8 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:8:8 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:8:8 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:18:8 -> SymbolConstant(#interfaceMethod3)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:18:8 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:18:8 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:18:8 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:26:12 -> SymbolConstant(#property3=)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:26:12 -> ListConstant(const <Type*>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:26:12 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:14:7 -> SymbolConstant(#interfaceMethod1=)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:14:7 -> ListConstant(const <Type*>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:14:7 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:24:12 -> SymbolConstant(#property1=)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:24:12 -> ListConstant(const <Type*>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:24:12 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_members.dart:25:12 -> SymbolConstant(#property2=)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_members.dart:25:12 -> ListConstant(const <Type*>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_members.dart:25:12 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Extra constant evaluation: evaluated: 73, effectively constant: 28
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart
deleted file mode 100644
index 177f49b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.6
-
-abstract class A {
-  A foo() => null;
-}
-
-abstract class B extends A {
-  B foo();
-}
-
-class C {
-  noSuchMethod(_) => null;
-}
-
-class D extends C implements B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.textual_outline.expect
deleted file mode 100644
index 51384b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-abstract class A {
-  A foo() => null;
-}
-
-abstract class B extends A {
-  B foo();
-}
-
-class C {
-  noSuchMethod(_) => null;
-}
-
-class D extends C implements B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.textual_outline_modelled.expect
deleted file mode 100644
index 51384b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-abstract class A {
-  A foo() => null;
-}
-
-abstract class B extends A {
-  B foo();
-}
-
-class C {
-  noSuchMethod(_) => null;
-}
-
-class D extends C implements B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.expect
deleted file mode 100644
index c52e1a4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.expect
+++ /dev/null
@@ -1,58 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo() → self::A*
-    return null;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  abstract method foo() → self::B*;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C implements self::B {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  no-such-method-forwarder method foo() → self::B*
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4))) as{TypeError,ForDynamic} self::B*;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.outline.expect
deleted file mode 100644
index 04c9a27..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.outline.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  method foo() → self::A*
-    ;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-  abstract method foo() → self::B*;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C implements self::B {
-  synthetic constructor •() → self::D*
-    ;
-  no-such-method-forwarder method foo() → self::B*
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#foo, 0, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{}))) as{TypeError,ForDynamic} self::B*;
-}
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///abstract_overrides_concrete_with_no_such_method.dart:12:5 -> SymbolConstant(#foo)
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_overrides_concrete_with_no_such_method.dart:12:5 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///abstract_overrides_concrete_with_no_such_method.dart:12:5 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///abstract_overrides_concrete_with_no_such_method.dart:12:5 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Extra constant evaluation: evaluated: 9, effectively constant: 4
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.transformed.expect
deleted file mode 100644
index c52e1a4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/abstract_overrides_concrete_with_no_such_method.dart.weak.transformed.expect
+++ /dev/null
@@ -1,58 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo() → self::A*
-    return null;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  abstract method foo() → self::B*;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C implements self::B {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  no-such-method-forwarder method foo() → self::B*
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4))) as{TypeError,ForDynamic} self::B*;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = #foo
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart b/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart
deleted file mode 100644
index 3bdb342..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-void set onlySetter(value) {
-  print("onlySetter called with $value.");
-}
-
-class C {
-  void set onlySetter(value) {
-    print("C.onlySetter called with $value.");
-  }
-
-  testC() {
-    try {
-      print(onlySetter);
-      throw "No error thrown";
-    } on NoSuchMethodError catch (e) {
-      print("Expected error: $e");
-    }
-    onlySetter = "hest";
-  }
-
-  testD() {
-    print(onlySetter);
-    onlySetter = "hest";
-  }
-}
-
-class D extends C {
-  String get onlySetter => "D.onlySetter called.";
-
-  void set onlySetter(value) {
-    print("D.onlySetter called with $value.");
-  }
-}
-
-main() {
-  try {
-    print(onlySetter);
-    throw "No error thrown";
-  } on NoSuchMethodError catch (e) {
-    print("Expected error: $e");
-  }
-  onlySetter = "fisk";
-  new C().testC();
-  new D().testD();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.textual_outline.expect
deleted file mode 100644
index 1bfd600..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.textual_outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-void set onlySetter(value) {}
-
-class C {
-  void set onlySetter(value) {}
-  testC() {}
-  testD() {}
-}
-
-class D extends C {
-  String get onlySetter => "D.onlySetter called.";
-  void set onlySetter(value) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.textual_outline_modelled.expect
deleted file mode 100644
index d39408e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class C {
-  testC() {}
-  testD() {}
-  void set onlySetter(value) {}
-}
-
-class D extends C {
-  String get onlySetter => "D.onlySetter called.";
-  void set onlySetter(value) {}
-}
-
-main() {}
-void set onlySetter(value) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.expect
deleted file mode 100644
index 2597184..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.expect
+++ /dev/null
@@ -1,90 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:18:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-//       print(onlySetter);
-//             ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:27:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-//     print(onlySetter);
-//           ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:42:11: Error: Getter not found: 'onlySetter'.
-//     print(onlySetter);
-//           ^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  set onlySetter(dynamic value) → void {
-    core::print("C.onlySetter called with ${value}.");
-  }
-  method testC() → dynamic {
-    try {
-      core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:18:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-      print(onlySetter);
-            ^^^^^^^^^^");
-      throw "No error thrown";
-    }
-    on core::NoSuchMethodError* catch(final core::NoSuchMethodError* e) {
-      core::print("Expected error: ${e}");
-    }
-    this.{self::C::onlySetter} = "hest";
-  }
-  method testD() → dynamic {
-    core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:27:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-    print(onlySetter);
-          ^^^^^^^^^^");
-    this.{self::C::onlySetter} = "hest";
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  get onlySetter() → core::String*
-    return "D.onlySetter called.";
-  set onlySetter(dynamic value) → void {
-    core::print("D.onlySetter called with ${value}.");
-  }
-}
-static set onlySetter(dynamic value) → void {
-  core::print("onlySetter called with ${value}.");
-}
-static method main() → dynamic {
-  try {
-    core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:42:11: Error: Getter not found: 'onlySetter'.
-    print(onlySetter);
-          ^^^^^^^^^^");
-    throw "No error thrown";
-  }
-  on core::NoSuchMethodError* catch(final core::NoSuchMethodError* e) {
-    core::print("Expected error: ${e}");
-  }
-  self::onlySetter = "fisk";
-  new self::C::•().{self::C::testC}();
-  new self::D::•().{self::C::testD}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.outline.expect
deleted file mode 100644
index a0876da..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.outline.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  set onlySetter(dynamic value) → void
-    ;
-  method testC() → dynamic
-    ;
-  method testD() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  get onlySetter() → core::String*
-    ;
-  set onlySetter(dynamic value) → void
-    ;
-}
-static set onlySetter(dynamic value) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.transformed.expect
deleted file mode 100644
index 2597184..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart.weak.transformed.expect
+++ /dev/null
@@ -1,90 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:18:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-//       print(onlySetter);
-//             ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:27:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-//     print(onlySetter);
-//           ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:42:11: Error: Getter not found: 'onlySetter'.
-//     print(onlySetter);
-//           ^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  set onlySetter(dynamic value) → void {
-    core::print("C.onlySetter called with ${value}.");
-  }
-  method testC() → dynamic {
-    try {
-      core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:18:13: Error: The getter 'onlySetter' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-      print(onlySetter);
-            ^^^^^^^^^^");
-      throw "No error thrown";
-    }
-    on core::NoSuchMethodError* catch(final core::NoSuchMethodError* e) {
-      core::print("Expected error: ${e}");
-    }
-    this.{self::C::onlySetter} = "hest";
-  }
-  method testD() → dynamic {
-    core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:27:11: Error: The getter 'onlySetter' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'onlySetter'.
-    print(onlySetter);
-          ^^^^^^^^^^");
-    this.{self::C::onlySetter} = "hest";
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  get onlySetter() → core::String*
-    return "D.onlySetter called.";
-  set onlySetter(dynamic value) → void {
-    core::print("D.onlySetter called with ${value}.");
-  }
-}
-static set onlySetter(dynamic value) → void {
-  core::print("onlySetter called with ${value}.");
-}
-static method main() → dynamic {
-  try {
-    core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/accessors.dart:42:11: Error: Getter not found: 'onlySetter'.
-    print(onlySetter);
-          ^^^^^^^^^^");
-    throw "No error thrown";
-  }
-  on core::NoSuchMethodError* catch(final core::NoSuchMethodError* e) {
-    core::print("Expected error: ${e}");
-  }
-  self::onlySetter = "fisk";
-  new self::C::•().{self::C::testC}();
-  new self::D::•().{self::C::testD}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart b/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart
deleted file mode 100644
index d8034b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.6
-
-// The test checks how type parameters of different variances are serialized.
-
-typedef F<W, X, Y, Z> = X Function(Y, Z Function(Z));
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.textual_outline.expect
deleted file mode 100644
index 858862a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-typedef F<W, X, Y, Z> = X Function(Y, Z Function(Z));
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.textual_outline_modelled.expect
deleted file mode 100644
index 8e98e2c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-typedef F<W, X, Y, Z> = X Function(Y, Z Function(Z));
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.expect
deleted file mode 100644
index f7afd1b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F<unrelated W extends core::Object* = dynamic, X extends core::Object* = dynamic, contravariant Y extends core::Object* = dynamic, invariant Z extends core::Object* = dynamic> = (Y*, (Z*) →* Z*) →* X*;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.outline.expect
deleted file mode 100644
index 23f7ffa..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F<unrelated W extends core::Object* = dynamic, X extends core::Object* = dynamic, contravariant Y extends core::Object* = dynamic, invariant Z extends core::Object* = dynamic> = (Y*, (Z*) →* Z*) →* X*;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.transformed.expect
deleted file mode 100644
index f7afd1b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/all_variances.dart.weak.transformed.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F<unrelated W extends core::Object* = dynamic, X extends core::Object* = dynamic, contravariant Y extends core::Object* = dynamic, invariant Z extends core::Object* = dynamic> = (Y*, (Z*) →* Z*) →* X*;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart b/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart
deleted file mode 100644
index 71b5372..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-export 'hello.dart' show main;
-
-export 'map.dart' show main;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.textual_outline.expect
deleted file mode 100644
index 1ee4fc3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-export 'hello.dart' show main;
-export 'map.dart' show main;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.textual_outline_modelled.expect
deleted file mode 100644
index 1ee4fc3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-export 'hello.dart' show main;
-export 'map.dart' show main;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.expect
deleted file mode 100644
index 7c1f015..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart:9:1: Error: 'main' is exported from both 'pkg/front_end/testcases/general_nnbd_opt_out/hello.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/map.dart'.
-// export 'map.dart' show main;
-// ^
-//
-import self as self;
-import "dart:core" as core;
-
-export "org-dartlang-testcase:///hello.dart" show main;
-export "org-dartlang-testcase:///map.dart" show main;
-
-static const field dynamic _exports# = #C1 /* from null */;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print(core::Map::•<dynamic, dynamic>());
-}
-
-constants  {
-  #C1 = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general_nnbd_opt_out/hello.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/map.dart'.\"}"
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.outline.expect
deleted file mode 100644
index c8204e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.outline.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart:9:1: Error: 'main' is exported from both 'pkg/front_end/testcases/general_nnbd_opt_out/hello.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/map.dart'.
-// export 'map.dart' show main;
-// ^
-//
-import self as self;
-
-export "org-dartlang-testcase:///hello.dart" show main;
-export "org-dartlang-testcase:///map.dart" show main;
-
-static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general_nnbd_opt_out/hello.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/map.dart'.\"}" /* from null */;
-
-library;
-import self as self2;
-
-static method main() → dynamic
-  ;
-
-library;
-import self as self3;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.transformed.expect
deleted file mode 100644
index 7c1f015..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart.weak.transformed.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/ambiguous_exports.dart:9:1: Error: 'main' is exported from both 'pkg/front_end/testcases/general_nnbd_opt_out/hello.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/map.dart'.
-// export 'map.dart' show main;
-// ^
-//
-import self as self;
-import "dart:core" as core;
-
-export "org-dartlang-testcase:///hello.dart" show main;
-export "org-dartlang-testcase:///map.dart" show main;
-
-static const field dynamic _exports# = #C1 /* from null */;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print(core::Map::•<dynamic, dynamic>());
-}
-
-constants  {
-  #C1 = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/general_nnbd_opt_out/hello.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/map.dart'.\"}"
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart
deleted file mode 100644
index 04b3543..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-main() {
-  print('There is a dangling annotation at the end of this file');
-}
-
-@AnnotationAtEOF
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.textual_outline.expect
deleted file mode 100644
index d6c9e30..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-@AnnotationAtEOF
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.expect
deleted file mode 100644
index 021015c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart:12:1: Error: Expected a declaration, but got ''.
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("There is a dangling annotation at the end of this file");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.outline.expect
deleted file mode 100644
index fea7584..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart:12:1: Error: Expected a declaration, but got ''.
-//
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.transformed.expect
deleted file mode 100644
index 021015c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart.weak.transformed.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/annotation_eof.dart:12:1: Error: Expected a declaration, but got ''.
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("There is a dangling annotation at the end of this file");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart
deleted file mode 100644
index 9c3734f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that annotations on enum values are preserved by the
-// compiler.
-
-const int hest = 42;
-
-class Fisk<T> {
-  final T x;
-  const Fisk.fisk(this.x);
-}
-
-enum Foo {
-  @hest
-  bar,
-  @Fisk.fisk(hest)
-  baz,
-  cafebabe,
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.textual_outline.expect
deleted file mode 100644
index 3887a59..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-const int hest = 42;
-
-class Fisk<T> {
-  final T x;
-  const Fisk.fisk(this.x);
-}
-
-enum Foo {
-  @hest
-  bar,
-  @Fisk.fisk(hest)
-  baz,
-  cafebabe,
-}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.textual_outline_modelled.expect
deleted file mode 100644
index 971520a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-class Fisk<T> {
-  const Fisk.fisk(this.x);
-  final T x;
-}
-
-const int hest = 42;
-enum Foo {
-  @hest
-  bar,
-  @Fisk.fisk(hest)
-  baz,
-  cafebabe,
-}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.expect
deleted file mode 100644
index fb849d9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.expect
+++ /dev/null
@@ -1,68 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Fisk<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  final field self::Fisk::T* x;
-  const constructor fisk(self::Fisk::T* x) → self::Fisk<self::Fisk::T*>*
-    : self::Fisk::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Foo*>* values = #C10;
-  @#C11
-  static const field self::Foo* bar = #C3;
-  @#C12
-  static const field self::Foo* baz = #C6;
-  static const field self::Foo* cafebabe = #C9;
-  const constructor •(core::int* index, core::String* _name) → self::Foo*
-    : self::Foo::index = index, self::Foo::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Foo::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* hest = #C11;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-  #C2 = "Foo.bar"
-  #C3 = self::Foo {index:#C1, _name:#C2}
-  #C4 = 1
-  #C5 = "Foo.baz"
-  #C6 = self::Foo {index:#C4, _name:#C5}
-  #C7 = 2
-  #C8 = "Foo.cafebabe"
-  #C9 = self::Foo {index:#C7, _name:#C8}
-  #C10 = <self::Foo*>[#C3, #C6, #C9]
-  #C11 = 42
-  #C12 = self::Fisk<core::int*> {x:#C11}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///annotation_on_enum_values.dart:
-- Foo. (from org-dartlang-testcase:///annotation_on_enum_values.dart:17:6)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Fisk.fisk (from org-dartlang-testcase:///annotation_on_enum_values.dart:14:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.outline.expect
deleted file mode 100644
index a6cc905..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.outline.expect
+++ /dev/null
@@ -1,57 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Fisk<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  final field self::Fisk::T* x;
-  const constructor fisk(self::Fisk::T* x) → self::Fisk<self::Fisk::T*>*
-    : self::Fisk::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Foo*>* values = const <self::Foo*>[self::Foo::bar, self::Foo::baz, self::Foo::cafebabe];
-  @self::hest
-  static const field self::Foo* bar = const self::Foo::•(0, "Foo.bar");
-  @self::Fisk::fisk<core::int*>(self::hest)
-  static const field self::Foo* baz = const self::Foo::•(1, "Foo.baz");
-  static const field self::Foo* cafebabe = const self::Foo::•(2, "Foo.cafebabe");
-  const constructor •(core::int* index, core::String* _name) → self::Foo*
-    : self::Foo::index = index, self::Foo::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Foo::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* hest = 42;
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: ListLiteral @ org-dartlang-testcase:///annotation_on_enum_values.dart:17:6 -> ListConstant(const <Foo*>[const Foo{Foo.index: 0, Foo._name: "Foo.bar"}, const Foo{Foo.index: 1, Foo._name: "Foo.baz"}, const Foo{Foo.index: 2, Foo._name: "Foo.cafebabe"}])
-Evaluated: StaticGet @ org-dartlang-testcase:///annotation_on_enum_values.dart:18:4 -> IntConstant(42)
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_on_enum_values.dart:19:3 -> InstanceConstant(const Foo{Foo.index: 0, Foo._name: "Foo.bar"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_on_enum_values.dart:20:4 -> InstanceConstant(const Fisk<int*>{Fisk.x: 42})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_on_enum_values.dart:21:3 -> InstanceConstant(const Foo{Foo.index: 1, Foo._name: "Foo.baz"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_on_enum_values.dart:22:3 -> InstanceConstant(const Foo{Foo.index: 2, Foo._name: "Foo.cafebabe"})
-Extra constant evaluation: evaluated: 11, effectively constant: 6
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.transformed.expect
deleted file mode 100644
index fb849d9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_on_enum_values.dart.weak.transformed.expect
+++ /dev/null
@@ -1,68 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Fisk<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  final field self::Fisk::T* x;
-  const constructor fisk(self::Fisk::T* x) → self::Fisk<self::Fisk::T*>*
-    : self::Fisk::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Foo*>* values = #C10;
-  @#C11
-  static const field self::Foo* bar = #C3;
-  @#C12
-  static const field self::Foo* baz = #C6;
-  static const field self::Foo* cafebabe = #C9;
-  const constructor •(core::int* index, core::String* _name) → self::Foo*
-    : self::Foo::index = index, self::Foo::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Foo::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* hest = #C11;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-  #C2 = "Foo.bar"
-  #C3 = self::Foo {index:#C1, _name:#C2}
-  #C4 = 1
-  #C5 = "Foo.baz"
-  #C6 = self::Foo {index:#C4, _name:#C5}
-  #C7 = 2
-  #C8 = "Foo.cafebabe"
-  #C9 = self::Foo {index:#C7, _name:#C8}
-  #C10 = <self::Foo*>[#C3, #C6, #C9]
-  #C11 = 42
-  #C12 = self::Fisk<core::int*> {x:#C11}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///annotation_on_enum_values.dart:
-- Foo. (from org-dartlang-testcase:///annotation_on_enum_values.dart:17:6)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Fisk.fisk (from org-dartlang-testcase:///annotation_on_enum_values.dart:14:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart
deleted file mode 100644
index 3cd10d1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-@a
-@A(1)
-library test;
-
-const Object a = const Object();
-
-class A {
-  const A(int value);
-}
-
-@a
-@A(2)
-class C {}
-
-@a
-@A(2)
-typedef void F1();
-
-@a
-@A(3)
-typedef F2 = void Function();
-
-@a
-@A(3)
-int f1, f2;
-
-@a
-@A(4)
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.textual_outline.expect
deleted file mode 100644
index 9309807..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.textual_outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-// @dart = 2.6
-@a
-@A(1)
-library test;
-
-const Object a = const Object();
-
-class A {
-  const A(int value);
-}
-
-@a
-@A(2)
-class C {}
-
-@a
-@A(2)
-typedef void F1();
-@a
-@A(3)
-typedef F2 = void Function();
-@a
-@A(3)
-int f1, f2;
-@a
-@A(4)
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.textual_outline_modelled.expect
deleted file mode 100644
index 1184734..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-// @dart = 2.6
-@a
-@A(1)
-library test;
-
-class A {
-  const A(int value);
-}
-
-@a
-@A(2)
-class C {}
-
-const Object a = const Object();
-@a
-@A(3)
-int f1, f2;
-@a
-@A(3)
-typedef F2 = void Function();
-@a
-@A(2)
-typedef void F1();
-@a
-@A(4)
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.expect
deleted file mode 100644
index 41693bf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.expect
+++ /dev/null
@@ -1,65 +0,0 @@
-@#C1
-@#C2
-library test;
-import self as self;
-import "dart:core" as core;
-
-@#C1
-@#C2
-typedef F1 = () →* void;
-@#C1
-@#C2
-typedef F2 = () →* void;
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* value) → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-@#C1
-@#C2
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::Object* a = #C1;
-@#C1
-@#C2
-static field core::int* f1;
-@#C1
-@#C2
-static field core::int* f2;
-@#C1
-@#C2
-static method main() → void {}
-
-constants  {
-  #C1 = core::Object {}
-  #C2 = self::A {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///annotation_top.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- A. (from org-dartlang-testcase:///annotation_top.dart:14:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.outline.expect
deleted file mode 100644
index c9729ec..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.outline.expect
+++ /dev/null
@@ -1,65 +0,0 @@
-@test::a
-@test::A::•(1)
-library test;
-import self as self;
-import "dart:core" as core;
-
-typedef F1 = () →* void;
-typedef F2 = () →* void;
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* value) → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-@self::a
-@self::A::•(2)
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::Object* a = const core::Object::•();
-@self::a
-@self::A::•(3)
-static field core::int* f1;
-@self::a
-@self::A::•(3)
-static field core::int* f2;
-@self::a
-@self::A::•(4)
-static method main() → void
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///annotation_top.dart:7:2 -> InstanceConstant(const Object{})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_top.dart:8:2 -> InstanceConstant(const A{})
-Evaluated: StaticGet @ org-dartlang-testcase:///annotation_top.dart:17:2 -> InstanceConstant(const Object{})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_top.dart:18:2 -> InstanceConstant(const A{})
-Evaluated: StaticGet @ org-dartlang-testcase:///annotation_top.dart:33:2 -> InstanceConstant(const Object{})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_top.dart:34:2 -> InstanceConstant(const A{})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_top.dart:11:24 -> InstanceConstant(const Object{})
-Evaluated: StaticGet @ org-dartlang-testcase:///annotation_top.dart:29:2 -> InstanceConstant(const Object{})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_top.dart:30:2 -> InstanceConstant(const A{})
-Evaluated: StaticGet @ org-dartlang-testcase:///annotation_top.dart:29:2 -> InstanceConstant(const Object{})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///annotation_top.dart:30:2 -> InstanceConstant(const A{})
-Extra constant evaluation: evaluated: 11, effectively constant: 11
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.transformed.expect
deleted file mode 100644
index 41693bf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_top.dart.weak.transformed.expect
+++ /dev/null
@@ -1,65 +0,0 @@
-@#C1
-@#C2
-library test;
-import self as self;
-import "dart:core" as core;
-
-@#C1
-@#C2
-typedef F1 = () →* void;
-@#C1
-@#C2
-typedef F2 = () →* void;
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* value) → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-@#C1
-@#C2
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::Object* a = #C1;
-@#C1
-@#C2
-static field core::int* f1;
-@#C1
-@#C2
-static field core::int* f2;
-@#C1
-@#C2
-static method main() → void {}
-
-constants  {
-  #C1 = core::Object {}
-  #C2 = self::A {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///annotation_top.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- A. (from org-dartlang-testcase:///annotation_top.dart:14:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart
deleted file mode 100644
index 90da02d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that the compiler handles annotations on formals of
-// typedefs.
-
-const int foo = 21;
-const int bar = 42;
-const int baz = 84;
-
-typedef void F(@foo int x, num y, {@bar @baz String z, Object w});
-typedef void G(@foo int a, num b, [@bar @baz String c, Object d]);
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.textual_outline.expect
deleted file mode 100644
index 615ace3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-const int foo = 21;
-const int bar = 42;
-const int baz = 84;
-typedef void F(@foo int x, num y, {@bar @baz String z, Object w});
-typedef void G(@foo int a, num b, [@bar @baz String c, Object d]);
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.textual_outline_modelled.expect
deleted file mode 100644
index 837f56e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-const int bar = 42;
-const int baz = 84;
-const int foo = 21;
-main() {}
-typedef void F(@foo int x, num y, {@bar @baz String z, Object w});
-typedef void G(@foo int a, num b, [@bar @baz String c, Object d]);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.expect
deleted file mode 100644
index d6f9911..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F = (@#C1 core::int* x, core::num* y, {@#C2 @#C3 core::String* z, core::Object* w}) →* void;
-typedef G = (@#C1 core::int* a, core::num* b, [@#C2 @#C3 core::String* c, core::Object* d]) →* void;
-static const field core::int* foo = #C1;
-static const field core::int* bar = #C2;
-static const field core::int* baz = #C3;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 21
-  #C2 = 42
-  #C3 = 84
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.outline.expect
deleted file mode 100644
index c1deefb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F = (core::int*, core::num*, {w: core::Object*, z: core::String*}) →* void;
-typedef G = (core::int*, core::num*, [core::String*, core::Object*]) →* void;
-static const field core::int* foo = 21;
-static const field core::int* bar = 42;
-static const field core::int* baz = 84;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.transformed.expect
deleted file mode 100644
index d6f9911..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals.dart.weak.transformed.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F = (@#C1 core::int* x, core::num* y, {@#C2 @#C3 core::String* z, core::Object* w}) →* void;
-typedef G = (@#C1 core::int* a, core::num* b, [@#C2 @#C3 core::String* c, core::Object* d]) →* void;
-static const field core::int* foo = #C1;
-static const field core::int* bar = #C2;
-static const field core::int* baz = #C3;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 21
-  #C2 = 42
-  #C3 = 84
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart
deleted file mode 100644
index 0cddef7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that the annotation on a formal parameter of a typedef is
-// resolved to the top-level constant, and not to the parameter itself in case
-// of a name match.
-
-const int app = 0;
-
-typedef int F(@app int app);
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.textual_outline.expect
deleted file mode 100644
index 8f7e683..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-const int app = 0;
-typedef int F(@app int app);
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.textual_outline_modelled.expect
deleted file mode 100644
index 89c11f5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-const int app = 0;
-main() {}
-typedef int F(@app int app);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.expect
deleted file mode 100644
index 9bab9c9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F = (@#C1 core::int* app) →* core::int*;
-static const field core::int* app = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.outline.expect
deleted file mode 100644
index 4c75196..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F = (core::int*) →* core::int*;
-static const field core::int* app = 0;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.transformed.expect
deleted file mode 100644
index 9bab9c9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_typedef_formals_resolution.dart.weak.transformed.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F = (@#C1 core::int* app) →* core::int*;
-static const field core::int* app = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart
deleted file mode 100644
index 55a5032..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-const int foo = 42;
-
-class Bar {
-  const Bar();
-  const Bar.named(x);
-}
-
-class Baz {
-  Baz(@foo constructorFormal);
-
-  factory Baz.bazFactory(@foo factoryFormal) => null;
-
-  fisk(@foo formal1, @Bar() formal2, @Bar.named(foo) formal3,
-      @foo @Bar.named(foo) formal4,
-      [@foo optional]) {
-    @foo
-    var local1;
-
-    @Bar()
-    var local2;
-
-    @Bar.named(foo)
-    var local3;
-
-    @foo
-    @Bar.named(foo)
-    var local4;
-
-    @foo
-    var localWithInitializer = "hello";
-
-    @foo
-    @Bar.named(foo)
-    var localGroupPart1, localGroupPart2;
-
-    naebdyr(@foo nestedFormal) => null;
-
-    var roedmus = (@foo closureFormal) => null;
-  }
-
-  hest({@foo named}) => null;
-}
-
-typedef hest_t({@foo named});
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.textual_outline.expect
deleted file mode 100644
index 344db06..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.textual_outline.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-const int foo = 42;
-
-class Bar {
-  const Bar();
-  const Bar.named(x);
-}
-
-class Baz {
-  Baz(@foo constructorFormal);
-  factory Baz.bazFactory(@foo factoryFormal) => null;
-  fisk(@foo formal1, @Bar() formal2, @Bar.named(foo) formal3,
-      @foo @Bar.named(foo) formal4,
-      [@foo optional]) {}
-  hest({@foo named}) => null;
-}
-
-typedef hest_t({@foo named});
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.textual_outline_modelled.expect
deleted file mode 100644
index 867b039..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-class Bar {
-  const Bar();
-  const Bar.named(x);
-}
-
-class Baz {
-  Baz(@foo constructorFormal);
-  factory Baz.bazFactory(@foo factoryFormal) => null;
-  fisk(@foo formal1, @Bar() formal2, @Bar.named(foo) formal3,
-      @foo @Bar.named(foo) formal4,
-      [@foo optional]) {}
-  hest({@foo named}) => null;
-}
-
-const int foo = 42;
-main() {}
-typedef hest_t({@foo named});
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.expect
deleted file mode 100644
index a3070a4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.expect
+++ /dev/null
@@ -1,69 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef hest_t = ({@#C1 dynamic named}) →* dynamic;
-class Bar extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  const constructor named(dynamic x) → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Baz extends core::Object {
-  constructor •(@#C1 dynamic constructorFormal) → self::Baz*
-    : super core::Object::•()
-    ;
-  static factory bazFactory(@#C1 dynamic factoryFormal) → self::Baz*
-    return null;
-  method fisk(@#C1 dynamic formal1, @#C2 dynamic formal2, @#C2 dynamic formal3, @#C1 @#C2 dynamic formal4, [@#C1 dynamic optional = #C3]) → dynamic {
-    @#C1 dynamic local1;
-    @#C2 dynamic local2;
-    @#C2 dynamic local3;
-    @#C1 @#C2 dynamic local4;
-    @#C1 core::String* localWithInitializer = "hello";
-    @#C1 @#C2 dynamic localGroupPart1;
-    @#C1 @#C2 dynamic localGroupPart2;
-    function naebdyr(@#C1 dynamic nestedFormal) → Null
-      return null;
-    (dynamic) →* Null roedmus = (@#C1 dynamic closureFormal) → Null => null;
-  }
-  method hest({@#C1 dynamic named = #C3}) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* foo = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 42
-  #C2 = self::Bar {}
-  #C3 = null
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///annotation_variable_declaration.dart:
-- Bar. (from org-dartlang-testcase:///annotation_variable_declaration.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Bar.named (from org-dartlang-testcase:///annotation_variable_declaration.dart:11:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.outline.expect
deleted file mode 100644
index cf16cc9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.outline.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef hest_t = ({named: dynamic}) →* dynamic;
-class Bar extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  const constructor named(dynamic x) → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Baz extends core::Object {
-  constructor •(dynamic constructorFormal) → self::Baz*
-    ;
-  static factory bazFactory(dynamic factoryFormal) → self::Baz*
-    ;
-  method fisk(dynamic formal1, dynamic formal2, dynamic formal3, dynamic formal4, [dynamic optional]) → dynamic
-    ;
-  method hest({dynamic named}) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* foo = 42;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.transformed.expect
deleted file mode 100644
index a3070a4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/annotation_variable_declaration.dart.weak.transformed.expect
+++ /dev/null
@@ -1,69 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef hest_t = ({@#C1 dynamic named}) →* dynamic;
-class Bar extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  const constructor named(dynamic x) → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Baz extends core::Object {
-  constructor •(@#C1 dynamic constructorFormal) → self::Baz*
-    : super core::Object::•()
-    ;
-  static factory bazFactory(@#C1 dynamic factoryFormal) → self::Baz*
-    return null;
-  method fisk(@#C1 dynamic formal1, @#C2 dynamic formal2, @#C2 dynamic formal3, @#C1 @#C2 dynamic formal4, [@#C1 dynamic optional = #C3]) → dynamic {
-    @#C1 dynamic local1;
-    @#C2 dynamic local2;
-    @#C2 dynamic local3;
-    @#C1 @#C2 dynamic local4;
-    @#C1 core::String* localWithInitializer = "hello";
-    @#C1 @#C2 dynamic localGroupPart1;
-    @#C1 @#C2 dynamic localGroupPart2;
-    function naebdyr(@#C1 dynamic nestedFormal) → Null
-      return null;
-    (dynamic) →* Null roedmus = (@#C1 dynamic closureFormal) → Null => null;
-  }
-  method hest({@#C1 dynamic named = #C3}) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* foo = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 42
-  #C2 = self::Bar {}
-  #C3 = null
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///annotation_variable_declaration.dart:
-- Bar. (from org-dartlang-testcase:///annotation_variable_declaration.dart:10:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Bar.named (from org-dartlang-testcase:///annotation_variable_declaration.dart:11:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart b/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart
deleted file mode 100644
index 7a39945..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-abstract class Base {}
-
-class Foo extends Base {}
-
-class Bar extends Base {}
-
-class Baz extends Base {}
-
-void foo(x) {}
-
-void bar(x) {}
-
-void foo_escaped(x) {}
-
-void bar_escaped(x) {}
-
-void escape(fn) {
-  fn(new Baz());
-}
-
-main() {
-  foo(new Foo());
-  bar(new Bar());
-  escape(foo_escaped);
-  escape(bar_escaped);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.textual_outline.expect
deleted file mode 100644
index e20f5e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.textual_outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-abstract class Base {}
-
-class Foo extends Base {}
-
-class Bar extends Base {}
-
-class Baz extends Base {}
-
-void foo(x) {}
-void bar(x) {}
-void foo_escaped(x) {}
-void bar_escaped(x) {}
-void escape(fn) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.textual_outline_modelled.expect
deleted file mode 100644
index 4d47274..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-abstract class Base {}
-
-class Bar extends Base {}
-
-class Baz extends Base {}
-
-class Foo extends Base {}
-
-main() {}
-void bar(x) {}
-void bar_escaped(x) {}
-void escape(fn) {}
-void foo(x) {}
-void foo_escaped(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.expect
deleted file mode 100644
index 4afa1a6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.expect
+++ /dev/null
@@ -1,52 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class Base extends core::Object {
-  synthetic constructor •() → self::Base*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends self::Base {
-  synthetic constructor •() → self::Foo*
-    : super self::Base::•()
-    ;
-}
-class Bar extends self::Base {
-  synthetic constructor •() → self::Bar*
-    : super self::Base::•()
-    ;
-}
-class Baz extends self::Base {
-  synthetic constructor •() → self::Baz*
-    : super self::Base::•()
-    ;
-}
-static method foo(dynamic x) → void {}
-static method bar(dynamic x) → void {}
-static method foo_escaped(dynamic x) → void {}
-static method bar_escaped(dynamic x) → void {}
-static method escape(dynamic fn) → void {
-  fn.call(new self::Baz::•());
-}
-static method main() → dynamic {
-  self::foo(new self::Foo::•());
-  self::bar(new self::Bar::•());
-  self::escape(#C1);
-  self::escape(#C2);
-}
-
-constants  {
-  #C1 = tearoff self::foo_escaped
-  #C2 = tearoff self::bar_escaped
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.outline.expect
deleted file mode 100644
index 4dc8fe1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.outline.expect
+++ /dev/null
@@ -1,42 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class Base extends core::Object {
-  synthetic constructor •() → self::Base*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends self::Base {
-  synthetic constructor •() → self::Foo*
-    ;
-}
-class Bar extends self::Base {
-  synthetic constructor •() → self::Bar*
-    ;
-}
-class Baz extends self::Base {
-  synthetic constructor •() → self::Baz*
-    ;
-}
-static method foo(dynamic x) → void
-  ;
-static method bar(dynamic x) → void
-  ;
-static method foo_escaped(dynamic x) → void
-  ;
-static method bar_escaped(dynamic x) → void
-  ;
-static method escape(dynamic fn) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.transformed.expect
deleted file mode 100644
index 4afa1a6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument.dart.weak.transformed.expect
+++ /dev/null
@@ -1,52 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class Base extends core::Object {
-  synthetic constructor •() → self::Base*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends self::Base {
-  synthetic constructor •() → self::Foo*
-    : super self::Base::•()
-    ;
-}
-class Bar extends self::Base {
-  synthetic constructor •() → self::Bar*
-    : super self::Base::•()
-    ;
-}
-class Baz extends self::Base {
-  synthetic constructor •() → self::Baz*
-    : super self::Base::•()
-    ;
-}
-static method foo(dynamic x) → void {}
-static method bar(dynamic x) → void {}
-static method foo_escaped(dynamic x) → void {}
-static method bar_escaped(dynamic x) → void {}
-static method escape(dynamic fn) → void {
-  fn.call(new self::Baz::•());
-}
-static method main() → dynamic {
-  self::foo(new self::Foo::•());
-  self::bar(new self::Bar::•());
-  self::escape(#C1);
-  self::escape(#C2);
-}
-
-constants  {
-  #C1 = tearoff self::foo_escaped
-  #C2 = tearoff self::bar_escaped
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart
deleted file mode 100644
index 4af4b88..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-foo() {}
-
-test() {
-  foo(null);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.textual_outline.expect
deleted file mode 100644
index efa46bf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-foo() {}
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6201b42..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-foo() {}
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.expect
deleted file mode 100644
index a408458..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
-// Try removing the extra positional arguments.
-//   foo(null);
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:7:1: Context: Found this candidate, but the arguments don't match.
-// foo() {}
-// ^^^
-//
-import self as self;
-
-static method foo() → dynamic {}
-static method test() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
-Try removing the extra positional arguments.
-  foo(null);
-     ^";
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.outline.expect
deleted file mode 100644
index 33d65b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-
-static method foo() → dynamic
-  ;
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.transformed.expect
deleted file mode 100644
index a408458..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart.weak.transformed.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
-// Try removing the extra positional arguments.
-//   foo(null);
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:7:1: Context: Found this candidate, but the arguments don't match.
-// foo() {}
-// ^^^
-//
-import self as self;
-
-static method foo() → dynamic {}
-static method test() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/argument_mismatch.dart:10:6: Error: Too many positional arguments: 0 allowed, but 1 found.
-Try removing the extra positional arguments.
-  foo(null);
-     ^";
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart b/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart
deleted file mode 100644
index a0922f2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-int foo(int x, int y) {
-  var z = x + y;
-  return z << 4;
-}
-
-void loop(List xs) {
-  int _ = xs.length;
-  for (int i = 0; i < xs.length; i++) {}
-}
-
-main() {
-  foo(4, 5);
-  foo(6, 7);
-  loop(['dfg']);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.textual_outline.expect
deleted file mode 100644
index ca67ea8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-int foo(int x, int y) {}
-void loop(List xs) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.textual_outline_modelled.expect
deleted file mode 100644
index c1ce4ed..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-int foo(int x, int y) {}
-main() {}
-void loop(List xs) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.expect
deleted file mode 100644
index ed95ed2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method foo(core::int* x, core::int* y) → core::int* {
-  core::int* z = x.{core::num::+}(y);
-  return z.{core::int::<<}(4);
-}
-static method loop(core::List<dynamic>* xs) → void {
-  core::int* _ = xs.{core::List::length};
-  for (core::int* i = 0; i.{core::num::<}(xs.{core::List::length}); i = i.{core::num::+}(1)) {
-  }
-}
-static method main() → dynamic {
-  self::foo(4, 5);
-  self::foo(6, 7);
-  self::loop(<dynamic>["dfg"]);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.outline.expect
deleted file mode 100644
index 6a82a38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method foo(core::int* x, core::int* y) → core::int*
-  ;
-static method loop(core::List<dynamic>* xs) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.transformed.expect
deleted file mode 100644
index 0f2a3e1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arithmetic.dart.weak.transformed.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method foo(core::int* x, core::int* y) → core::int* {
-  core::int* z = x.{core::num::+}(y);
-  return z.{core::int::<<}(4);
-}
-static method loop(core::List<dynamic>* xs) → void {
-  core::int* _ = xs.{core::List::length};
-  for (core::int* i = 0; i.{core::num::<}(xs.{core::List::length}); i = i.{core::num::+}(1)) {
-  }
-}
-static method main() → dynamic {
-  self::foo(4, 5);
-  self::foo(6, 7);
-  self::loop(core::_GrowableList::_literal1<dynamic>("dfg"));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart b/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart
deleted file mode 100644
index 0b8faef..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-main<T>() => () => T;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.textual_outline.expect
deleted file mode 100644
index 75db4ee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main<T>() => () => T;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.textual_outline_modelled.expect
deleted file mode 100644
index 75db4ee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main<T>() => () => T;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.expect
deleted file mode 100644
index 964b0b4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main<T extends core::Object* = dynamic>() → dynamic
-  return () → core::Type* => self::main::T*;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.outline.expect
deleted file mode 100644
index 5ea07d3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main<T extends core::Object* = dynamic>() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.transformed.expect
deleted file mode 100644
index 964b0b4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/arrow_function.dart.weak.transformed.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main<T extends core::Object* = dynamic>() → dynamic
-  return () → core::Type* => self::main::T*;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart b/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart
deleted file mode 100644
index 9b9c2d1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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.6
-
-import "package:expect/expect.dart";
-
-class A {
-  var x, y;
-  // This should cause an error because `x` is final when accessed as an
-  // initializing formal.
-  A(this.x)
-      : y = (() {
-          x = 3;
-        });
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.textual_outline.expect
deleted file mode 100644
index 68305dd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart";
-
-class A {
-  var x, y;
-  A(this.x)
-      : y = (() {
-          x = 3;
-        });
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.textual_outline_modelled.expect
deleted file mode 100644
index b0144e8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart";
-
-class A {
-  A(this.x)
-      : y = (() {
-          x = 3;
-        });
-  var x, y;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.expect
deleted file mode 100644
index c916da3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart:15:11: Error: Can't assign to the final variable 'x'.
-//           x = 3;
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-class A extends core::Object {
-  field dynamic x;
-  field dynamic y;
-  constructor •(dynamic x) → self::A*
-    : self::A::x = x, self::A::y = () → Null {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart:15:11: Error: Can't assign to the final variable 'x'.
-          x = 3;
-          ^";
-    }, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.outline.expect
deleted file mode 100644
index ddf3acf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-class A extends core::Object {
-  field dynamic x;
-  field dynamic y;
-  constructor •(dynamic x) → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.transformed.expect
deleted file mode 100644
index c916da3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart.weak.transformed.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart:15:11: Error: Can't assign to the final variable 'x'.
-//           x = 3;
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-class A extends core::Object {
-  field dynamic x;
-  field dynamic y;
-  constructor •(dynamic x) → self::A*
-    : self::A::x = x, self::A::y = () → Null {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/assign_to_initializing_formal.dart:15:11: Error: Can't assign to the final variable 'x'.
-          x = 3;
-          ^";
-    }, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart b/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart
deleted file mode 100644
index ed67884..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-import 'dart:async';
-
-Future<String> asyncString() async {
-  return "foo";
-}
-
-Future<String> asyncString2() async {
-  return asyncString();
-}
-
-Iterable<String> syncStarString() sync* {
-  yield "foo";
-  yield* syncStarString2();
-  yield* stringList;
-}
-
-Iterable<String> syncStarString2() sync* {
-  yield "foo";
-}
-
-Stream<String> asyncStarString() async* {
-  yield "foo";
-  yield* asyncStarString2();
-  yield await asyncString();
-}
-
-Stream<String> asyncStarString2() async* {
-  yield "bar";
-}
-
-List<String> stringList = ["bar"];
-
-main() async {
-  String str = await asyncString();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.textual_outline.expect
deleted file mode 100644
index a305334..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-Future<String> asyncString() async {}
-Future<String> asyncString2() async {}
-Iterable<String> syncStarString() sync* {}
-Iterable<String> syncStarString2() sync* {}
-Stream<String> asyncStarString() async* {}
-Stream<String> asyncStarString2() async* {}
-List<String> stringList = ["bar"];
-main() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.textual_outline_modelled.expect
deleted file mode 100644
index 4121d7b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-Future<String> asyncString() async {}
-Future<String> asyncString2() async {}
-Iterable<String> syncStarString() sync* {}
-Iterable<String> syncStarString2() sync* {}
-List<String> stringList = ["bar"];
-Stream<String> asyncStarString() async* {}
-Stream<String> asyncStarString2() async* {}
-main() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.expect
deleted file mode 100644
index 4a640a9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-import self as self;
-import "dart:async" as asy;
-import "dart:core" as core;
-
-import "dart:async";
-
-static field core::List<core::String*>* stringList = <core::String*>["bar"];
-static method asyncString() → asy::Future<core::String*>* async {
-  return "foo";
-}
-static method asyncString2() → asy::Future<core::String*>* async {
-  return self::asyncString();
-}
-static method syncStarString() → core::Iterable<core::String*>* sync* {
-  yield "foo";
-  yield* self::syncStarString2();
-  yield* self::stringList;
-}
-static method syncStarString2() → core::Iterable<core::String*>* sync* {
-  yield "foo";
-}
-static method asyncStarString() → asy::Stream<core::String*>* async* {
-  yield "foo";
-  yield* self::asyncStarString2();
-  yield await self::asyncString();
-}
-static method asyncStarString2() → asy::Stream<core::String*>* async* {
-  yield "bar";
-}
-static method main() → dynamic async {
-  core::String* str = await self::asyncString();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.outline.expect
deleted file mode 100644
index b2b99f7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:async" as asy;
-import "dart:core" as core;
-
-import "dart:async";
-
-static field core::List<core::String*>* stringList;
-static method asyncString() → asy::Future<core::String*>* async 
-  ;
-static method asyncString2() → asy::Future<core::String*>* async 
-  ;
-static method syncStarString() → core::Iterable<core::String*>* sync* 
-  ;
-static method syncStarString2() → core::Iterable<core::String*>* sync* 
-  ;
-static method asyncStarString() → asy::Stream<core::String*>* async* 
-  ;
-static method asyncStarString2() → asy::Stream<core::String*>* async* 
-  ;
-static method main() → dynamic async 
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.transformed.expect
deleted file mode 100644
index 2a42c83..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_function.dart.weak.transformed.expect
+++ /dev/null
@@ -1,208 +0,0 @@
-library;
-import self as self;
-import "dart:async" as asy;
-import "dart:core" as core;
-import "dart:_internal" as _in;
-
-import "dart:async";
-
-static field core::List<core::String*>* stringList = core::_GrowableList::_literal1<core::String*>("bar");
-static method asyncString() → asy::Future<core::String*>* /* originally async */ {
-  final asy::_Future<core::String*>* :async_future = new asy::_Future::•<core::String*>();
-  core::bool* :is_sync = false;
-  FutureOr<core::String*>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        :return_value = "foo";
-        break #L1;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method asyncString2() → asy::Future<core::String*>* /* originally async */ {
-  final asy::_Future<core::String*>* :async_future = new asy::_Future::•<core::String*>();
-  core::bool* :is_sync = false;
-  FutureOr<core::String*>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L2:
-      {
-        :return_value = self::asyncString();
-        break #L2;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method syncStarString() → core::Iterable<core::String*>* /* originally sync* */ {
-  function :sync_op_gen() → (core::_SyncIterator<dynamic>*, dynamic, dynamic) →* core::bool* {
-    core::int* :await_jump_var = 0;
-    dynamic :await_ctx_var;
-    function :sync_op(core::_SyncIterator<dynamic>* :iterator, dynamic :exception, dynamic :stack_trace) → core::bool* yielding {
-      {
-        {
-          :iterator.{core::_SyncIterator::_current} = "foo";
-          [yield] true;
-        }
-        {
-          :iterator.{core::_SyncIterator::_yieldEachIterable} = self::syncStarString2();
-          [yield] true;
-        }
-        {
-          :iterator.{core::_SyncIterator::_yieldEachIterable} = self::stringList;
-          [yield] true;
-        }
-      }
-      return false;
-    }
-    return :sync_op;
-  }
-  return new core::_SyncIterable::•<core::String*>(:sync_op_gen);
-}
-static method syncStarString2() → core::Iterable<core::String*>* /* originally sync* */ {
-  function :sync_op_gen() → (core::_SyncIterator<dynamic>*, dynamic, dynamic) →* core::bool* {
-    core::int* :await_jump_var = 0;
-    dynamic :await_ctx_var;
-    function :sync_op(core::_SyncIterator<dynamic>* :iterator, dynamic :exception, dynamic :stack_trace) → core::bool* yielding {
-      {
-        {
-          :iterator.{core::_SyncIterator::_current} = "foo";
-          [yield] true;
-        }
-      }
-      return false;
-    }
-    return :sync_op;
-  }
-  return new core::_SyncIterable::•<core::String*>(:sync_op_gen);
-}
-static method asyncStarString() → asy::Stream<core::String*>* /* originally async* */ {
-  asy::_AsyncStarStreamController<core::String*>* :controller;
-  dynamic :controller_stream;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try
-      try {
-        #L3:
-        {
-          if(:controller.{asy::_AsyncStarStreamController::add}("foo"))
-            return null;
-          else
-            [yield] null;
-          if(:controller.{asy::_AsyncStarStreamController::addStream}(self::asyncStarString2()))
-            return null;
-          else
-            [yield] null;
-          [yield] let dynamic #t1 = asy::_awaitHelper(self::asyncString(), :async_op_then, :async_op_error, :async_op) in null;
-          if(:controller.{asy::_AsyncStarStreamController::add}(_in::unsafeCast<core::String*>(:result)))
-            return null;
-          else
-            [yield] null;
-        }
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        :controller.{asy::_AsyncStarStreamController::addError}(exception, stack_trace);
-      }
-    finally {
-      :controller.{asy::_AsyncStarStreamController::close}();
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :controller = new asy::_AsyncStarStreamController::•<core::String*>(:async_op);
-  :controller_stream = :controller.{asy::_AsyncStarStreamController::stream};
-  return :controller_stream;
-}
-static method asyncStarString2() → asy::Stream<core::String*>* /* originally async* */ {
-  asy::_AsyncStarStreamController<core::String*>* :controller;
-  dynamic :controller_stream;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try
-      try {
-        #L4:
-        {
-          if(:controller.{asy::_AsyncStarStreamController::add}("bar"))
-            return null;
-          else
-            [yield] null;
-        }
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        :controller.{asy::_AsyncStarStreamController::addError}(exception, stack_trace);
-      }
-    finally {
-      :controller.{asy::_AsyncStarStreamController::close}();
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :controller = new asy::_AsyncStarStreamController::•<core::String*>(:async_op);
-  :controller_stream = :controller.{asy::_AsyncStarStreamController::stream};
-  return :controller_stream;
-}
-static method main() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L5:
-      {
-        [yield] let dynamic #t2 = asy::_awaitHelper(self::asyncString(), :async_op_then, :async_op_error, :async_op) in null;
-        core::String* str = _in::unsafeCast<core::String*>(:result);
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart b/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart
deleted file mode 100644
index fdc0e11..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This has been automatically generated by script
-// "async_nested_test_generator.dart".
-
-import 'dart:async';
-
-void main() async {
-  String expected = "1 2 3 4 5 6 7 8 9 10";
-  Node node = new Node('1', [
-    new Node('2', []),
-    await new Future.value(new Node('3', [
-      await new Future.value(new Node('4', [
-        new Node('5', [
-          await new Future.value(new Node('6', [
-            await new Future.value(new Node('7', [])),
-          ])),
-          await new Future.value(new Node('8', [])),
-          await new Future.value(new Node('9', [])),
-        ]),
-      ])),
-    ])),
-    await new Future.value(new Node('10', [])),
-  ]);
-  String actual = node.toSimpleString();
-  print(actual);
-  if (actual != expected) {
-    throw "Expected '$expected' but got '$actual'";
-  }
-}
-
-class Node {
-  final List<Node> nested;
-  final String name;
-
-  Node(this.name, [this.nested]) {}
-
-  String toString() => '<$name:[${nested?.join(', ')}]>';
-
-  toSimpleString() {
-    var tmp = nested?.map((child) => child.toSimpleString());
-    return '$name ${tmp?.join(' ')}'.trim();
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.textual_outline.expect
deleted file mode 100644
index 9fc36c1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-void main() async {}
-
-class Node {
-  final List<Node> nested;
-  final String name;
-  Node(this.name, [this.nested]) {}
-  String toString() => '<$name:[${nested?.join(', ')}]>';
-  toSimpleString() {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.textual_outline_modelled.expect
deleted file mode 100644
index 3092b93..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-class Node {
-  Node(this.name, [this.nested]) {}
-  String toString() => '<$name:[${nested?.join(', ')}]>';
-  final List<Node> nested;
-  final String name;
-  toSimpleString() {}
-}
-
-void main() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.expect
deleted file mode 100644
index 25bc8dc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class Node extends core::Object {
-  final field core::List<self::Node*>* nested;
-  final field core::String* name;
-  constructor •(core::String* name, [core::List<self::Node*>* nested = #C1]) → self::Node*
-    : self::Node::name = name, self::Node::nested = nested, super core::Object::•() {}
-  method toString() → core::String*
-    return "<${this.{self::Node::name}}:[${let final core::List<self::Node*>* #t1 = this.{self::Node::nested} in #t1.{core::List::==}(null) ?{core::String*} null : #t1.{core::Iterable::join}(", ")}]>";
-  method toSimpleString() → dynamic {
-    core::Iterable<dynamic>* tmp = let final core::List<self::Node*>* #t2 = this.{self::Node::nested} in #t2.{core::List::==}(null) ?{core::Iterable<dynamic>*} null : #t2.{core::Iterable::map}<dynamic>((self::Node* child) → dynamic => child.{self::Node::toSimpleString}());
-    return "${this.{self::Node::name}} ${let final core::Iterable<dynamic>* #t3 = tmp in #t3.{core::Object::==}(null) ?{core::String*} null : #t3.{core::Iterable::join}(" ")}".{core::String::trim}();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void async {
-  core::String* expected = "1 2 3 4 5 6 7 8 9 10";
-  self::Node* node = new self::Node::•("1", <self::Node*>[new self::Node::•("2", <self::Node*>[]), await asy::Future::value<self::Node*>(new self::Node::•("3", <self::Node*>[await asy::Future::value<self::Node*>(new self::Node::•("4", <self::Node*>[new self::Node::•("5", <self::Node*>[await asy::Future::value<self::Node*>(new self::Node::•("6", <self::Node*>[await asy::Future::value<self::Node*>(new self::Node::•("7", <self::Node*>[]))])), await asy::Future::value<self::Node*>(new self::Node::•("8", <self::Node*>[])), await asy::Future::value<self::Node*>(new self::Node::•("9", <self::Node*>[]))])]))])), await asy::Future::value<self::Node*>(new self::Node::•("10", <self::Node*>[]))]);
-  core::String* actual = node.{self::Node::toSimpleString}() as{TypeError,ForDynamic} core::String*;
-  core::print(actual);
-  if(!actual.{core::String::==}(expected)) {
-    throw "Expected '${expected}' but got '${actual}'";
-  }
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.outline.expect
deleted file mode 100644
index f2d2efa..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "dart:async";
-
-class Node extends core::Object {
-  final field core::List<self::Node*>* nested;
-  final field core::String* name;
-  constructor •(core::String* name, [core::List<self::Node*>* nested]) → self::Node*
-    ;
-  method toString() → core::String*
-    ;
-  method toSimpleString() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void async 
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.transformed.expect
deleted file mode 100644
index 760f00e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/async_nested.dart.weak.transformed.expect
+++ /dev/null
@@ -1,80 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-import "dart:_internal" as _in;
-
-import "dart:async";
-
-class Node extends core::Object {
-  final field core::List<self::Node*>* nested;
-  final field core::String* name;
-  constructor •(core::String* name, [core::List<self::Node*>* nested = #C1]) → self::Node*
-    : self::Node::name = name, self::Node::nested = nested, super core::Object::•() {}
-  method toString() → core::String*
-    return "<${this.{self::Node::name}}:[${let final core::List<self::Node*>* #t1 = this.{self::Node::nested} in #t1.{core::List::==}(null) ?{core::String*} null : #t1.{core::Iterable::join}(", ")}]>";
-  method toSimpleString() → dynamic {
-    core::Iterable<dynamic>* tmp = let final core::List<self::Node*>* #t2 = this.{self::Node::nested} in #t2.{core::List::==}(null) ?{core::Iterable<dynamic>*} null : #t2.{core::Iterable::map}<dynamic>((self::Node* child) → dynamic => child.{self::Node::toSimpleString}());
-    return "${this.{self::Node::name}} ${let final core::Iterable<dynamic>* #t3 = tmp in #t3.{core::Object::==}(null) ?{core::String*} null : #t3.{core::Iterable::join}(" ")}".{core::String::trim}();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :async_temporary_0;
-  dynamic :async_temporary_1;
-  dynamic :async_temporary_2;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        core::String* expected = "1 2 3 4 5 6 7 8 9 10";
-        :async_temporary_2 = new self::Node::•("2", core::_GrowableList::•<self::Node*>(0));
-        [yield] let dynamic #t4 = asy::_awaitHelper(asy::Future::value<self::Node*>(new self::Node::•("7", core::_GrowableList::•<self::Node*>(0))), :async_op_then, :async_op_error, :async_op) in null;
-        [yield] let dynamic #t5 = asy::_awaitHelper(asy::Future::value<self::Node*>(new self::Node::•("6", core::_GrowableList::_literal1<self::Node*>(_in::unsafeCast<self::Node*>(:result)))), :async_op_then, :async_op_error, :async_op) in null;
-        :async_temporary_1 = _in::unsafeCast<self::Node*>(:result);
-        [yield] let dynamic #t6 = asy::_awaitHelper(asy::Future::value<self::Node*>(new self::Node::•("8", core::_GrowableList::•<self::Node*>(0))), :async_op_then, :async_op_error, :async_op) in null;
-        :async_temporary_0 = _in::unsafeCast<self::Node*>(:result);
-        [yield] let dynamic #t7 = asy::_awaitHelper(asy::Future::value<self::Node*>(new self::Node::•("9", core::_GrowableList::•<self::Node*>(0))), :async_op_then, :async_op_error, :async_op) in null;
-        [yield] let dynamic #t8 = asy::_awaitHelper(asy::Future::value<self::Node*>(new self::Node::•("4", core::_GrowableList::_literal1<self::Node*>(new self::Node::•("5", core::_GrowableList::_literal3<self::Node*>(_in::unsafeCast<self::Node*>(:async_temporary_1), _in::unsafeCast<self::Node*>(:async_temporary_0), _in::unsafeCast<self::Node*>(:result)))))), :async_op_then, :async_op_error, :async_op) in null;
-        [yield] let dynamic #t9 = asy::_awaitHelper(asy::Future::value<self::Node*>(new self::Node::•("3", core::_GrowableList::_literal1<self::Node*>(_in::unsafeCast<self::Node*>(:result)))), :async_op_then, :async_op_error, :async_op) in null;
-        :async_temporary_0 = _in::unsafeCast<self::Node*>(:result);
-        [yield] let dynamic #t10 = asy::_awaitHelper(asy::Future::value<self::Node*>(new self::Node::•("10", core::_GrowableList::•<self::Node*>(0))), :async_op_then, :async_op_error, :async_op) in null;
-        self::Node* node = new self::Node::•("1", core::_GrowableList::_literal3<self::Node*>(_in::unsafeCast<self::Node*>(:async_temporary_2), _in::unsafeCast<self::Node*>(:async_temporary_0), _in::unsafeCast<self::Node*>(:result)));
-        core::String* actual = node.{self::Node::toSimpleString}() as{TypeError,ForDynamic} core::String*;
-        core::print(actual);
-        if(!actual.{core::String::==}(expected)) {
-          throw "Expected '${expected}' but got '${actual}'";
-        }
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart b/pkg/front_end/testcases/general_nnbd_opt_out/await.dart
deleted file mode 100644
index 84c5add..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() async {
-  print(await "Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.textual_outline.expect
deleted file mode 100644
index f072043..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.textual_outline_modelled.expect
deleted file mode 100644
index f072043..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.expect
deleted file mode 100644
index 5b1be33..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic async {
-  core::print(await "Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.outline.expect
deleted file mode 100644
index b3304ef..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic async 
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.transformed.expect
deleted file mode 100644
index 04a6af0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await.dart.weak.transformed.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-import "dart:async" as asy;
-import "dart:core" as core;
-import "dart:_internal" as _in;
-
-static method main() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        [yield] let dynamic #t1 = asy::_awaitHelper("Hello, World!", :async_op_then, :async_op_error, :async_op) in null;
-        core::print(_in::unsafeCast<core::String*>(:result));
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart b/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart
deleted file mode 100644
index d255229..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright (c) 2014, 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.6
-
-// This test was adapted from language_2/await_test
-
-import 'dart:async';
-
-int globalVariable = 1;
-int topLevelFoo(int param) => 1;
-int get topLevelGetter => globalVariable;
-void set topLevelSetter(val) {
-  globalVariable = val;
-}
-
-class C {
-  static int staticField = 1;
-  static int get staticGetter => staticField;
-  static void set staticSetter(val) {
-    staticField = val;
-  }
-
-  static int staticFoo(int param) => param;
-
-  int field = 1;
-  int get getter => field;
-  void set setter(val) {
-    field = val;
-  }
-
-  int foo(int param) => param;
-}
-
-dummy() => 1;
-
-staticMembers() async {
-  var a = C.staticField + await dummy();
-  expect(2, a);
-  var f = (C.staticField = 1) + await dummy();
-  expect(2, f);
-  var b = C.staticGetter + await dummy();
-  expect(2, b);
-  var c = (C.staticSetter = 1) + await dummy();
-  expect(2, c);
-  var d = C.staticFoo(2) + await dummy();
-  expect(3, d);
-  var e = C.staticField +
-      C.staticGetter +
-      (C.staticSetter = 1) +
-      C.staticFoo(1) +
-      await dummy();
-  expect(5, e);
-}
-
-topLevelMembers() async {
-  var a = globalVariable + await dummy();
-  expect(2, a);
-  var b = topLevelGetter + await dummy();
-  expect(2, b);
-  var c = (topLevelSetter = 1) + await dummy();
-  expect(2, c);
-  var d = topLevelFoo(1) + await dummy();
-  expect(2, d);
-  var e = globalVariable +
-      topLevelGetter +
-      (topLevelSetter = 1) +
-      topLevelFoo(1) +
-      await dummy();
-  expect(5, e);
-}
-
-instanceMembers() async {
-  var inst = new C();
-  var a = inst.field + await dummy();
-  expect(2, a);
-  var b = inst.getter + await dummy();
-  expect(2, b);
-  var c = (inst.setter = 1) + await dummy();
-  expect(2, c);
-  var d = inst.foo(1) + await dummy();
-  expect(2, d);
-  var e = inst.field +
-      inst.getter +
-      (inst.setter = 1) +
-      inst.foo(1) +
-      await dummy();
-  expect(5, e);
-}
-
-others() async {
-  var a = "${globalVariable} ${await dummy()} " + await "someString";
-  expect("1 1 someString", a);
-  var c = new C();
-  var d = c.field + await dummy();
-  var cnt = 2;
-  var b = [1, 2, 3];
-  b[cnt] = await dummy();
-  expect(1, b[cnt]);
-  var e = b[0] + await dummy();
-  expect(2, e);
-}
-
-conditionals() async {
-  var a = false;
-  var b = true;
-  var c = (a || b) || await dummy();
-  expect(true, c);
-  var d = (a || b) ? a : await dummy();
-  expect(false, d);
-  var e = (a is int) ? await dummy() : 2;
-  expect(2, e);
-  try {
-    var f = (a is int) ? await dummy() : 2;
-  } catch (e) {}
-}
-
-asserts() async {
-  for (final FutureOr<T> Function<T>(T) func in <Function>[id, future]) {
-    assert(await func(true));
-    assert(id(true), await func("message"));
-    assert(await func(true), await (func("message")));
-    try {
-      assert(await func(false), await (func("message")));
-      if (assertStatementsEnabled) throw "Didn't throw";
-    } on AssertionError catch (e) {
-      expect("message", e.message);
-    }
-  }
-}
-
-controlFlow() async {
-  for (final FutureOr<T> Function<T>(T) func in <Function>[id, future]) {
-    // For.
-    var c = 0;
-    for (var i = await (func(0)); await func(i < 5); await func(i++)) {
-      c++;
-    }
-    expect(5, c);
-    // While.
-    c = 0;
-    while (await func(c < 5)) c++;
-    expect(5, c);
-    // Do-while.
-    c = 0;
-    do {
-      c++;
-    } while (await func(c < 5));
-    expect(5, c);
-    // If.
-    if (await func(c == 5)) {
-      expect(5, c);
-    } else {
-      throw "unreachable";
-    }
-    // Throw.
-    try {
-      throw await func("string");
-    } on String {
-      // OK.
-    }
-
-    try {
-      await (throw "string");
-    } on String {
-      // OK.
-    }
-    // Try/catch/finally
-    try {
-      try {
-        throw "string";
-      } catch (e) {
-        expect("string", e);
-        expect(0, await func(0));
-        rethrow;
-      } finally {
-        expect(0, await func(0));
-      }
-    } catch (e) {
-      expect(0, await func(0));
-      expect("string", e);
-    } finally {
-      expect(0, await func(0));
-    }
-    // Switch
-    switch (await func(2)) {
-      case 2:
-        break;
-      default:
-        throw "unreachable";
-    }
-    // Return.
-    expect(
-        42,
-        await () async {
-          return await func(42);
-        }());
-    expect(
-        42,
-        await () async {
-          return func(42);
-        }());
-    // Yield.
-    Stream<int> testStream1() async* {
-      yield await func(42);
-    }
-
-    expectList([42], await testStream1().toList());
-    // Yield*
-    Stream<int> testStream2() async* {
-      yield* await func(intStream());
-    }
-
-    expectList([42], await testStream2().toList());
-  }
-}
-
-FutureOr<T> future<T>(T value) async => value;
-FutureOr<T> id<T>(T value) => value;
-
-Stream<int> intStream() async* {
-  yield 42;
-}
-
-final bool assertStatementsEnabled = () {
-  try {
-    assert(false);
-    return false;
-  } catch (_) {
-    return true;
-  }
-}();
-
-main() async {
-  for (int i = 0; i < 11; i++) {
-    await staticMembers();
-    await topLevelMembers();
-    await instanceMembers();
-    await conditionals();
-    await others();
-    await asserts();
-    await controlFlow();
-  }
-}
-
-expect(expected, actual) {
-  if (expected != actual) throw 'Expected $expected, actual $actual';
-}
-
-expectList(List expected, List actual) {
-  if (expected.length != actual.length) {
-    throw 'Expected $expected, actual $actual';
-  }
-  for (int i = 0; i < expected.length; i++) {
-    expect(expected[i], actual[i]);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.textual_outline.expect
deleted file mode 100644
index 74baac0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.textual_outline.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-int globalVariable = 1;
-int topLevelFoo(int param) => 1;
-int get topLevelGetter => globalVariable;
-void set topLevelSetter(val) {}
-
-class C {
-  static int staticField = 1;
-  static int get staticGetter => staticField;
-  static void set staticSetter(val) {}
-  static int staticFoo(int param) => param;
-  int field = 1;
-  int get getter => field;
-  void set setter(val) {}
-  int foo(int param) => param;
-}
-
-dummy() => 1;
-staticMembers() async {}
-topLevelMembers() async {}
-instanceMembers() async {}
-others() async {}
-conditionals() async {}
-asserts() async {}
-controlFlow() async {}
-FutureOr<T> future<T>(T value) async => value;
-FutureOr<T> id<T>(T value) => value;
-Stream<int> intStream() async* {}
-final bool assertStatementsEnabled = () {
-  try {
-    assert(false);
-    return false;
-  } catch (_) {
-    return true;
-  }
-}();
-main() async {}
-expect(expected, actual) {}
-expectList(List expected, List actual) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.textual_outline_modelled.expect
deleted file mode 100644
index cf5c4b2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-FutureOr<T> future<T>(T value) async => value;
-FutureOr<T> id<T>(T value) => value;
-Stream<int> intStream() async* {}
-asserts() async {}
-
-class C {
-  int field = 1;
-  int foo(int param) => param;
-  int get getter => field;
-  static int get staticGetter => staticField;
-  static int staticField = 1;
-  static int staticFoo(int param) => param;
-  static void set staticSetter(val) {}
-  void set setter(val) {}
-}
-
-conditionals() async {}
-controlFlow() async {}
-dummy() => 1;
-expect(expected, actual) {}
-expectList(List expected, List actual) {}
-final bool assertStatementsEnabled = () {
-  try {
-    assert(false);
-    return false;
-  } catch (_) {
-    return true;
-  }
-}();
-instanceMembers() async {}
-int get topLevelGetter => globalVariable;
-int globalVariable = 1;
-int topLevelFoo(int param) => 1;
-main() async {}
-others() async {}
-staticMembers() async {}
-topLevelMembers() async {}
-void set topLevelSetter(val) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.expect
deleted file mode 100644
index efab03a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.expect
+++ /dev/null
@@ -1,260 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class C extends core::Object {
-  static field core::int* staticField = 1;
-  field core::int* field = 1;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  static get staticGetter() → core::int*
-    return self::C::staticField;
-  static set staticSetter(dynamic val) → void {
-    self::C::staticField = val as{TypeError,ForDynamic} core::int*;
-  }
-  static method staticFoo(core::int* param) → core::int*
-    return param;
-  get getter() → core::int*
-    return this.{self::C::field};
-  set setter(dynamic val) → void {
-    this.{self::C::field} = val as{TypeError,ForDynamic} core::int*;
-  }
-  method foo(core::int* param) → core::int*
-    return param;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* globalVariable = 1;
-static final field core::bool* assertStatementsEnabled = (() → core::bool* {
-  try {
-    assert(false);
-    return false;
-  }
-  on dynamic catch(final dynamic _) {
-    return true;
-  }
-}).call();
-static method topLevelFoo(core::int* param) → core::int*
-  return 1;
-static get topLevelGetter() → core::int*
-  return self::globalVariable;
-static set topLevelSetter(dynamic val) → void {
-  self::globalVariable = val as{TypeError,ForDynamic} core::int*;
-}
-static method dummy() → dynamic
-  return 1;
-static method staticMembers() → dynamic async {
-  core::num* a = self::C::staticField.{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, a);
-  core::num* f = (self::C::staticField = 1).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, f);
-  core::num* b = self::C::staticGetter.{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, b);
-  core::num* c = (self::C::staticSetter = 1).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, c);
-  core::num* d = self::C::staticFoo(2).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(3, d);
-  core::num* e = self::C::staticField.{core::num::+}(self::C::staticGetter).{core::num::+}(self::C::staticSetter = 1).{core::num::+}(self::C::staticFoo(1)).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(5, e);
-}
-static method topLevelMembers() → dynamic async {
-  core::num* a = self::globalVariable.{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, a);
-  core::num* b = self::topLevelGetter.{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, b);
-  core::num* c = (self::topLevelSetter = 1).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, c);
-  core::num* d = self::topLevelFoo(1).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, d);
-  core::num* e = self::globalVariable.{core::num::+}(self::topLevelGetter).{core::num::+}(self::topLevelSetter = 1).{core::num::+}(self::topLevelFoo(1)).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(5, e);
-}
-static method instanceMembers() → dynamic async {
-  self::C* inst = new self::C::•();
-  core::num* a = inst.{self::C::field}.{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, a);
-  core::num* b = inst.{self::C::getter}.{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, b);
-  core::num* c = (inst.{self::C::setter} = 1).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, c);
-  core::num* d = inst.{self::C::foo}(1).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, d);
-  core::num* e = inst.{self::C::field}.{core::num::+}(inst.{self::C::getter}).{core::num::+}(inst.{self::C::setter} = 1).{core::num::+}(inst.{self::C::foo}(1)).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(5, e);
-}
-static method others() → dynamic async {
-  core::String* a = "${self::globalVariable} ${await self::dummy()} ".{core::String::+}(await "someString");
-  self::expect("1 1 someString", a);
-  self::C* c = new self::C::•();
-  core::num* d = c.{self::C::field}.{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  core::int* cnt = 2;
-  core::List<core::int*>* b = <core::int*>[1, 2, 3];
-  b.{core::List::[]=}(cnt, await self::dummy() as{TypeError,ForDynamic} core::int*);
-  self::expect(1, b.{core::List::[]}(cnt));
-  core::num* e = b.{core::List::[]}(0).{core::num::+}(await self::dummy() as{TypeError,ForDynamic} core::num*);
-  self::expect(2, e);
-}
-static method conditionals() → dynamic async {
-  core::bool* a = false;
-  core::bool* b = true;
-  core::bool* c = a || b || await self::dummy() as{TypeError,ForDynamic} core::bool*;
-  self::expect(true, c);
-  dynamic d = a || b ?{dynamic} a : await self::dummy();
-  self::expect(false, d);
-  dynamic e = a is core::int* ?{dynamic} await self::dummy() : 2;
-  self::expect(2, e);
-  try {
-    dynamic f = a is core::int* ?{dynamic} await self::dummy() : 2;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-}
-static method asserts() → dynamic async {
-  for (final core::Function* #t1 in <core::Function*>[#C1, #C2]) {
-    final <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>* func = #t1 as{TypeError} <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>*;
-    assert(await func.call<core::bool*>(true));
-    assert(self::id<core::bool*>(true) as{TypeError} core::bool*, await func.call<core::String*>("message"));
-    assert(await func.call<core::bool*>(true), await func.call<core::String*>("message"));
-    try {
-      assert(await func.call<core::bool*>(false), await func.call<core::String*>("message"));
-      if(self::assertStatementsEnabled)
-        throw "Didn't throw";
-    }
-    on core::AssertionError* catch(final core::AssertionError* e) {
-      self::expect("message", e.{core::AssertionError::message});
-    }
-  }
-}
-static method controlFlow() → dynamic async {
-  for (final core::Function* #t2 in <core::Function*>[#C1, #C2]) {
-    final <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>* func = #t2 as{TypeError} <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>*;
-    core::int* c = 0;
-    for (core::int* i = await func.call<core::int*>(0); await func.call<core::bool*>(i.{core::num::<}(5)); await func.call<core::int*>(let final core::int* #t3 = i in let final core::int* #t4 = i = #t3.{core::num::+}(1) in #t3)) {
-      c = c.{core::num::+}(1);
-    }
-    self::expect(5, c);
-    c = 0;
-    while (await func.call<core::bool*>(c.{core::num::<}(5)))
-      c = c.{core::num::+}(1);
-    self::expect(5, c);
-    c = 0;
-    do {
-      c = c.{core::num::+}(1);
-    }
-    while (await func.call<core::bool*>(c.{core::num::<}(5)))
-    self::expect(5, c);
-    if(await func.call<core::bool*>(c.{core::num::==}(5))) {
-      self::expect(5, c);
-    }
-    else {
-      throw "unreachable";
-    }
-    try {
-      throw await func.call<core::String*>("string");
-    }
-    on core::String* catch(no-exception-var) {
-    }
-    try {
-      await throw "string";
-    }
-    on core::String* catch(no-exception-var) {
-    }
-    try
-      try {
-        try
-          try {
-            throw "string";
-          }
-          on dynamic catch(final dynamic e) {
-            self::expect("string", e);
-            self::expect(0, await func.call<core::int*>(0));
-            rethrow;
-          }
-        finally {
-          self::expect(0, await func.call<core::int*>(0));
-        }
-      }
-      on dynamic catch(final dynamic e) {
-        self::expect(0, await func.call<core::int*>(0));
-        self::expect("string", e);
-      }
-    finally {
-      self::expect(0, await func.call<core::int*>(0));
-    }
-    #L1:
-    switch(await func.call<core::int*>(2)) {
-      #L2:
-      case #C3:
-        {
-          break #L1;
-        }
-      #L3:
-      default:
-        {
-          throw "unreachable";
-        }
-    }
-    self::expect(42, await(() → asy::Future<dynamic>* async {
-      return await func.call<dynamic>(42);
-    }).call());
-    self::expect(42, await(() → asy::Future<dynamic>* async {
-      return func.call<dynamic>(42);
-    }).call());
-    function testStream1() → asy::Stream<core::int*>* async* {
-      yield await func.call<core::int*>(42);
-    }
-    self::expectList(<dynamic>[42], await testStream1.call().{asy::Stream::toList}());
-    function testStream2() → asy::Stream<core::int*>* async* {
-      yield* await func.call<asy::Stream<core::int*>*>(self::intStream());
-    }
-    self::expectList(<dynamic>[42], await testStream2.call().{asy::Stream::toList}());
-  }
-}
-static method future<T extends core::Object* = dynamic>(self::future::T* value) → FutureOr<self::future::T*>* async 
-  return value;
-static method id<T extends core::Object* = dynamic>(self::id::T* value) → FutureOr<self::id::T*>*
-  return value;
-static method intStream() → asy::Stream<core::int*>* async* {
-  yield 42;
-}
-static method main() → dynamic async {
-  for (core::int* i = 0; i.{core::num::<}(11); i = i.{core::num::+}(1)) {
-    await self::staticMembers();
-    await self::topLevelMembers();
-    await self::instanceMembers();
-    await self::conditionals();
-    await self::others();
-    await self::asserts();
-    await self::controlFlow();
-  }
-}
-static method expect(dynamic expected, dynamic actual) → dynamic {
-  if(!expected.{core::Object::==}(actual))
-    throw "Expected ${expected}, actual ${actual}";
-}
-static method expectList(core::List<dynamic>* expected, core::List<dynamic>* actual) → dynamic {
-  if(!expected.{core::List::length}.{core::num::==}(actual.{core::List::length})) {
-    throw "Expected ${expected}, actual ${actual}";
-  }
-  for (core::int* i = 0; i.{core::num::<}(expected.{core::List::length}); i = i.{core::num::+}(1)) {
-    self::expect(expected.{core::List::[]}(i), actual.{core::List::[]}(i));
-  }
-}
-
-constants  {
-  #C1 = tearoff self::id
-  #C2 = tearoff self::future
-  #C3 = 2
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.outline.expect
deleted file mode 100644
index e421062..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.outline.expect
+++ /dev/null
@@ -1,71 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class C extends core::Object {
-  static field core::int* staticField;
-  field core::int* field;
-  synthetic constructor •() → self::C*
-    ;
-  static get staticGetter() → core::int*
-    ;
-  static set staticSetter(dynamic val) → void
-    ;
-  static method staticFoo(core::int* param) → core::int*
-    ;
-  get getter() → core::int*
-    ;
-  set setter(dynamic val) → void
-    ;
-  method foo(core::int* param) → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* globalVariable;
-static final field core::bool* assertStatementsEnabled;
-static method topLevelFoo(core::int* param) → core::int*
-  ;
-static get topLevelGetter() → core::int*
-  ;
-static set topLevelSetter(dynamic val) → void
-  ;
-static method dummy() → dynamic
-  ;
-static method staticMembers() → dynamic async 
-  ;
-static method topLevelMembers() → dynamic async 
-  ;
-static method instanceMembers() → dynamic async 
-  ;
-static method others() → dynamic async 
-  ;
-static method conditionals() → dynamic async 
-  ;
-static method asserts() → dynamic async 
-  ;
-static method controlFlow() → dynamic async 
-  ;
-static method future<T extends core::Object* = dynamic>(self::future::T* value) → FutureOr<self::future::T*>* async 
-  ;
-static method id<T extends core::Object* = dynamic>(self::id::T* value) → FutureOr<self::id::T*>*
-  ;
-static method intStream() → asy::Stream<core::int*>* async* 
-  ;
-static method main() → dynamic async 
-  ;
-static method expect(dynamic expected, dynamic actual) → dynamic
-  ;
-static method expectList(core::List<dynamic>* expected, core::List<dynamic>* actual) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.transformed.expect
deleted file mode 100644
index 51ef2df..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_complex.dart.weak.transformed.expect
+++ /dev/null
@@ -1,817 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-import "dart:_internal" as _in;
-
-import "dart:async";
-
-class C extends core::Object {
-  static field core::int* staticField = 1;
-  field core::int* field = 1;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  static get staticGetter() → core::int*
-    return self::C::staticField;
-  static set staticSetter(dynamic val) → void {
-    self::C::staticField = val as{TypeError,ForDynamic} core::int*;
-  }
-  static method staticFoo(core::int* param) → core::int*
-    return param;
-  get getter() → core::int*
-    return this.{self::C::field};
-  set setter(dynamic val) → void {
-    this.{self::C::field} = val as{TypeError,ForDynamic} core::int*;
-  }
-  method foo(core::int* param) → core::int*
-    return param;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* globalVariable = 1;
-static final field core::bool* assertStatementsEnabled = (() → core::bool* {
-  try {
-    assert(false);
-    return false;
-  }
-  on dynamic catch(final dynamic _) {
-    return true;
-  }
-}).call();
-static method topLevelFoo(core::int* param) → core::int*
-  return 1;
-static get topLevelGetter() → core::int*
-  return self::globalVariable;
-static set topLevelSetter(dynamic val) → void {
-  self::globalVariable = val as{TypeError,ForDynamic} core::int*;
-}
-static method dummy() → dynamic
-  return 1;
-static method staticMembers() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :async_temporary_0;
-  dynamic :async_temporary_1;
-  dynamic :async_temporary_2;
-  dynamic :async_temporary_3;
-  dynamic :async_temporary_4;
-  dynamic :async_temporary_5;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        :async_temporary_0 = self::C::staticField;
-        [yield] let dynamic #t1 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* a = _in::unsafeCast<core::int*>(:async_temporary_0).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, a);
-        :async_temporary_1 = self::C::staticField = 1;
-        [yield] let dynamic #t2 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* f = _in::unsafeCast<core::int*>(:async_temporary_1).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, f);
-        :async_temporary_2 = self::C::staticGetter;
-        [yield] let dynamic #t3 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* b = _in::unsafeCast<core::int*>(:async_temporary_2).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, b);
-        :async_temporary_3 = self::C::staticSetter = 1;
-        [yield] let dynamic #t4 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* c = _in::unsafeCast<core::int*>(:async_temporary_3).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, c);
-        :async_temporary_4 = self::C::staticFoo(2);
-        [yield] let dynamic #t5 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* d = _in::unsafeCast<core::int*>(:async_temporary_4).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(3, d);
-        :async_temporary_5 = self::C::staticField.{core::num::+}(self::C::staticGetter).{core::num::+}(self::C::staticSetter = 1).{core::num::+}(self::C::staticFoo(1));
-        [yield] let dynamic #t6 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* e = _in::unsafeCast<core::int*>(:async_temporary_5).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(5, e);
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method topLevelMembers() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :async_temporary_0;
-  dynamic :async_temporary_1;
-  dynamic :async_temporary_2;
-  dynamic :async_temporary_3;
-  dynamic :async_temporary_4;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L2:
-      {
-        :async_temporary_0 = self::globalVariable;
-        [yield] let dynamic #t7 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* a = _in::unsafeCast<core::int*>(:async_temporary_0).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, a);
-        :async_temporary_1 = self::topLevelGetter;
-        [yield] let dynamic #t8 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* b = _in::unsafeCast<core::int*>(:async_temporary_1).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, b);
-        :async_temporary_2 = self::topLevelSetter = 1;
-        [yield] let dynamic #t9 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* c = _in::unsafeCast<core::int*>(:async_temporary_2).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, c);
-        :async_temporary_3 = self::topLevelFoo(1);
-        [yield] let dynamic #t10 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* d = _in::unsafeCast<core::int*>(:async_temporary_3).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, d);
-        :async_temporary_4 = self::globalVariable.{core::num::+}(self::topLevelGetter).{core::num::+}(self::topLevelSetter = 1).{core::num::+}(self::topLevelFoo(1));
-        [yield] let dynamic #t11 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* e = _in::unsafeCast<core::int*>(:async_temporary_4).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(5, e);
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method instanceMembers() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :async_temporary_0;
-  dynamic :async_temporary_1;
-  dynamic :async_temporary_2;
-  dynamic :async_temporary_3;
-  dynamic :async_temporary_4;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L3:
-      {
-        self::C* inst = new self::C::•();
-        :async_temporary_0 = inst.{self::C::field};
-        [yield] let dynamic #t12 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* a = _in::unsafeCast<core::int*>(:async_temporary_0).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, a);
-        :async_temporary_1 = inst.{self::C::getter};
-        [yield] let dynamic #t13 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* b = _in::unsafeCast<core::int*>(:async_temporary_1).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, b);
-        :async_temporary_2 = inst.{self::C::setter} = 1;
-        [yield] let dynamic #t14 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* c = _in::unsafeCast<core::int*>(:async_temporary_2).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, c);
-        :async_temporary_3 = inst.{self::C::foo}(1);
-        [yield] let dynamic #t15 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* d = _in::unsafeCast<core::int*>(:async_temporary_3).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, d);
-        :async_temporary_4 = inst.{self::C::field}.{core::num::+}(inst.{self::C::getter}).{core::num::+}(inst.{self::C::setter} = 1).{core::num::+}(inst.{self::C::foo}(1));
-        [yield] let dynamic #t16 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* e = _in::unsafeCast<core::int*>(:async_temporary_4).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(5, e);
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method others() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :async_temporary_0;
-  dynamic :async_temporary_1;
-  dynamic :async_temporary_2;
-  dynamic :async_temporary_3;
-  dynamic :async_temporary_4;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L4:
-      {
-        :async_temporary_0 = self::globalVariable;
-        [yield] let dynamic #t17 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        :async_temporary_0 = "${_in::unsafeCast<core::int*>(:async_temporary_0)} ${:result} ";
-        [yield] let dynamic #t18 = asy::_awaitHelper("someString", :async_op_then, :async_op_error, :async_op) in null;
-        core::String* a = _in::unsafeCast<core::String*>(:async_temporary_0).{core::String::+}(_in::unsafeCast<core::String*>(:result));
-        self::expect("1 1 someString", a);
-        self::C* c = new self::C::•();
-        :async_temporary_1 = c.{self::C::field};
-        [yield] let dynamic #t19 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* d = _in::unsafeCast<core::int*>(:async_temporary_1).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        core::int* cnt = 2;
-        core::List<core::int*>* b = core::_GrowableList::_literal3<core::int*>(1, 2, 3);
-        :async_temporary_3 = b;
-        :async_temporary_2 = cnt;
-        [yield] let dynamic #t20 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        _in::unsafeCast<core::List<core::int*>*>(:async_temporary_3).{core::List::[]=}(_in::unsafeCast<core::int*>(:async_temporary_2), :result as{TypeError,ForDynamic} core::int*);
-        self::expect(1, b.{core::List::[]}(cnt));
-        :async_temporary_4 = b.{core::List::[]}(0);
-        [yield] let dynamic #t21 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-        core::num* e = _in::unsafeCast<core::int*>(:async_temporary_4).{core::num::+}(:result as{TypeError,ForDynamic} core::num*);
-        self::expect(2, e);
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method conditionals() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  core::bool* :async_temporary_0;
-  dynamic :async_temporary_1;
-  dynamic :async_temporary_2;
-  dynamic :async_temporary_3;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L5:
-      {
-        core::bool* a = false;
-        core::bool* b = true;
-        :async_temporary_0 = (a || b).==(true);
-        if(:async_temporary_0)
-          ;
-        else {
-          [yield] let dynamic #t22 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-          :async_temporary_0 = (:result as{TypeError,ForDynamic} core::bool*).==(true);
-        }
-        core::bool* c = :async_temporary_0;
-        self::expect(true, c);
-        if(a || b) {
-          :async_temporary_1 = a;
-        }
-        else {
-          [yield] let dynamic #t23 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-          :async_temporary_1 = :result;
-        }
-        dynamic d = :async_temporary_1;
-        self::expect(false, d);
-        if(a is core::int*) {
-          [yield] let dynamic #t24 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-          :async_temporary_2 = :result;
-        }
-        else {
-          :async_temporary_2 = 2;
-        }
-        dynamic e = :async_temporary_2;
-        self::expect(2, e);
-        try {
-          if(a is core::int*) {
-            [yield] let dynamic #t25 = asy::_awaitHelper(self::dummy(), :async_op_then, :async_op_error, :async_op) in null;
-            :async_temporary_3 = :result;
-          }
-          else {
-            :async_temporary_3 = 2;
-          }
-          dynamic f = :async_temporary_3;
-        }
-        on dynamic catch(final dynamic e) {
-        }
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method asserts() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L6:
-      {
-        {
-          core::Iterator<core::Function*>* :sync-for-iterator = core::_GrowableList::_literal2<core::Function*>(#C1, #C2).{core::Iterable::iterator};
-          for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-            final core::Function* #t26 = :sync-for-iterator.{core::Iterator::current};
-            {
-              final <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>* func = #t26 as{TypeError} <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>*;
-              assert {
-                [yield] let dynamic #t27 = asy::_awaitHelper(func.call<core::bool*>(true), :async_op_then, :async_op_error, :async_op) in null;
-                assert(_in::unsafeCast<core::bool*>(:result));
-              }
-              assert {
-                if(self::id<core::bool*>(true) as{TypeError} core::bool*)
-                  ;
-                else {
-                  [yield] let dynamic #t28 = asy::_awaitHelper(func.call<core::String*>("message"), :async_op_then, :async_op_error, :async_op) in null;
-                  assert(false, _in::unsafeCast<core::String*>(:result));
-                }
-              }
-              assert {
-                [yield] let dynamic #t29 = asy::_awaitHelper(func.call<core::bool*>(true), :async_op_then, :async_op_error, :async_op) in null;
-                if(_in::unsafeCast<core::bool*>(:result))
-                  ;
-                else {
-                  [yield] let dynamic #t30 = asy::_awaitHelper(func.call<core::String*>("message"), :async_op_then, :async_op_error, :async_op) in null;
-                  assert(false, _in::unsafeCast<core::String*>(:result));
-                }
-              }
-              try {
-                assert {
-                  [yield] let dynamic #t31 = asy::_awaitHelper(func.call<core::bool*>(false), :async_op_then, :async_op_error, :async_op) in null;
-                  if(_in::unsafeCast<core::bool*>(:result))
-                    ;
-                  else {
-                    [yield] let dynamic #t32 = asy::_awaitHelper(func.call<core::String*>("message"), :async_op_then, :async_op_error, :async_op) in null;
-                    assert(false, _in::unsafeCast<core::String*>(:result));
-                  }
-                }
-                if(self::assertStatementsEnabled)
-                  throw "Didn't throw";
-              }
-              on core::AssertionError* catch(final core::AssertionError* e) {
-                self::expect("message", e.{core::AssertionError::message});
-              }
-            }
-          }
-        }
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method controlFlow() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  dynamic :saved_try_context_var2;
-  dynamic :saved_try_context_var3;
-  dynamic :exception0;
-  dynamic :stack_trace0;
-  dynamic :async_temporary_0;
-  dynamic :async_temporary_1;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L7:
-      {
-        {
-          core::Iterator<core::Function*>* :sync-for-iterator = core::_GrowableList::_literal2<core::Function*>(#C1, #C2).{core::Iterable::iterator};
-          for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-            final core::Function* #t33 = :sync-for-iterator.{core::Iterator::current};
-            {
-              final <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>* func = #t33 as{TypeError} <T extends core::Object* = dynamic>(T*) →* FutureOr<T*>*;
-              core::int* c = 0;
-              {
-                dynamic #t34 = true;
-                core::int* #t35;
-                #L8:
-                while (true) {
-                  core::int* i;
-                  if(#t34) {
-                    #t34 = false;
-                    [yield] let dynamic #t36 = asy::_awaitHelper(func.call<core::int*>(0), :async_op_then, :async_op_error, :async_op) in null;
-                    i = _in::unsafeCast<core::int*>(:result);
-                  }
-                  else {
-                    i = #t35;
-                    [yield] let dynamic #t37 = asy::_awaitHelper(func.call<core::int*>(let final core::int* #t38 = i in let final core::int* #t39 = i = #t38.{core::num::+}(1) in #t38), :async_op_then, :async_op_error, :async_op) in null;
-                    _in::unsafeCast<core::int*>(:result);
-                  }
-                  [yield] let dynamic #t40 = asy::_awaitHelper(func.call<core::bool*>(i.{core::num::<}(5)), :async_op_then, :async_op_error, :async_op) in null;
-                  if(_in::unsafeCast<core::bool*>(:result)) {
-                    {
-                      c = c.{core::num::+}(1);
-                    }
-                    #t35 = i;
-                  }
-                  else
-                    break #L8;
-                }
-              }
-              self::expect(5, c);
-              c = 0;
-              #L9:
-              while (true) {
-                [yield] let dynamic #t41 = asy::_awaitHelper(func.call<core::bool*>(c.{core::num::<}(5)), :async_op_then, :async_op_error, :async_op) in null;
-                if(_in::unsafeCast<core::bool*>(:result))
-                  c = c.{core::num::+}(1);
-                else
-                  break #L9;
-              }
-              self::expect(5, c);
-              c = 0;
-              do {
-                c = c.{core::num::+}(1);
-                [yield] let dynamic #t42 = asy::_awaitHelper(func.call<core::bool*>(c.{core::num::<}(5)), :async_op_then, :async_op_error, :async_op) in null;
-              }
-              while (_in::unsafeCast<core::bool*>(:result))
-              self::expect(5, c);
-              [yield] let dynamic #t43 = asy::_awaitHelper(func.call<core::bool*>(c.{core::num::==}(5)), :async_op_then, :async_op_error, :async_op) in null;
-              if(_in::unsafeCast<core::bool*>(:result)) {
-                self::expect(5, c);
-              }
-              else {
-                throw "unreachable";
-              }
-              try {
-                [yield] let dynamic #t44 = asy::_awaitHelper(func.call<core::String*>("string"), :async_op_then, :async_op_error, :async_op) in null;
-                throw _in::unsafeCast<core::String*>(:result);
-              }
-              on core::String* catch(no-exception-var) {
-              }
-              try {
-                [yield] let dynamic #t45 = asy::_awaitHelper(throw "string", :async_op_then, :async_op_error, :async_op) in null;
-                _in::unsafeCast<<BottomType>>(:result);
-              }
-              on core::String* catch(no-exception-var) {
-              }
-              try
-                try {
-                  try
-                    try {
-                      throw "string";
-                    }
-                    on dynamic catch(final dynamic e) {
-                      self::expect("string", e);
-                      [yield] let dynamic #t46 = asy::_awaitHelper(func.call<core::int*>(0), :async_op_then, :async_op_error, :async_op) in null;
-                      self::expect(0, _in::unsafeCast<core::int*>(:result));
-                      rethrow;
-                    }
-                  finally {
-                    [yield] let dynamic #t47 = asy::_awaitHelper(func.call<core::int*>(0), :async_op_then, :async_op_error, :async_op) in null;
-                    self::expect(0, _in::unsafeCast<core::int*>(:result));
-                  }
-                }
-                on dynamic catch(final dynamic e) {
-                  [yield] let dynamic #t48 = asy::_awaitHelper(func.call<core::int*>(0), :async_op_then, :async_op_error, :async_op) in null;
-                  self::expect(0, _in::unsafeCast<core::int*>(:result));
-                  self::expect("string", e);
-                }
-              finally {
-                [yield] let dynamic #t49 = asy::_awaitHelper(func.call<core::int*>(0), :async_op_then, :async_op_error, :async_op) in null;
-                self::expect(0, _in::unsafeCast<core::int*>(:result));
-              }
-              #L10:
-              {
-                [yield] let dynamic #t50 = asy::_awaitHelper(func.call<core::int*>(2), :async_op_then, :async_op_error, :async_op) in null;
-                switch(_in::unsafeCast<core::int*>(:result)) {
-                  #L11:
-                  case #C3:
-                    {
-                      break #L10;
-                    }
-                  #L12:
-                  default:
-                    {
-                      throw "unreachable";
-                    }
-                }
-              }
-              [yield] let dynamic #t51 = asy::_awaitHelper((() → asy::Future<dynamic>* /* originally async */ {
-                final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-                core::bool* :is_sync = false;
-                FutureOr<dynamic>* :return_value;
-                (dynamic) →* dynamic :async_op_then;
-                (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-                core::int* :await_jump_var = 0;
-                dynamic :await_ctx_var;
-                dynamic :saved_try_context_var0;
-                function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-                  try {
-                    #L13:
-                    {
-                      [yield] let dynamic #t52 = asy::_awaitHelper(func.call<dynamic>(42), :async_op_then, :async_op_error, :async_op) in null;
-                      :return_value = :result;
-                      break #L13;
-                    }
-                    asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-                    return;
-                  }
-                  on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-                    asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-                  }
-                :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-                :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-                :async_op.call();
-                :is_sync = true;
-                return :async_future;
-              }).call(), :async_op_then, :async_op_error, :async_op) in null;
-              self::expect(42, :result);
-              [yield] let dynamic #t53 = asy::_awaitHelper((() → asy::Future<dynamic>* /* originally async */ {
-                final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-                core::bool* :is_sync = false;
-                FutureOr<dynamic>* :return_value;
-                (dynamic) →* dynamic :async_op_then;
-                (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-                core::int* :await_jump_var = 0;
-                dynamic :await_ctx_var;
-                function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-                  try {
-                    #L14:
-                    {
-                      :return_value = func.call<dynamic>(42);
-                      break #L14;
-                    }
-                    asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-                    return;
-                  }
-                  on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-                    asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-                  }
-                :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-                :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-                :async_op.call();
-                :is_sync = true;
-                return :async_future;
-              }).call(), :async_op_then, :async_op_error, :async_op) in null;
-              self::expect(42, :result);
-              function testStream1() → asy::Stream<core::int*>* /* originally async* */ {
-                asy::_AsyncStarStreamController<core::int*>* :controller;
-                dynamic :controller_stream;
-                (dynamic) →* dynamic :async_op_then;
-                (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-                core::int* :await_jump_var = 0;
-                dynamic :await_ctx_var;
-                dynamic :saved_try_context_var0;
-                dynamic :saved_try_context_var1;
-                function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-                  try
-                    try {
-                      #L15:
-                      {
-                        [yield] let dynamic #t54 = asy::_awaitHelper(func.call<core::int*>(42), :async_op_then, :async_op_error, :async_op) in null;
-                        if(:controller.{asy::_AsyncStarStreamController::add}(_in::unsafeCast<core::int*>(:result)))
-                          return null;
-                        else
-                          [yield] null;
-                      }
-                      return;
-                    }
-                    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-                      :controller.{asy::_AsyncStarStreamController::addError}(exception, stack_trace);
-                    }
-                  finally {
-                    :controller.{asy::_AsyncStarStreamController::close}();
-                  }
-                :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-                :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-                :controller = new asy::_AsyncStarStreamController::•<core::int*>(:async_op);
-                :controller_stream = :controller.{asy::_AsyncStarStreamController::stream};
-                return :controller_stream;
-              }
-              :async_temporary_0 = core::_GrowableList::_literal1<dynamic>(42);
-              [yield] let dynamic #t55 = asy::_awaitHelper(testStream1.call().{asy::Stream::toList}(), :async_op_then, :async_op_error, :async_op) in null;
-              self::expectList(_in::unsafeCast<core::List<dynamic>*>(:async_temporary_0), _in::unsafeCast<core::List<core::int*>>(:result));
-              function testStream2() → asy::Stream<core::int*>* /* originally async* */ {
-                asy::_AsyncStarStreamController<core::int*>* :controller;
-                dynamic :controller_stream;
-                (dynamic) →* dynamic :async_op_then;
-                (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-                core::int* :await_jump_var = 0;
-                dynamic :await_ctx_var;
-                dynamic :saved_try_context_var0;
-                dynamic :saved_try_context_var1;
-                function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-                  try
-                    try {
-                      #L16:
-                      {
-                        [yield] let dynamic #t56 = asy::_awaitHelper(func.call<asy::Stream<core::int*>*>(self::intStream()), :async_op_then, :async_op_error, :async_op) in null;
-                        if(:controller.{asy::_AsyncStarStreamController::addStream}(_in::unsafeCast<asy::Stream<core::int*>*>(:result)))
-                          return null;
-                        else
-                          [yield] null;
-                      }
-                      return;
-                    }
-                    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-                      :controller.{asy::_AsyncStarStreamController::addError}(exception, stack_trace);
-                    }
-                  finally {
-                    :controller.{asy::_AsyncStarStreamController::close}();
-                  }
-                :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-                :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-                :controller = new asy::_AsyncStarStreamController::•<core::int*>(:async_op);
-                :controller_stream = :controller.{asy::_AsyncStarStreamController::stream};
-                return :controller_stream;
-              }
-              :async_temporary_1 = core::_GrowableList::_literal1<dynamic>(42);
-              [yield] let dynamic #t57 = asy::_awaitHelper(testStream2.call().{asy::Stream::toList}(), :async_op_then, :async_op_error, :async_op) in null;
-              self::expectList(_in::unsafeCast<core::List<dynamic>*>(:async_temporary_1), _in::unsafeCast<core::List<core::int*>>(:result));
-            }
-          }
-        }
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method future<T extends core::Object* = dynamic>(self::future::T* value) → FutureOr<self::future::T*>* /* originally async */ {
-  final asy::_Future<self::future::T*>* :async_future = new asy::_Future::•<self::future::T*>();
-  core::bool* :is_sync = false;
-  FutureOr<self::future::T*>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L17:
-      {
-        :return_value = value;
-        break #L17;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method id<T extends core::Object* = dynamic>(self::id::T* value) → FutureOr<self::id::T*>*
-  return value;
-static method intStream() → asy::Stream<core::int*>* /* originally async* */ {
-  asy::_AsyncStarStreamController<core::int*>* :controller;
-  dynamic :controller_stream;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try
-      try {
-        #L18:
-        {
-          if(:controller.{asy::_AsyncStarStreamController::add}(42))
-            return null;
-          else
-            [yield] null;
-        }
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        :controller.{asy::_AsyncStarStreamController::addError}(exception, stack_trace);
-      }
-    finally {
-      :controller.{asy::_AsyncStarStreamController::close}();
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :controller = new asy::_AsyncStarStreamController::•<core::int*>(:async_op);
-  :controller_stream = :controller.{asy::_AsyncStarStreamController::stream};
-  return :controller_stream;
-}
-static method main() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L19:
-      {
-        for (core::int* i = 0; i.{core::num::<}(11); i = i.{core::num::+}(1)) {
-          [yield] let dynamic #t58 = asy::_awaitHelper(self::staticMembers(), :async_op_then, :async_op_error, :async_op) in null;
-          :result;
-          [yield] let dynamic #t59 = asy::_awaitHelper(self::topLevelMembers(), :async_op_then, :async_op_error, :async_op) in null;
-          :result;
-          [yield] let dynamic #t60 = asy::_awaitHelper(self::instanceMembers(), :async_op_then, :async_op_error, :async_op) in null;
-          :result;
-          [yield] let dynamic #t61 = asy::_awaitHelper(self::conditionals(), :async_op_then, :async_op_error, :async_op) in null;
-          :result;
-          [yield] let dynamic #t62 = asy::_awaitHelper(self::others(), :async_op_then, :async_op_error, :async_op) in null;
-          :result;
-          [yield] let dynamic #t63 = asy::_awaitHelper(self::asserts(), :async_op_then, :async_op_error, :async_op) in null;
-          :result;
-          [yield] let dynamic #t64 = asy::_awaitHelper(self::controlFlow(), :async_op_then, :async_op_error, :async_op) in null;
-          :result;
-        }
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method expect(dynamic expected, dynamic actual) → dynamic {
-  if(!expected.{core::Object::==}(actual))
-    throw "Expected ${expected}, actual ${actual}";
-}
-static method expectList(core::List<dynamic>* expected, core::List<dynamic>* actual) → dynamic {
-  if(!expected.{core::List::length}.{core::num::==}(actual.{core::List::length})) {
-    throw "Expected ${expected}, actual ${actual}";
-  }
-  for (core::int* i = 0; i.{core::num::<}(expected.{core::List::length}); i = i.{core::num::+}(1)) {
-    self::expect(expected.{core::List::[]}(i), actual.{core::List::[]}(i));
-  }
-}
-
-constants  {
-  #C1 = tearoff self::id
-  #C2 = tearoff self::future
-  #C3 = 2
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart
deleted file mode 100644
index 3792cc0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-// This test was adapted from language_2/await_in_cascade_  test
-
-import 'dart:async';
-
-class C {
-  Future<List<int>> m() async => []..add(await _m());
-  Future<int> _m() async => 42;
-}
-
-main() async {
-  expect(42, (await new C().m()).first);
-}
-
-expect(expected, actual) {
-  if (expected != actual) throw 'Expected $expected, actual $actual';
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.textual_outline.expect
deleted file mode 100644
index 037786a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-class C {
-  Future<List<int>> m() async => []..add(await _m());
-  Future<int> _m() async => 42;
-}
-
-main() async {}
-expect(expected, actual) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.textual_outline_modelled.expect
deleted file mode 100644
index 19d43fa..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-class C {
-  Future<List<int>> m() async => []..add(await _m());
-  Future<int> _m() async => 42;
-}
-
-expect(expected, actual) {}
-main() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.expect
deleted file mode 100644
index 6042b1f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method m() → asy::Future<core::List<core::int*>*>* async 
-    return let final core::List<core::int*>* #t1 = <core::int*>[] in block {
-      #t1.{core::List::add}(await this.{self::C::_m}());
-    } =>#t1;
-  method _m() → asy::Future<core::int*>* async 
-    return 42;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic async {
-  self::expect(42, (await new self::C::•().{self::C::m}()).{core::Iterable::first});
-}
-static method expect(dynamic expected, dynamic actual) → dynamic {
-  if(!expected.{core::Object::==}(actual))
-    throw "Expected ${expected}, actual ${actual}";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.outline.expect
deleted file mode 100644
index 753246b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.outline.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method m() → asy::Future<core::List<core::int*>*>* async 
-    ;
-  method _m() → asy::Future<core::int*>* async 
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic async 
-  ;
-static method expect(dynamic expected, dynamic actual) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.transformed.expect
deleted file mode 100644
index c96fec3e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_cascade.dart.weak.transformed.expect
+++ /dev/null
@@ -1,113 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-import "dart:_internal" as _in;
-
-import "dart:async";
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method m() → asy::Future<core::List<core::int*>*>* /* originally async */ {
-    final asy::_Future<core::List<core::int*>*>* :async_future = new asy::_Future::•<core::List<core::int*>*>();
-    core::bool* :is_sync = false;
-    FutureOr<core::List<core::int*>*>* :return_value;
-    (dynamic) →* dynamic :async_op_then;
-    (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-    core::int* :await_jump_var = 0;
-    dynamic :await_ctx_var;
-    dynamic :saved_try_context_var0;
-    function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-      try {
-        #L1:
-        {
-          final core::List<core::int*>* #t1 = core::_GrowableList::•<core::int*>(0);
-          [yield] let dynamic #t2 = asy::_awaitHelper(this.{self::C::_m}(), :async_op_then, :async_op_error, :async_op) in null;
-          #t1.{core::List::add}(_in::unsafeCast<core::int*>(:result));
-          :return_value = block {} =>#t1;
-          break #L1;
-        }
-        asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-      }
-    :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-    :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-    :async_op.call();
-    :is_sync = true;
-    return :async_future;
-  }
-  method _m() → asy::Future<core::int*>* /* originally async */ {
-    final asy::_Future<core::int*>* :async_future = new asy::_Future::•<core::int*>();
-    core::bool* :is_sync = false;
-    FutureOr<core::int*>* :return_value;
-    (dynamic) →* dynamic :async_op_then;
-    (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-    core::int* :await_jump_var = 0;
-    dynamic :await_ctx_var;
-    function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-      try {
-        #L2:
-        {
-          :return_value = 42;
-          break #L2;
-        }
-        asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-      }
-    :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-    :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-    :async_op.call();
-    :is_sync = true;
-    return :async_future;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L3:
-      {
-        [yield] let dynamic #t3 = asy::_awaitHelper(new self::C::•().{self::C::m}(), :async_op_then, :async_op_error, :async_op) in null;
-        self::expect(42, _in::unsafeCast<core::List<core::int*>*>(:result).{core::Iterable::first});
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method expect(dynamic expected, dynamic actual) → dynamic {
-  if(!expected.{core::Object::==}(actual))
-    throw "Expected ${expected}, actual ${actual}";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart
deleted file mode 100644
index bf060e8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-main() {
-  foo();
-}
-
-foo() {
-  // ignore: await_in_wrong_context
-  await foo();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.textual_outline.expect
deleted file mode 100644
index 3c7699f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-foo() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.textual_outline_modelled.expect
deleted file mode 100644
index 41dbdca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-foo() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.expect
deleted file mode 100644
index 2fa7548..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart:13:3: Error: 'await' can only be used in 'async' or 'async*' methods.
-//   await foo();
-//   ^^^^^
-//
-import self as self;
-
-static method main() → dynamic {
-  self::foo();
-}
-static method foo() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart:13:3: Error: 'await' can only be used in 'async' or 'async*' methods.
-  await foo();
-  ^^^^^";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.outline.expect
deleted file mode 100644
index 4c2eb20..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
-static method foo() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.transformed.expect
deleted file mode 100644
index 2fa7548..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart.weak.transformed.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart:13:3: Error: 'await' can only be used in 'async' or 'async*' methods.
-//   await foo();
-//   ^^^^^
-//
-import self as self;
-
-static method main() → dynamic {
-  self::foo();
-}
-static method foo() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/await_in_non_async.dart:13:3: Error: 'await' can only be used in 'async' or 'async*' methods.
-  await foo();
-  ^^^^^";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart
deleted file mode 100644
index 7fd4de1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-set b();
-
-set c(x, y);
-
-class A {
-  set a();
-  set d(x, y);
-}
-
-abstract class B {
-  set a();
-  set d(x, y);
-}
-
-main() {
-  bool threw;
-  try {
-    threw = true;
-    new A().a = null;
-    threw = false;
-  } catch (e) {
-    // Ignored.
-  }
-  if (!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    new A().d = null;
-    threw = false;
-  } catch (e) {
-    // Ignored.
-  }
-  if (!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    b = null;
-    threw = false;
-  } catch (e) {
-    // Ignored.
-  }
-  if (!threw) {
-    throw "Expected an error above.";
-  }
-  if (!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    c = null;
-    threw = false;
-  } catch (e) {
-    // Ignored.
-  }
-  if (!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    new B();
-    threw = false;
-  } on AbstractClassInstantiationError catch (_) {
-    // Ignored.
-  }
-  if (!threw) {
-    throw "Expected an error above.";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.textual_outline.expect
deleted file mode 100644
index 1e20aed..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-set b();
-set c(x, y);
-class A {
-  set a();
-  set d(x, y);
-}
-abstract class B {
-  set a();
-  set d(x, y);
-}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.expect
deleted file mode 100644
index 4e9486b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.expect
+++ /dev/null
@@ -1,179 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:7:8: Error: Expected a function body or '=>'.
-// Try adding {}.
-// set b();
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:9:12: Error: Expected a function body or '=>'.
-// Try adding {}.
-// set c(x, y);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:7:6: Error: A setter should have exactly one formal parameter.
-// set b();
-//      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:9:6: Error: A setter should have exactly one formal parameter.
-// set c(x, y);
-//      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:12:8: Error: A setter should have exactly one formal parameter.
-//   set a();
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:13:8: Error: A setter should have exactly one formal parameter.
-//   set d(x, y);
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:17:8: Error: A setter should have exactly one formal parameter.
-//   set a();
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:18:8: Error: A setter should have exactly one formal parameter.
-//   set d(x, y);
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:68:9: Error: The class 'B' is abstract and can't be instantiated.
-//     new B();
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  set a(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:12:8: Error: A setter should have exactly one formal parameter.
-  set a();
-       ^";
-    ;
-  }
-  set d(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:13:8: Error: A setter should have exactly one formal parameter.
-  set d(x, y);
-       ^";
-    {
-      dynamic x;
-      dynamic y;
-      ;
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  set a(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:17:8: Error: A setter should have exactly one formal parameter.
-  set a();
-       ^";
-    ;
-  }
-  set d(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:18:8: Error: A setter should have exactly one formal parameter.
-  set d(x, y);
-       ^";
-    {
-      dynamic x;
-      dynamic y;
-      ;
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static set b(dynamic #synthetic) → void {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:7:6: Error: A setter should have exactly one formal parameter.
-set b();
-     ^";
-  ;
-}
-static set c(dynamic #synthetic) → void {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:9:6: Error: A setter should have exactly one formal parameter.
-set c(x, y);
-     ^";
-  {
-    dynamic x;
-    dynamic y;
-    ;
-  }
-}
-static method main() → dynamic {
-  core::bool* threw;
-  try {
-    threw = true;
-    new self::A::•().{self::A::a} = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    new self::A::•().{self::A::d} = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    self::b = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    self::c = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    throw new core::AbstractClassInstantiationError::•("B");
-    threw = false;
-  }
-  on core::AbstractClassInstantiationError* catch(final core::AbstractClassInstantiationError* _) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.outline.expect
deleted file mode 100644
index 1371f38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.outline.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:7:8: Error: Expected a function body or '=>'.
-// Try adding {}.
-// set b();
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:9:12: Error: Expected a function body or '=>'.
-// Try adding {}.
-// set c(x, y);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  set a(dynamic #synthetic) → void
-    ;
-  set d(dynamic #synthetic) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  set a(dynamic #synthetic) → void
-    ;
-  set d(dynamic #synthetic) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static set b(dynamic #synthetic) → void
-  ;
-static set c(dynamic #synthetic) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.transformed.expect
deleted file mode 100644
index 4e9486b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart.weak.transformed.expect
+++ /dev/null
@@ -1,179 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:7:8: Error: Expected a function body or '=>'.
-// Try adding {}.
-// set b();
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:9:12: Error: Expected a function body or '=>'.
-// Try adding {}.
-// set c(x, y);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:7:6: Error: A setter should have exactly one formal parameter.
-// set b();
-//      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:9:6: Error: A setter should have exactly one formal parameter.
-// set c(x, y);
-//      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:12:8: Error: A setter should have exactly one formal parameter.
-//   set a();
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:13:8: Error: A setter should have exactly one formal parameter.
-//   set d(x, y);
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:17:8: Error: A setter should have exactly one formal parameter.
-//   set a();
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:18:8: Error: A setter should have exactly one formal parameter.
-//   set d(x, y);
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:68:9: Error: The class 'B' is abstract and can't be instantiated.
-//     new B();
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  set a(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:12:8: Error: A setter should have exactly one formal parameter.
-  set a();
-       ^";
-    ;
-  }
-  set d(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:13:8: Error: A setter should have exactly one formal parameter.
-  set d(x, y);
-       ^";
-    {
-      dynamic x;
-      dynamic y;
-      ;
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  set a(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:17:8: Error: A setter should have exactly one formal parameter.
-  set a();
-       ^";
-    ;
-  }
-  set d(dynamic #synthetic) → void {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:18:8: Error: A setter should have exactly one formal parameter.
-  set d(x, y);
-       ^";
-    {
-      dynamic x;
-      dynamic y;
-      ;
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static set b(dynamic #synthetic) → void {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:7:6: Error: A setter should have exactly one formal parameter.
-set b();
-     ^";
-  ;
-}
-static set c(dynamic #synthetic) → void {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bad_setter_abstract.dart:9:6: Error: A setter should have exactly one formal parameter.
-set c(x, y);
-     ^";
-  {
-    dynamic x;
-    dynamic y;
-    ;
-  }
-}
-static method main() → dynamic {
-  core::bool* threw;
-  try {
-    threw = true;
-    new self::A::•().{self::A::a} = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    new self::A::•().{self::A::d} = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    self::b = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    self::c = null;
-    threw = false;
-  }
-  on dynamic catch(final dynamic e) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-  try {
-    threw = true;
-    throw new core::AbstractClassInstantiationError::•("B");
-    threw = false;
-  }
-  on core::AbstractClassInstantiationError* catch(final core::AbstractClassInstantiationError* _) {
-  }
-  if(!threw) {
-    throw "Expected an error above.";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart
deleted file mode 100644
index 4bf8d54..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Foo {
-  var field;
-}
-
-dynamic identity(x) => x;
-
-void use(x) {}
-
-main(List<String> args) {
-  dynamic foo = identity(new Foo());
-  if (args.length > 1) {
-    foo.field = "string";
-    var first = foo.field;
-    use(first);
-    foo.noField = "string";
-    var second = foo.noField;
-    use(second);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.textual_outline.expect
deleted file mode 100644
index 3955e86..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class Foo {
-  var field;
-}
-
-dynamic identity(x) => x;
-void use(x) {}
-main(List<String> args) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.textual_outline_modelled.expect
deleted file mode 100644
index b1bfa6a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class Foo {
-  var field;
-}
-
-dynamic identity(x) => x;
-main(List<String> args) {}
-void use(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.expect
deleted file mode 100644
index 0567f70..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method identity(dynamic x) → dynamic
-  return x;
-static method use(dynamic x) → void {}
-static method main(core::List<core::String*>* args) → dynamic {
-  dynamic foo = self::identity(new self::Foo::•());
-  if(args.{core::List::length}.{core::num::>}(1)) {
-    foo.field = "string";
-    dynamic first = foo.field;
-    self::use(first);
-    foo.noField = "string";
-    dynamic second = foo.noField;
-    self::use(second);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.outline.expect
deleted file mode 100644
index ec06a08..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.outline.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field dynamic field;
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method identity(dynamic x) → dynamic
-  ;
-static method use(dynamic x) → void
-  ;
-static method main(core::List<core::String*>* args) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.transformed.expect
deleted file mode 100644
index 0567f70..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_store.dart.weak.transformed.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method identity(dynamic x) → dynamic
-  return x;
-static method use(dynamic x) → void {}
-static method main(core::List<core::String*>* args) → dynamic {
-  dynamic foo = self::identity(new self::Foo::•());
-  if(args.{core::List::length}.{core::num::>}(1)) {
-    foo.field = "string";
-    dynamic first = foo.field;
-    self::use(first);
-    foo.noField = "string";
-    dynamic second = foo.noField;
-    self::use(second);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart
deleted file mode 100644
index 3214587..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart
+++ /dev/null
@@ -1,90 +0,0 @@
-// 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.6
-
-typedef ContravariantUse<T> = Function(T);
-
-typedef InvariantUse<T> = T Function(T);
-
-class Empty {}
-
-class A<T> {}
-
-class B<T> extends A<Function(T)> {}
-
-class Bc<T> extends A<ContravariantUse<T>> {}
-
-class Bi<T> extends A<InvariantUse<T>> {}
-
-class C<T> implements A<Function(T)> {}
-
-class Cc<T> implements A<ContravariantUse<T>> {}
-
-class Ci<T> implements A<InvariantUse<T>> {}
-
-class D<T> = Object with A<Function(T)>;
-
-class Dc<T> = Object with A<ContravariantUse<T>>;
-
-class Di<T> = Object with A<InvariantUse<T>>;
-
-class E<T> = A<Function(T)> with Empty;
-
-class Ec<T> = A<ContravariantUse<T>> with Empty;
-
-class Ei<T> = A<InvariantUse<T>> with Empty;
-
-class F<T> extends Object with A<Function(T)> {}
-
-class Fc<T> extends Object with A<ContravariantUse<T>> {}
-
-class Fi<T> extends Object with A<InvariantUse<T>> {}
-
-class G<T> extends A<Function(T)> with Empty {}
-
-class Gc<T> extends A<ContravariantUse<T>> with Empty {}
-
-class Gi<T> extends A<InvariantUse<T>> with Empty {}
-
-class Hff<T> extends A<Function(Function(T))> {}
-
-class Hfc<T> extends A<Function(ContravariantUse<T>)> {}
-
-class Hcf<T> extends A<ContravariantUse<Function(T)>> {}
-
-class Hcc<T> extends A<ContravariantUse<ContravariantUse<T>>> {}
-
-class Hii<T> extends A<InvariantUse<InvariantUse<T>>> {}
-
-class Iafc<T> extends A<A<Function(ContravariantUse<T>)>> {}
-
-class Iacf<T> extends A<A<ContravariantUse<Function(T)>>> {}
-
-class Ifac<T> extends A<Function(A<ContravariantUse<T>>)> {}
-
-class Ifca<T> extends A<Function(ContravariantUse<A<T>>)> {}
-
-class Icaf<T> extends A<ContravariantUse<A<Function(T)>>> {}
-
-class Icfa<T> extends A<ContravariantUse<Function(A<T>)>> {}
-
-class Jfff<T> extends A<Function(Function(Function(T)))> {}
-
-class Jffc<T> extends A<Function(Function(ContravariantUse<T>))> {}
-
-class Jfcf<T> extends A<Function(ContravariantUse<Function(T)>)> {}
-
-class Jfcc<T> extends A<Function(ContravariantUse<ContravariantUse<T>>)> {}
-
-class Jcff<T> extends A<ContravariantUse<Function(Function(T))>> {}
-
-class Jcfc<T> extends A<ContravariantUse<Function(ContravariantUse<T>)>> {}
-
-class Jccf<T> extends A<ContravariantUse<ContravariantUse<Function(T)>>> {}
-
-class Jccc<T>
-    extends A<ContravariantUse<ContravariantUse<ContravariantUse<T>>>> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.textual_outline.expect
deleted file mode 100644
index 9fe865d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.textual_outline.expect
+++ /dev/null
@@ -1,79 +0,0 @@
-// @dart = 2.6
-typedef ContravariantUse<T> = Function(T);
-typedef InvariantUse<T> = T Function(T);
-
-class Empty {}
-
-class A<T> {}
-
-class B<T> extends A<Function(T)> {}
-
-class Bc<T> extends A<ContravariantUse<T>> {}
-
-class Bi<T> extends A<InvariantUse<T>> {}
-
-class C<T> implements A<Function(T)> {}
-
-class Cc<T> implements A<ContravariantUse<T>> {}
-
-class Ci<T> implements A<InvariantUse<T>> {}
-
-class D<T> = Object with A<Function(T)>;
-class Dc<T> = Object with A<ContravariantUse<T>>;
-class Di<T> = Object with A<InvariantUse<T>>;
-class E<T> = A<Function(T)> with Empty;
-class Ec<T> = A<ContravariantUse<T>> with Empty;
-class Ei<T> = A<InvariantUse<T>> with Empty;
-
-class F<T> extends Object with A<Function(T)> {}
-
-class Fc<T> extends Object with A<ContravariantUse<T>> {}
-
-class Fi<T> extends Object with A<InvariantUse<T>> {}
-
-class G<T> extends A<Function(T)> with Empty {}
-
-class Gc<T> extends A<ContravariantUse<T>> with Empty {}
-
-class Gi<T> extends A<InvariantUse<T>> with Empty {}
-
-class Hff<T> extends A<Function(Function(T))> {}
-
-class Hfc<T> extends A<Function(ContravariantUse<T>)> {}
-
-class Hcf<T> extends A<ContravariantUse<Function(T)>> {}
-
-class Hcc<T> extends A<ContravariantUse<ContravariantUse<T>>> {}
-
-class Hii<T> extends A<InvariantUse<InvariantUse<T>>> {}
-
-class Iafc<T> extends A<A<Function(ContravariantUse<T>)>> {}
-
-class Iacf<T> extends A<A<ContravariantUse<Function(T)>>> {}
-
-class Ifac<T> extends A<Function(A<ContravariantUse<T>>)> {}
-
-class Ifca<T> extends A<Function(ContravariantUse<A<T>>)> {}
-
-class Icaf<T> extends A<ContravariantUse<A<Function(T)>>> {}
-
-class Icfa<T> extends A<ContravariantUse<Function(A<T>)>> {}
-
-class Jfff<T> extends A<Function(Function(Function(T)))> {}
-
-class Jffc<T> extends A<Function(Function(ContravariantUse<T>))> {}
-
-class Jfcf<T> extends A<Function(ContravariantUse<Function(T)>)> {}
-
-class Jfcc<T> extends A<Function(ContravariantUse<ContravariantUse<T>>)> {}
-
-class Jcff<T> extends A<ContravariantUse<Function(Function(T))>> {}
-
-class Jcfc<T> extends A<ContravariantUse<Function(ContravariantUse<T>)>> {}
-
-class Jccf<T> extends A<ContravariantUse<ContravariantUse<Function(T)>>> {}
-
-class Jccc<T>
-    extends A<ContravariantUse<ContravariantUse<ContravariantUse<T>>>> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.textual_outline_modelled.expect
deleted file mode 100644
index 11e3414..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,78 +0,0 @@
-// @dart = 2.6
-class A<T> {}
-
-class B<T> extends A<Function(T)> {}
-
-class Bc<T> extends A<ContravariantUse<T>> {}
-
-class Bi<T> extends A<InvariantUse<T>> {}
-
-class C<T> implements A<Function(T)> {}
-
-class Cc<T> implements A<ContravariantUse<T>> {}
-
-class Ci<T> implements A<InvariantUse<T>> {}
-
-class D<T> = Object with A<Function(T)>;
-class Dc<T> = Object with A<ContravariantUse<T>>;
-class Di<T> = Object with A<InvariantUse<T>>;
-class E<T> = A<Function(T)> with Empty;
-class Ec<T> = A<ContravariantUse<T>> with Empty;
-class Ei<T> = A<InvariantUse<T>> with Empty;
-
-class Empty {}
-
-class F<T> extends Object with A<Function(T)> {}
-
-class Fc<T> extends Object with A<ContravariantUse<T>> {}
-
-class Fi<T> extends Object with A<InvariantUse<T>> {}
-
-class G<T> extends A<Function(T)> with Empty {}
-
-class Gc<T> extends A<ContravariantUse<T>> with Empty {}
-
-class Gi<T> extends A<InvariantUse<T>> with Empty {}
-
-class Hcc<T> extends A<ContravariantUse<ContravariantUse<T>>> {}
-
-class Hcf<T> extends A<ContravariantUse<Function(T)>> {}
-
-class Hfc<T> extends A<Function(ContravariantUse<T>)> {}
-
-class Hff<T> extends A<Function(Function(T))> {}
-
-class Hii<T> extends A<InvariantUse<InvariantUse<T>>> {}
-
-class Iacf<T> extends A<A<ContravariantUse<Function(T)>>> {}
-
-class Iafc<T> extends A<A<Function(ContravariantUse<T>)>> {}
-
-class Icaf<T> extends A<ContravariantUse<A<Function(T)>>> {}
-
-class Icfa<T> extends A<ContravariantUse<Function(A<T>)>> {}
-
-class Ifac<T> extends A<Function(A<ContravariantUse<T>>)> {}
-
-class Ifca<T> extends A<Function(ContravariantUse<A<T>>)> {}
-
-class Jccc<T>
-    extends A<ContravariantUse<ContravariantUse<ContravariantUse<T>>>> {}
-
-class Jccf<T> extends A<ContravariantUse<ContravariantUse<Function(T)>>> {}
-
-class Jcfc<T> extends A<ContravariantUse<Function(ContravariantUse<T>)>> {}
-
-class Jcff<T> extends A<ContravariantUse<Function(Function(T))>> {}
-
-class Jfcc<T> extends A<Function(ContravariantUse<ContravariantUse<T>>)> {}
-
-class Jfcf<T> extends A<Function(ContravariantUse<Function(T)>)> {}
-
-class Jffc<T> extends A<Function(Function(ContravariantUse<T>))> {}
-
-class Jfff<T> extends A<Function(Function(Function(T)))> {}
-
-main() {}
-typedef ContravariantUse<T> = Function(T);
-typedef InvariantUse<T> = T Function(T);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.expect
deleted file mode 100644
index 1751a24..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.expect
+++ /dev/null
@@ -1,633 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:15:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class B<T> extends A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:17:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Bc<T> extends A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:19:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Bi<T> extends A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:21:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class C<T> implements A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:23:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Cc<T> implements A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:25:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Ci<T> implements A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:27:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class D<T> = Object with A<Function(T)>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:29:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Dc<T> = Object with A<ContravariantUse<T>>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:31:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Di<T> = Object with A<InvariantUse<T>>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:33:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class E<T> = A<Function(T)> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:35:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Ec<T> = A<ContravariantUse<T>> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:37:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Ei<T> = A<InvariantUse<T>> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:39:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class F<T> extends Object with A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:41:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Fc<T> extends Object with A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:43:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Fi<T> extends Object with A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:45:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class G<T> extends A<Function(T)> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:47:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Gc<T> extends A<ContravariantUse<T>> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:49:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Gi<T> extends A<InvariantUse<T>> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:59:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Hii<T> extends A<InvariantUse<InvariantUse<T>>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:73:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfff<T> extends A<Function(Function(Function(T)))> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:75:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jffc<T> extends A<Function(Function(ContravariantUse<T>))> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:77:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfcf<T> extends A<Function(ContravariantUse<Function(T)>)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:79:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfcc<T> extends A<Function(ContravariantUse<ContravariantUse<T>>)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:81:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jcff<T> extends A<ContravariantUse<Function(Function(T))>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:83:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jcfc<T> extends A<ContravariantUse<Function(ContravariantUse<T>)>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:85:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jccf<T> extends A<ContravariantUse<ContravariantUse<Function(T)>>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:87:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jccc<T>
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef ContravariantUse<contravariant T extends core::Object* = dynamic> = (T*) →* dynamic;
-typedef InvariantUse<invariant T extends core::Object* = dynamic> = (T*) →* T*;
-class Empty extends core::Object {
-  synthetic constructor •() → self::Empty*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Bc<self::Bc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bi<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Bi<self::Bi::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Cc<self::Cc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ci<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Ci<self::Ci::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::D<self::D::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dc<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Dc<self::Dc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Di<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Di<self::Di::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E<T extends core::Object* = dynamic> = core::Object with self::Empty {
-  synthetic constructor •() → self::E<self::E::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ec<T extends core::Object* = dynamic> = core::Object with self::Empty {
-  synthetic constructor •() → self::Ec<self::Ec::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ei<T extends core::Object* = dynamic> = core::Object with self::Empty {
-  synthetic constructor •() → self::Ei<self::Ei::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _F&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_F&Object&A<self::_F&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class F<T extends core::Object* = dynamic> extends self::_F&Object&A<self::F::T*> {
-  synthetic constructor •() → self::F<self::F::T*>*
-    : super self::_F&Object&A::•()
-    ;
-}
-abstract class _Fc&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fc&Object&A<self::_Fc&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fc<T extends core::Object* = dynamic> extends self::_Fc&Object&A<self::Fc::T*> {
-  synthetic constructor •() → self::Fc<self::Fc::T*>*
-    : super self::_Fc&Object&A::•()
-    ;
-}
-abstract class _Fi&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fi&Object&A<self::_Fi&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fi<T extends core::Object* = dynamic> extends self::_Fi&Object&A<self::Fi::T*> {
-  synthetic constructor •() → self::Fi<self::Fi::T*>*
-    : super self::_Fi&Object&A::•()
-    ;
-}
-abstract class _G&A&Empty<T extends core::Object* = dynamic> = core::Object with self::Empty /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_G&A&Empty<self::_G&A&Empty::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class G<T extends core::Object* = dynamic> extends self::_G&A&Empty<self::G::T*> {
-  synthetic constructor •() → self::G<self::G::T*>*
-    : super self::_G&A&Empty::•()
-    ;
-}
-abstract class _Gc&A&Empty<T extends core::Object* = dynamic> = core::Object with self::Empty /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Gc&A&Empty<self::_Gc&A&Empty::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gc<T extends core::Object* = dynamic> extends self::_Gc&A&Empty<self::Gc::T*> {
-  synthetic constructor •() → self::Gc<self::Gc::T*>*
-    : super self::_Gc&A&Empty::•()
-    ;
-}
-abstract class _Gi&A&Empty<T extends core::Object* = dynamic> = core::Object with self::Empty /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Gi&A&Empty<self::_Gi&A&Empty::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gi<T extends core::Object* = dynamic> extends self::_Gi&A&Empty<self::Gi::T*> {
-  synthetic constructor •() → self::Gi<self::Gi::T*>*
-    : super self::_Gi&A&Empty::•()
-    ;
-}
-class Hff<T extends core::Object* = dynamic> extends self::A<((self::Hff::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hff<self::Hff::T*>*
-    : super self::A::•()
-    ;
-}
-class Hfc<T extends core::Object* = dynamic> extends self::A<((self::Hfc::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hfc<self::Hfc::T*>*
-    : super self::A::•()
-    ;
-}
-class Hcf<T extends core::Object* = dynamic> extends self::A<((self::Hcf::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hcf<self::Hcf::T*>*
-    : super self::A::•()
-    ;
-}
-class Hcc<T extends core::Object* = dynamic> extends self::A<((self::Hcc::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hcc<self::Hcc::T*>*
-    : super self::A::•()
-    ;
-}
-class Hii<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Hii<self::Hii::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Iafc<T extends core::Object* = dynamic> extends self::A<self::A<((self::Iafc::T*) →* dynamic) →* dynamic>*> {
-  synthetic constructor •() → self::Iafc<self::Iafc::T*>*
-    : super self::A::•()
-    ;
-}
-class Iacf<T extends core::Object* = dynamic> extends self::A<self::A<((self::Iacf::T*) →* dynamic) →* dynamic>*> {
-  synthetic constructor •() → self::Iacf<self::Iacf::T*>*
-    : super self::A::•()
-    ;
-}
-class Ifac<T extends core::Object* = dynamic> extends self::A<(self::A<(self::Ifac::T*) →* dynamic>*) →* dynamic> {
-  synthetic constructor •() → self::Ifac<self::Ifac::T*>*
-    : super self::A::•()
-    ;
-}
-class Ifca<T extends core::Object* = dynamic> extends self::A<((self::A<self::Ifca::T*>*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Ifca<self::Ifca::T*>*
-    : super self::A::•()
-    ;
-}
-class Icaf<T extends core::Object* = dynamic> extends self::A<(self::A<(self::Icaf::T*) →* dynamic>*) →* dynamic> {
-  synthetic constructor •() → self::Icaf<self::Icaf::T*>*
-    : super self::A::•()
-    ;
-}
-class Icfa<T extends core::Object* = dynamic> extends self::A<((self::A<self::Icfa::T*>*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Icfa<self::Icfa::T*>*
-    : super self::A::•()
-    ;
-}
-class Jfff<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfff<self::Jfff::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jffc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jffc<self::Jffc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jfcf<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfcf<self::Jfcf::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jfcc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfcc<self::Jfcc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jcff<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jcff<self::Jcff::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jcfc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jcfc<self::Jcfc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jccf<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jccf<self::Jccf::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jccc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jccc<self::Jccc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.outline.expect
deleted file mode 100644
index 8bb2902..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.outline.expect
+++ /dev/null
@@ -1,595 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:15:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class B<T> extends A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:17:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Bc<T> extends A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:19:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Bi<T> extends A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:21:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class C<T> implements A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:23:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Cc<T> implements A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:25:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Ci<T> implements A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:27:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class D<T> = Object with A<Function(T)>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:29:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Dc<T> = Object with A<ContravariantUse<T>>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:31:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Di<T> = Object with A<InvariantUse<T>>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:33:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class E<T> = A<Function(T)> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:35:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Ec<T> = A<ContravariantUse<T>> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:37:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Ei<T> = A<InvariantUse<T>> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:39:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class F<T> extends Object with A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:41:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Fc<T> extends Object with A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:43:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Fi<T> extends Object with A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:45:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class G<T> extends A<Function(T)> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:47:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Gc<T> extends A<ContravariantUse<T>> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:49:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Gi<T> extends A<InvariantUse<T>> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:59:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Hii<T> extends A<InvariantUse<InvariantUse<T>>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:73:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfff<T> extends A<Function(Function(Function(T)))> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:75:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jffc<T> extends A<Function(Function(ContravariantUse<T>))> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:77:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfcf<T> extends A<Function(ContravariantUse<Function(T)>)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:79:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfcc<T> extends A<Function(ContravariantUse<ContravariantUse<T>>)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:81:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jcff<T> extends A<ContravariantUse<Function(Function(T))>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:83:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jcfc<T> extends A<ContravariantUse<Function(ContravariantUse<T>)>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:85:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jccf<T> extends A<ContravariantUse<ContravariantUse<Function(T)>>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:87:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jccc<T>
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef ContravariantUse<contravariant T extends core::Object* = dynamic> = (T*) →* dynamic;
-typedef InvariantUse<invariant T extends core::Object* = dynamic> = (T*) →* T*;
-class Empty extends core::Object {
-  synthetic constructor •() → self::Empty*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Bc<self::Bc::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bi<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Bi<self::Bi::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Cc<self::Cc::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ci<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Ci<self::Ci::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::D<self::D::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dc<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Dc<self::Dc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Di<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Di<self::Di::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E<T extends core::Object* = dynamic> = core::Object with self::Empty {
-  synthetic constructor •() → self::E<self::E::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ec<T extends core::Object* = dynamic> = core::Object with self::Empty {
-  synthetic constructor •() → self::Ec<self::Ec::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ei<T extends core::Object* = dynamic> = core::Object with self::Empty {
-  synthetic constructor •() → self::Ei<self::Ei::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _F&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_F&Object&A<self::_F&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class F<T extends core::Object* = dynamic> extends self::_F&Object&A<self::F::T*> {
-  synthetic constructor •() → self::F<self::F::T*>*
-    ;
-}
-abstract class _Fc&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fc&Object&A<self::_Fc&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fc<T extends core::Object* = dynamic> extends self::_Fc&Object&A<self::Fc::T*> {
-  synthetic constructor •() → self::Fc<self::Fc::T*>*
-    ;
-}
-abstract class _Fi&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fi&Object&A<self::_Fi&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fi<T extends core::Object* = dynamic> extends self::_Fi&Object&A<self::Fi::T*> {
-  synthetic constructor •() → self::Fi<self::Fi::T*>*
-    ;
-}
-abstract class _G&A&Empty<T extends core::Object* = dynamic> = core::Object with self::Empty /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_G&A&Empty<self::_G&A&Empty::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class G<T extends core::Object* = dynamic> extends self::_G&A&Empty<self::G::T*> {
-  synthetic constructor •() → self::G<self::G::T*>*
-    ;
-}
-abstract class _Gc&A&Empty<T extends core::Object* = dynamic> = core::Object with self::Empty /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Gc&A&Empty<self::_Gc&A&Empty::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gc<T extends core::Object* = dynamic> extends self::_Gc&A&Empty<self::Gc::T*> {
-  synthetic constructor •() → self::Gc<self::Gc::T*>*
-    ;
-}
-abstract class _Gi&A&Empty<T extends core::Object* = dynamic> = core::Object with self::Empty /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Gi&A&Empty<self::_Gi&A&Empty::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gi<T extends core::Object* = dynamic> extends self::_Gi&A&Empty<self::Gi::T*> {
-  synthetic constructor •() → self::Gi<self::Gi::T*>*
-    ;
-}
-class Hff<T extends core::Object* = dynamic> extends self::A<((self::Hff::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hff<self::Hff::T*>*
-    ;
-}
-class Hfc<T extends core::Object* = dynamic> extends self::A<((self::Hfc::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hfc<self::Hfc::T*>*
-    ;
-}
-class Hcf<T extends core::Object* = dynamic> extends self::A<((self::Hcf::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hcf<self::Hcf::T*>*
-    ;
-}
-class Hcc<T extends core::Object* = dynamic> extends self::A<((self::Hcc::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hcc<self::Hcc::T*>*
-    ;
-}
-class Hii<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Hii<self::Hii::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Iafc<T extends core::Object* = dynamic> extends self::A<self::A<((self::Iafc::T*) →* dynamic) →* dynamic>*> {
-  synthetic constructor •() → self::Iafc<self::Iafc::T*>*
-    ;
-}
-class Iacf<T extends core::Object* = dynamic> extends self::A<self::A<((self::Iacf::T*) →* dynamic) →* dynamic>*> {
-  synthetic constructor •() → self::Iacf<self::Iacf::T*>*
-    ;
-}
-class Ifac<T extends core::Object* = dynamic> extends self::A<(self::A<(self::Ifac::T*) →* dynamic>*) →* dynamic> {
-  synthetic constructor •() → self::Ifac<self::Ifac::T*>*
-    ;
-}
-class Ifca<T extends core::Object* = dynamic> extends self::A<((self::A<self::Ifca::T*>*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Ifca<self::Ifca::T*>*
-    ;
-}
-class Icaf<T extends core::Object* = dynamic> extends self::A<(self::A<(self::Icaf::T*) →* dynamic>*) →* dynamic> {
-  synthetic constructor •() → self::Icaf<self::Icaf::T*>*
-    ;
-}
-class Icfa<T extends core::Object* = dynamic> extends self::A<((self::A<self::Icfa::T*>*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Icfa<self::Icfa::T*>*
-    ;
-}
-class Jfff<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfff<self::Jfff::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jffc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jffc<self::Jffc::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jfcf<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfcf<self::Jfcf::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jfcc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfcc<self::Jfcc::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jcff<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jcff<self::Jcff::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jcfc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jcfc<self::Jcfc::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jccf<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jccf<self::Jccf::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jccc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jccc<self::Jccc::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.transformed.expect
deleted file mode 100644
index e084c3b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart.weak.transformed.expect
+++ /dev/null
@@ -1,633 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:15:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class B<T> extends A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:17:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Bc<T> extends A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:19:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Bi<T> extends A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:21:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class C<T> implements A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:23:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Cc<T> implements A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:25:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Ci<T> implements A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:27:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class D<T> = Object with A<Function(T)>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:29:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Dc<T> = Object with A<ContravariantUse<T>>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:31:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Di<T> = Object with A<InvariantUse<T>>;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:33:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class E<T> = A<Function(T)> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:35:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Ec<T> = A<ContravariantUse<T>> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:37:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Ei<T> = A<InvariantUse<T>> with Empty;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:39:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class F<T> extends Object with A<Function(T)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:41:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Fc<T> extends Object with A<ContravariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:43:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Fi<T> extends Object with A<InvariantUse<T>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:45:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class G<T> extends A<Function(T)> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:47:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Gc<T> extends A<ContravariantUse<T>> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:49:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Gi<T> extends A<InvariantUse<T>> with Empty {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:59:7: Error: Can't use implicitly 'out' variable 'T' in an 'inout' position in supertype 'A'.
-// class Hii<T> extends A<InvariantUse<InvariantUse<T>>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:73:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfff<T> extends A<Function(Function(Function(T)))> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:75:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jffc<T> extends A<Function(Function(ContravariantUse<T>))> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:77:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfcf<T> extends A<Function(ContravariantUse<Function(T)>)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:79:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jfcc<T> extends A<Function(ContravariantUse<ContravariantUse<T>>)> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:81:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jcff<T> extends A<ContravariantUse<Function(Function(T))>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:83:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jcfc<T> extends A<ContravariantUse<Function(ContravariantUse<T>)>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:85:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jccf<T> extends A<ContravariantUse<ContravariantUse<Function(T)>>> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes.dart:87:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class Jccc<T>
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef ContravariantUse<contravariant T extends core::Object* = dynamic> = (T*) →* dynamic;
-typedef InvariantUse<invariant T extends core::Object* = dynamic> = (T*) →* T*;
-class Empty extends core::Object {
-  synthetic constructor •() → self::Empty*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Bc<self::Bc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bi<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Bi<self::Bi::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Cc<self::Cc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ci<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Ci<self::Ci::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::D<self::D::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dc<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Dc<self::Dc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Di<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Di<self::Di::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E<T extends core::Object* = dynamic> extends core::Object implements self::Empty /*isEliminatedMixin*/  {
-  synthetic constructor •() → self::E<self::E::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ec<T extends core::Object* = dynamic> extends core::Object implements self::Empty /*isEliminatedMixin*/  {
-  synthetic constructor •() → self::Ec<self::Ec::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ei<T extends core::Object* = dynamic> extends core::Object implements self::Empty /*isEliminatedMixin*/  {
-  synthetic constructor •() → self::Ei<self::Ei::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _F&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_F&Object&A<self::_F&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class F<T extends core::Object* = dynamic> extends self::_F&Object&A<self::F::T*> {
-  synthetic constructor •() → self::F<self::F::T*>*
-    : super self::_F&Object&A::•()
-    ;
-}
-abstract class _Fc&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fc&Object&A<self::_Fc&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fc<T extends core::Object* = dynamic> extends self::_Fc&Object&A<self::Fc::T*> {
-  synthetic constructor •() → self::Fc<self::Fc::T*>*
-    : super self::_Fc&Object&A::•()
-    ;
-}
-abstract class _Fi&Object&A<T extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fi&Object&A<self::_Fi&Object&A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fi<T extends core::Object* = dynamic> extends self::_Fi&Object&A<self::Fi::T*> {
-  synthetic constructor •() → self::Fi<self::Fi::T*>*
-    : super self::_Fi&Object&A::•()
-    ;
-}
-abstract class _G&A&Empty<T extends core::Object* = dynamic> extends core::Object implements self::Empty /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_G&A&Empty<self::_G&A&Empty::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class G<T extends core::Object* = dynamic> extends self::_G&A&Empty<self::G::T*> {
-  synthetic constructor •() → self::G<self::G::T*>*
-    : super self::_G&A&Empty::•()
-    ;
-}
-abstract class _Gc&A&Empty<T extends core::Object* = dynamic> extends core::Object implements self::Empty /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_Gc&A&Empty<self::_Gc&A&Empty::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gc<T extends core::Object* = dynamic> extends self::_Gc&A&Empty<self::Gc::T*> {
-  synthetic constructor •() → self::Gc<self::Gc::T*>*
-    : super self::_Gc&A&Empty::•()
-    ;
-}
-abstract class _Gi&A&Empty<T extends core::Object* = dynamic> extends core::Object implements self::Empty /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_Gi&A&Empty<self::_Gi&A&Empty::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gi<T extends core::Object* = dynamic> extends self::_Gi&A&Empty<self::Gi::T*> {
-  synthetic constructor •() → self::Gi<self::Gi::T*>*
-    : super self::_Gi&A&Empty::•()
-    ;
-}
-class Hff<T extends core::Object* = dynamic> extends self::A<((self::Hff::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hff<self::Hff::T*>*
-    : super self::A::•()
-    ;
-}
-class Hfc<T extends core::Object* = dynamic> extends self::A<((self::Hfc::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hfc<self::Hfc::T*>*
-    : super self::A::•()
-    ;
-}
-class Hcf<T extends core::Object* = dynamic> extends self::A<((self::Hcf::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hcf<self::Hcf::T*>*
-    : super self::A::•()
-    ;
-}
-class Hcc<T extends core::Object* = dynamic> extends self::A<((self::Hcc::T*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Hcc<self::Hcc::T*>*
-    : super self::A::•()
-    ;
-}
-class Hii<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Hii<self::Hii::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Iafc<T extends core::Object* = dynamic> extends self::A<self::A<((self::Iafc::T*) →* dynamic) →* dynamic>*> {
-  synthetic constructor •() → self::Iafc<self::Iafc::T*>*
-    : super self::A::•()
-    ;
-}
-class Iacf<T extends core::Object* = dynamic> extends self::A<self::A<((self::Iacf::T*) →* dynamic) →* dynamic>*> {
-  synthetic constructor •() → self::Iacf<self::Iacf::T*>*
-    : super self::A::•()
-    ;
-}
-class Ifac<T extends core::Object* = dynamic> extends self::A<(self::A<(self::Ifac::T*) →* dynamic>*) →* dynamic> {
-  synthetic constructor •() → self::Ifac<self::Ifac::T*>*
-    : super self::A::•()
-    ;
-}
-class Ifca<T extends core::Object* = dynamic> extends self::A<((self::A<self::Ifca::T*>*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Ifca<self::Ifca::T*>*
-    : super self::A::•()
-    ;
-}
-class Icaf<T extends core::Object* = dynamic> extends self::A<(self::A<(self::Icaf::T*) →* dynamic>*) →* dynamic> {
-  synthetic constructor •() → self::Icaf<self::Icaf::T*>*
-    : super self::A::•()
-    ;
-}
-class Icfa<T extends core::Object* = dynamic> extends self::A<((self::A<self::Icfa::T*>*) →* dynamic) →* dynamic> {
-  synthetic constructor •() → self::Icfa<self::Icfa::T*>*
-    : super self::A::•()
-    ;
-}
-class Jfff<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfff<self::Jfff::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jffc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jffc<self::Jffc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jfcf<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfcf<self::Jfcf::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jfcc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jfcc<self::Jfcc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jcff<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jcff<self::Jcff::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jcfc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jcfc<self::Jcfc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jccf<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jccf<self::Jccf::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jccc<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Jccc<self::Jccc::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart
deleted file mode 100644
index 4294763..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This testcase checks an implementation detail in the bounds checking
-// mechanism.  Here String passed into bar should be checked against the bound
-// that depends on the result of type inference for expression `B.foo()`.
-
-class A<X> {
-  bar<Y extends X>() => null;
-}
-
-class B {
-  static A<Y> foo<Y extends Object>() => null;
-}
-
-baz() {
-  B.foo().bar<String>();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.textual_outline.expect
deleted file mode 100644
index 2cbc0b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class A<X> {
-  bar<Y extends X>() => null;
-}
-
-class B {
-  static A<Y> foo<Y extends Object>() => null;
-}
-
-baz() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5f38302..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-baz() {}
-
-class A<X> {
-  bar<Y extends X>() => null;
-}
-
-class B {
-  static A<Y> foo<Y extends Object>() => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.expect
deleted file mode 100644
index d64170d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.expect
+++ /dev/null
@@ -1,42 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  method bar<generic-covariant-impl Y extends self::A::X* = self::A::X*>() → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  static method foo<Y extends core::Object* = core::Object*>() → self::A<self::B::foo::Y*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz() → dynamic {
-  self::B::foo<core::Object*>().{self::A::bar}<core::String*>();
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.outline.expect
deleted file mode 100644
index b5f4961..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.outline.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    ;
-  method bar<generic-covariant-impl Y extends self::A::X* = self::A::X*>() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  static method foo<Y extends core::Object* = core::Object*>() → self::A<self::B::foo::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.transformed.expect
deleted file mode 100644
index d64170d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bounds_check_depends_on_inference.dart.weak.transformed.expect
+++ /dev/null
@@ -1,42 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  method bar<generic-covariant-impl Y extends self::A::X* = self::A::X*>() → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  static method foo<Y extends core::Object* = core::Object*>() → self::A<self::B::foo::Y*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz() → dynamic {
-  self::B::foo<core::Object*>().{self::A::bar}<core::String*>();
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart
deleted file mode 100644
index 31462b9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-test() {
-  Object x;
-  Function f;
-  x();
-  x(3);
-  f(5, 2);
-  x.call();
-  f.call;
-  f.call(5, 2);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.textual_outline.expect
deleted file mode 100644
index 5cf5db8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.textual_outline_modelled.expect
deleted file mode 100644
index 94295cd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.weak.expect
deleted file mode 100644
index 0a1b582..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.weak.expect
+++ /dev/null
@@ -1,48 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart:10:4: Error: The method 'call' isn't defined for the class 'Object'.
-//  - 'Object' is from 'dart:core'.
-// Try correcting the name to the name of an existing method, or defining a method named 'call'.
-//   x();
-//    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart:11:4: Error: The method 'call' isn't defined for the class 'Object'.
-//  - 'Object' is from 'dart:core'.
-// Try correcting the name to the name of an existing method, or defining a method named 'call'.
-//   x(3);
-//    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart:13:5: Error: The method 'call' isn't defined for the class 'Object'.
-//  - 'Object' is from 'dart:core'.
-// Try correcting the name to the name of an existing method, or defining a method named 'call'.
-//   x.call();
-//     ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-static method test() → dynamic {
-  core::Object* x;
-  core::Function* f;
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart:10:4: Error: The method 'call' isn't defined for the class 'Object'.
- - 'Object' is from 'dart:core'.
-Try correcting the name to the name of an existing method, or defining a method named 'call'.
-  x();
-   ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart:11:4: Error: The method 'call' isn't defined for the class 'Object'.
- - 'Object' is from 'dart:core'.
-Try correcting the name to the name of an existing method, or defining a method named 'call'.
-  x(3);
-   ^";
-  f.call(5, 2);
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart:13:5: Error: The method 'call' isn't defined for the class 'Object'.
- - 'Object' is from 'dart:core'.
-Try correcting the name to the name of an existing method, or defining a method named 'call'.
-  x.call();
-    ^^^^";
-  f.call;
-  f.call(5, 2);
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.weak.outline.expect
deleted file mode 100644
index a29647d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug21938.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart
deleted file mode 100644
index fb4b59c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2013, 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.6
-
-class A {
-  var foo = 42;
-}
-
-class B extends A {
-  // Note: illegal override.
-  foo() => 42;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.textual_outline.expect
deleted file mode 100644
index 5a9e0bc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A {
-  var foo = 42;
-}
-
-class B extends A {
-  foo() => 42;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5a9e0bc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A {
-  var foo = 42;
-}
-
-class B extends A {
-  foo() => 42;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.weak.expect
deleted file mode 100644
index e9a0980..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.weak.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart:13:3: Error: Can't declare a member that conflicts with an inherited one.
-//   foo() => 42;
-//   ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart:8:7: Context: This is the inherited member.
-//   var foo = 42;
-//       ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* foo = 42;
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method foo() → dynamic
-    return 42;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.weak.outline.expect
deleted file mode 100644
index f6cada0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart.weak.outline.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart:13:3: Error: Can't declare a member that conflicts with an inherited one.
-//   foo() => 42;
-//   ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/bug30695.dart:8:7: Context: This is the inherited member.
-//   var foo = 42;
-//       ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* foo;
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-  method foo() → dynamic
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart
deleted file mode 100644
index 706a56e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright (c) 2017, 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.6
-var a = () => 'b';a();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.textual_outline.expect
deleted file mode 100644
index fe4ea03..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-var a = () => 'b';
-a();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.expect
deleted file mode 100644
index 3ac4c2c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:22: Error: Expected a function body or '=>'.
-// Try adding {}.
-// var a = () => 'b';a();
-//                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:19: Error: 'a' is already declared in this scope.
-// var a = () => 'b';a();
-//                   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:5: Context: Previous declaration of 'a'.
-// var a = () => 'b';a();
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-static field () →* core::String* a;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.outline.expect
deleted file mode 100644
index 3ac4c2c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.outline.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:22: Error: Expected a function body or '=>'.
-// Try adding {}.
-// var a = () => 'b';a();
-//                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:19: Error: 'a' is already declared in this scope.
-// var a = () => 'b';a();
-//                   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:5: Context: Previous declaration of 'a'.
-// var a = () => 'b';a();
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-static field () →* core::String* a;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.transformed.expect
deleted file mode 100644
index 3ac4c2c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart.weak.transformed.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:22: Error: Expected a function body or '=>'.
-// Try adding {}.
-// var a = () => 'b';a();
-//                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:19: Error: 'a' is already declared in this scope.
-// var a = () => 'b';a();
-//                   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/bug31124.dart:6:5: Context: Previous declaration of 'a'.
-// var a = () => 'b';a();
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-static field () →* core::String* a;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart
deleted file mode 100644
index 7eda380..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-/*@testedFeatures=inference*/
-
-void test() {
-  dynamic a = 5;
-  var /*@ type=String* */ b = a. /*@target=Object.toString*/ toString();
-  b = 42;
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.textual_outline.expect
deleted file mode 100644
index c1995a0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-void test() {}
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.textual_outline_modelled.expect
deleted file mode 100644
index 8f1f745..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-void main() {}
-void test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.expect
deleted file mode 100644
index 0e34316..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart:12:7: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   b = 42;
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method test() → void {
-  dynamic a = 5;
-  core::String* b = a.{core::Object::toString}();
-  b = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart:12:7: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  b = 42;
-      ^" in 42 as{TypeError} core::String*;
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.outline.expect
deleted file mode 100644
index a440da0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method test() → void
-  ;
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.transformed.expect
deleted file mode 100644
index 0e34316..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart.weak.transformed.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart:12:7: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   b = 42;
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method test() → void {
-  dynamic a = 5;
-  core::String* b = a.{core::Object::toString}();
-  b = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32414a.dart:12:7: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  b = 42;
-      ^" in 42 as{TypeError} core::String*;
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart
deleted file mode 100644
index bee2cb3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-/*@testedFeatures=inference*/
-
-void test() {
-  List<dynamic> l = /*@ typeArgs=dynamic */ [1, "hello"];
-  List<String> l2 = l
-      . /*@target=Iterable.map*/ /*@ typeArgs=String* */ map(
-          /*@ returnType=String* */ (dynamic element) =>
-              element. /*@target=Object.toString*/ toString())
-      . /*@target=Iterable.toList*/ toList();
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.textual_outline.expect
deleted file mode 100644
index c1995a0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-void test() {}
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.textual_outline_modelled.expect
deleted file mode 100644
index 8f1f745..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-void main() {}
-void test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.expect
deleted file mode 100644
index 1422239..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method test() → void {
-  core::List<dynamic>* l = <dynamic>[1, "hello"];
-  core::List<core::String*>* l2 = l.{core::Iterable::map}<core::String*>((dynamic element) → core::String* => element.{core::Object::toString}()).{core::Iterable::toList}();
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.outline.expect
deleted file mode 100644
index a440da0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method test() → void
-  ;
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.transformed.expect
deleted file mode 100644
index 6378088..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32414b.dart.weak.transformed.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method test() → void {
-  core::List<dynamic>* l = core::_GrowableList::_literal2<dynamic>(1, "hello");
-  core::List<core::String*>* l2 = l.{core::Iterable::map}<core::String*>((dynamic element) → core::String* => element.{core::Object::toString}()).{core::Iterable::toList}();
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart
deleted file mode 100644
index d6328dd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-abstract class I {
-  void call();
-}
-
-class C implements I {
-  void call([int x]) {}
-}
-
-main() {
-  I i = new C();
-  void Function([int]) f = i;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.textual_outline.expect
deleted file mode 100644
index df070ac..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class I {
-  void call();
-}
-
-class C implements I {
-  void call([int x]) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.textual_outline_modelled.expect
deleted file mode 100644
index df070ac..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class I {
-  void call();
-}
-
-class C implements I {
-  void call([int x]) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.expect
deleted file mode 100644
index cb6d7d6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class I extends core::Object {
-  synthetic constructor •() → self::I*
-    : super core::Object::•()
-    ;
-  abstract method call() → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object implements self::I {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method call([core::int* x = #C1]) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::I* i = new self::C::•();
-  ([core::int*]) →* void f = (let final self::I* #t1 = i in #t1.==(null) ?{() →* void} null : #t1.{self::I::call}) as{TypeError} ([core::int*]) →* void;
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.outline.expect
deleted file mode 100644
index 4da5082..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.outline.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class I extends core::Object {
-  synthetic constructor •() → self::I*
-    ;
-  abstract method call() → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object implements self::I {
-  synthetic constructor •() → self::C*
-    ;
-  method call([core::int* x]) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.transformed.expect
deleted file mode 100644
index cb6d7d6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32426.dart.weak.transformed.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class I extends core::Object {
-  synthetic constructor •() → self::I*
-    : super core::Object::•()
-    ;
-  abstract method call() → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object implements self::I {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method call([core::int* x = #C1]) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::I* i = new self::C::•();
-  ([core::int*]) →* void f = (let final self::I* #t1 = i in #t1.==(null) ?{() →* void} null : #t1.{self::I::call}) as{TypeError} ([core::int*]) →* void;
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart
deleted file mode 100644
index e0e9698..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class A {
-  dynamic call(dynamic a, dynamic b) {
-    return a;
-  }
-}
-
-typedef S Reducer<S>(S a, dynamic b);
-
-void foo<S>(Reducer<S> v) {}
-
-void test() {
-  foo<String>(new A());
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.textual_outline.expect
deleted file mode 100644
index 06ad4f4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  dynamic call(dynamic a, dynamic b) {}
-}
-
-typedef S Reducer<S>(S a, dynamic b);
-void foo<S>(Reducer<S> v) {}
-void test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.textual_outline_modelled.expect
deleted file mode 100644
index fc42c66..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  dynamic call(dynamic a, dynamic b) {}
-}
-
-main() {}
-typedef S Reducer<S>(S a, dynamic b);
-void foo<S>(Reducer<S> v) {}
-void test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.expect
deleted file mode 100644
index 0452f69..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
-//   foo<String>(new A());
-//                   ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method call(dynamic a, dynamic b) → dynamic {
-    return a;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
-static method test() → void {
-  self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
-  foo<String>(new A());
-                  ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.outline.expect
deleted file mode 100644
index c0d8165..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  method call(dynamic a, dynamic b) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void
-  ;
-static method test() → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.transformed.expect
deleted file mode 100644
index 0452f69..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
-//   foo<String>(new A());
-//                   ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef Reducer<invariant S extends core::Object* = dynamic> = (S*, dynamic) →* S*;
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method call(dynamic a, dynamic b) → dynamic {
-    return a;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo<S extends core::Object* = dynamic>((self::foo::S*, dynamic) →* self::foo::S* v) → void {}
-static method test() → void {
-  self::foo<core::String*>(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug32629.dart:18:19: Error: The argument type 'dynamic Function(dynamic, dynamic)' can't be assigned to the parameter type 'String Function(String, dynamic)'.
-  foo<String>(new A());
-                  ^" in (let final self::A* #t2 = new self::A::•() in #t2.==(null) ?{(dynamic, dynamic) →* dynamic} null : #t2.{self::A::call}) as{TypeError} (core::String*, dynamic) →* core::String*);
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart
deleted file mode 100644
index ca32f6a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// Regression test that top-level inference correctly handles dependencies from
-// top-level field -> initializing formal -> field that overrides a getter.
-
-abstract class B {
-  String get f;
-}
-
-class A implements B {
-  final f;
-  A(this.f);
-}
-
-var a = new A("foo");
-main() => print(a);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.textual_outline.expect
deleted file mode 100644
index 233366a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-abstract class B {
-  String get f;
-}
-
-class A implements B {
-  final f;
-  A(this.f);
-}
-
-var a = new A("foo");
-main() => print(a);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.textual_outline_modelled.expect
deleted file mode 100644
index 166e7e6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-abstract class B {
-  String get f;
-}
-
-class A implements B {
-  A(this.f);
-  final f;
-}
-
-main() => print(a);
-var a = new A("foo");
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.expect
deleted file mode 100644
index 25924d8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract get f() → core::String*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends core::Object implements self::B {
-  final field core::String* f;
-  constructor •(core::String* f) → self::A*
-    : self::A::f = f, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::A* a = new self::A::•("foo");
-static method main() → dynamic
-  return core::print(self::a);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.outline.expect
deleted file mode 100644
index 83f4eb2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.outline.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract get f() → core::String*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends core::Object implements self::B {
-  final field core::String* f;
-  constructor •(core::String* f) → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::A* a;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.transformed.expect
deleted file mode 100644
index 25924d8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug32866.dart.weak.transformed.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract get f() → core::String*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends core::Object implements self::B {
-  final field core::String* f;
-  constructor •(core::String* f) → self::A*
-    : self::A::f = f, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::A* a = new self::A::•("foo");
-static method main() → dynamic
-  return core::print(self::a);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart
deleted file mode 100644
index 3ec152f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import 'dart:mirrors';
-
-const _FailingTest failingTest = const _FailingTest();
-
-class _FailingTest {
-  const _FailingTest();
-}
-
-class MyTest {
-  @failingTest
-  void foo() {}
-}
-
-class MyTest2 extends Object with MyTest {}
-
-main() {
-  ClassMirror classMirror = reflectClass(MyTest2);
-  classMirror.instanceMembers
-      .forEach((Symbol symbol, MethodMirror memberMirror) {
-    if (memberMirror.simpleName == #foo) {
-      print(memberMirror);
-      print(_hasFailingTestAnnotation(memberMirror));
-    }
-  });
-}
-
-bool _hasFailingTestAnnotation(MethodMirror method) {
-  var r = _hasAnnotationInstance(method, failingTest);
-  print('[_hasFailingTestAnnotation] $method $r');
-  return r;
-}
-
-bool _hasAnnotationInstance(DeclarationMirror declaration, instance) =>
-    declaration.metadata.any((InstanceMirror annotation) {
-      print('annotation: ${annotation.reflectee}');
-      return identical(annotation.reflectee, instance);
-    });
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.textual_outline.expect
deleted file mode 100644
index 004d115..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.textual_outline.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-// @dart = 2.6
-import 'dart:mirrors';
-
-const _FailingTest failingTest = const _FailingTest();
-
-class _FailingTest {
-  const _FailingTest();
-}
-
-class MyTest {
-  @failingTest
-  void foo() {}
-}
-
-class MyTest2 extends Object with MyTest {}
-
-main() {}
-bool _hasFailingTestAnnotation(MethodMirror method) {}
-bool _hasAnnotationInstance(DeclarationMirror declaration, instance) =>
-    declaration.metadata.any((InstanceMirror annotation) {
-      print('annotation: ${annotation.reflectee}');
-      return identical(annotation.reflectee, instance);
-    });
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.textual_outline_modelled.expect
deleted file mode 100644
index 187b0dc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-// @dart = 2.6
-import 'dart:mirrors';
-
-bool _hasAnnotationInstance(DeclarationMirror declaration, instance) =>
-    declaration.metadata.any((InstanceMirror annotation) {
-      print('annotation: ${annotation.reflectee}');
-      return identical(annotation.reflectee, instance);
-    });
-bool _hasFailingTestAnnotation(MethodMirror method) {}
-
-class MyTest {
-  @failingTest
-  void foo() {}
-}
-
-class MyTest2 extends Object with MyTest {}
-
-class _FailingTest {
-  const _FailingTest();
-}
-
-const _FailingTest failingTest = const _FailingTest();
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.expect
deleted file mode 100644
index 9b4bb6a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.expect
+++ /dev/null
@@ -1,93 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:mirrors" as mir;
-
-import "dart:mirrors";
-
-class _FailingTest extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::_FailingTest*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MyTest extends core::Object {
-  synthetic constructor •() → self::MyTest*
-    : super core::Object::•()
-    ;
-  @#C1
-  method foo() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _MyTest2&Object&MyTest = core::Object with self::MyTest /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_MyTest2&Object&MyTest*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method foo() → void
-    return super.{self::MyTest::foo}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MyTest2 extends self::_MyTest2&Object&MyTest {
-  synthetic constructor •() → self::MyTest2*
-    : super self::_MyTest2&Object&MyTest::•()
-    ;
-}
-static const field self::_FailingTest* failingTest = #C1;
-static method main() → dynamic {
-  mir::ClassMirror* classMirror = mir::reflectClass(#C2);
-  classMirror.{mir::ClassMirror::instanceMembers}.{core::Map::forEach}((core::Symbol* symbol, mir::MethodMirror* memberMirror) → Null {
-    if(memberMirror.{mir::DeclarationMirror::simpleName}.{core::Symbol::==}(#C3)) {
-      core::print(memberMirror);
-      core::print(self::_hasFailingTestAnnotation(memberMirror));
-    }
-  });
-}
-static method _hasFailingTestAnnotation(mir::MethodMirror* method) → core::bool* {
-  core::bool* r = self::_hasAnnotationInstance(method, #C1);
-  core::print("[_hasFailingTestAnnotation] ${method} ${r}");
-  return r;
-}
-static method _hasAnnotationInstance(mir::DeclarationMirror* declaration, dynamic instance) → core::bool*
-  return declaration.{mir::DeclarationMirror::metadata}.{core::Iterable::any}((mir::InstanceMirror* annotation) → core::bool* {
-    core::print("annotation: ${annotation.{mir::InstanceMirror::reflectee}}");
-    return core::identical(annotation.{mir::InstanceMirror::reflectee}, instance);
-  });
-
-constants  {
-  #C1 = self::_FailingTest {}
-  #C2 = TypeLiteralConstant(self::MyTest2*)
-  #C3 = #foo
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///bug33099.dart:
-- _FailingTest. (from org-dartlang-testcase:///bug33099.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.outline.expect
deleted file mode 100644
index c59b326..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.outline.expect
+++ /dev/null
@@ -1,73 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:mirrors" as mir;
-
-import "dart:mirrors";
-
-class _FailingTest extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::_FailingTest*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MyTest extends core::Object {
-  synthetic constructor •() → self::MyTest*
-    ;
-  @self::failingTest
-  method foo() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _MyTest2&Object&MyTest = core::Object with self::MyTest /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_MyTest2&Object&MyTest*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method foo() → void
-    return super.{self::MyTest::foo}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MyTest2 extends self::_MyTest2&Object&MyTest {
-  synthetic constructor •() → self::MyTest2*
-    ;
-}
-static const field self::_FailingTest* failingTest = const self::_FailingTest::•();
-static method main() → dynamic
-  ;
-static method _hasFailingTestAnnotation(mir::MethodMirror* method) → core::bool*
-  ;
-static method _hasAnnotationInstance(mir::DeclarationMirror* declaration, dynamic instance) → core::bool*
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///bug33099.dart:16:4 -> InstanceConstant(const _FailingTest{})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///bug33099.dart:9:40 -> InstanceConstant(const _FailingTest{})
-Extra constant evaluation: evaluated: 3, effectively constant: 2
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.transformed.expect
deleted file mode 100644
index bb18f32..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33099.dart.weak.transformed.expect
+++ /dev/null
@@ -1,93 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:mirrors" as mir;
-
-import "dart:mirrors";
-
-class _FailingTest extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::_FailingTest*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MyTest extends core::Object {
-  synthetic constructor •() → self::MyTest*
-    : super core::Object::•()
-    ;
-  @#C1
-  method foo() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _MyTest2&Object&MyTest extends core::Object implements self::MyTest /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_MyTest2&Object&MyTest*
-    : super core::Object::•()
-    ;
-  @#C1
-  method foo() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MyTest2 extends self::_MyTest2&Object&MyTest {
-  synthetic constructor •() → self::MyTest2*
-    : super self::_MyTest2&Object&MyTest::•()
-    ;
-}
-static const field self::_FailingTest* failingTest = #C1;
-static method main() → dynamic {
-  mir::ClassMirror* classMirror = mir::reflectClass(#C2);
-  classMirror.{mir::ClassMirror::instanceMembers}.{core::Map::forEach}((core::Symbol* symbol, mir::MethodMirror* memberMirror) → Null {
-    if(memberMirror.{mir::DeclarationMirror::simpleName}.{core::Symbol::==}(#C3)) {
-      core::print(memberMirror);
-      core::print(self::_hasFailingTestAnnotation(memberMirror));
-    }
-  });
-}
-static method _hasFailingTestAnnotation(mir::MethodMirror* method) → core::bool* {
-  core::bool* r = self::_hasAnnotationInstance(method, #C1);
-  core::print("[_hasFailingTestAnnotation] ${method} ${r}");
-  return r;
-}
-static method _hasAnnotationInstance(mir::DeclarationMirror* declaration, dynamic instance) → core::bool*
-  return declaration.{mir::DeclarationMirror::metadata}.{core::Iterable::any}((mir::InstanceMirror* annotation) → core::bool* {
-    core::print("annotation: ${annotation.{mir::InstanceMirror::reflectee}}");
-    return core::identical(annotation.{mir::InstanceMirror::reflectee}, instance);
-  });
-
-constants  {
-  #C1 = self::_FailingTest {}
-  #C2 = TypeLiteralConstant(self::MyTest2*)
-  #C3 = #foo
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///bug33099.dart:
-- _FailingTest. (from org-dartlang-testcase:///bug33099.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart
deleted file mode 100644
index 7b13bef..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import 'dart:async';
-
-main() {
-  var result = returnsString();
-  print(result.runtimeType);
-}
-
-FutureOr<String> returnsString() async {
-  return "oh no";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.textual_outline.expect
deleted file mode 100644
index 8386cde..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-main() {}
-FutureOr<String> returnsString() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.textual_outline_modelled.expect
deleted file mode 100644
index 71a68ef2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-FutureOr<String> returnsString() async {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.expect
deleted file mode 100644
index f76933a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "dart:async";
-
-static method main() → dynamic {
-  FutureOr<core::String*>* result = self::returnsString();
-  core::print(result.{core::Object::runtimeType});
-}
-static method returnsString() → FutureOr<core::String*>* async {
-  return "oh no";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.outline.expect
deleted file mode 100644
index b187102..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "dart:async";
-
-static method main() → dynamic
-  ;
-static method returnsString() → FutureOr<core::String*>* async 
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.transformed.expect
deleted file mode 100644
index ea1347a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33196.dart.weak.transformed.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-static method main() → dynamic {
-  FutureOr<core::String*>* result = self::returnsString();
-  core::print(result.{core::Object::runtimeType});
-}
-static method returnsString() → FutureOr<core::String*>* /* originally async */ {
-  final asy::_Future<core::String*>* :async_future = new asy::_Future::•<core::String*>();
-  core::bool* :is_sync = false;
-  FutureOr<core::String*>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        :return_value = "oh no";
-        break #L1;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart
deleted file mode 100644
index 7c85277..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import 'dart:async';
-
-class X {
-  final x;
-  final y;
-
-  X(this.x, this.y);
-
-  toString() => "X($x, $y)";
-}
-
-class Y {
-  f(_) {}
-}
-
-Future<List<Object>> f1() async {
-  return [1];
-}
-
-List<Object> f2() => [2];
-
-Future<Object> f3() async {
-  return 3;
-}
-
-Future<X> foo() async {
-  return X(Y()..f(await f1())..f(f2()), await f3());
-}
-
-Future<void> main() async {
-  print(await foo());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.textual_outline.expect
deleted file mode 100644
index 2e821ff..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.textual_outline.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-class X {
-  final x;
-  final y;
-  X(this.x, this.y);
-  toString() => "X($x, $y)";
-}
-
-class Y {
-  f(_) {}
-}
-
-Future<List<Object>> f1() async {}
-List<Object> f2() => [2];
-Future<Object> f3() async {}
-Future<X> foo() async {}
-Future<void> main() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.textual_outline_modelled.expect
deleted file mode 100644
index 0fd457d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-Future<List<Object>> f1() async {}
-Future<Object> f3() async {}
-Future<X> foo() async {}
-Future<void> main() async {}
-List<Object> f2() => [2];
-
-class X {
-  X(this.x, this.y);
-  final x;
-  final y;
-  toString() => "X($x, $y)";
-}
-
-class Y {
-  f(_) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.expect
deleted file mode 100644
index f4075a0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.expect
+++ /dev/null
@@ -1,58 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class X extends core::Object {
-  final field dynamic x;
-  final field dynamic y;
-  constructor •(dynamic x, dynamic y) → self::X*
-    : self::X::x = x, self::X::y = y, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return "X(${this.{self::X::x}}, ${this.{self::X::y}})";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends core::Object {
-  synthetic constructor •() → self::Y*
-    : super core::Object::•()
-    ;
-  method f(dynamic _) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method f1() → asy::Future<core::List<core::Object*>*>* async {
-  return <core::Object*>[1];
-}
-static method f2() → core::List<core::Object*>*
-  return <core::Object*>[2];
-static method f3() → asy::Future<core::Object*>* async {
-  return 3;
-}
-static method foo() → asy::Future<self::X*>* async {
-  return new self::X::•(let final self::Y* #t1 = new self::Y::•() in block {
-    #t1.{self::Y::f}(await self::f1());
-    #t1.{self::Y::f}(self::f2());
-  } =>#t1, await self::f3());
-}
-static method main() → asy::Future<void>* async {
-  core::print(await self::foo());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.outline.expect
deleted file mode 100644
index 12a29c0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.outline.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class X extends core::Object {
-  final field dynamic x;
-  final field dynamic y;
-  constructor •(dynamic x, dynamic y) → self::X*
-    ;
-  method toString() → core::String*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends core::Object {
-  synthetic constructor •() → self::Y*
-    ;
-  method f(dynamic _) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method f1() → asy::Future<core::List<core::Object*>*>* async 
-  ;
-static method f2() → core::List<core::Object*>*
-  ;
-static method f3() → asy::Future<core::Object*>* async 
-  ;
-static method foo() → asy::Future<self::X*>* async 
-  ;
-static method main() → asy::Future<void>* async 
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.transformed.expect
deleted file mode 100644
index 2ca85ca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33206.dart.weak.transformed.expect
+++ /dev/null
@@ -1,162 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-import "dart:_internal" as _in;
-
-import "dart:async";
-
-class X extends core::Object {
-  final field dynamic x;
-  final field dynamic y;
-  constructor •(dynamic x, dynamic y) → self::X*
-    : self::X::x = x, self::X::y = y, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return "X(${this.{self::X::x}}, ${this.{self::X::y}})";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends core::Object {
-  synthetic constructor •() → self::Y*
-    : super core::Object::•()
-    ;
-  method f(dynamic _) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method f1() → asy::Future<core::List<core::Object*>*>* /* originally async */ {
-  final asy::_Future<core::List<core::Object*>*>* :async_future = new asy::_Future::•<core::List<core::Object*>*>();
-  core::bool* :is_sync = false;
-  FutureOr<core::List<core::Object*>*>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        :return_value = core::_GrowableList::_literal1<core::Object*>(1);
-        break #L1;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method f2() → core::List<core::Object*>*
-  return core::_GrowableList::_literal1<core::Object*>(2);
-static method f3() → asy::Future<core::Object*>* /* originally async */ {
-  final asy::_Future<core::Object*>* :async_future = new asy::_Future::•<core::Object*>();
-  core::bool* :is_sync = false;
-  FutureOr<core::Object*>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L2:
-      {
-        :return_value = 3;
-        break #L2;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method foo() → asy::Future<self::X*>* /* originally async */ {
-  final asy::_Future<self::X*>* :async_future = new asy::_Future::•<self::X*>();
-  core::bool* :is_sync = false;
-  FutureOr<self::X*>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :async_temporary_0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L3:
-      {
-        final self::Y* #t1 = new self::Y::•();
-        [yield] let dynamic #t2 = asy::_awaitHelper(self::f1(), :async_op_then, :async_op_error, :async_op) in null;
-        #t1.{self::Y::f}(_in::unsafeCast<core::List<core::Object*>*>(:result));
-        :async_temporary_0 = block {
-          #t1.{self::Y::f}(self::f2());
-        } =>#t1;
-        [yield] let dynamic #t3 = asy::_awaitHelper(self::f3(), :async_op_then, :async_op_error, :async_op) in null;
-        :return_value = new self::X::•(_in::unsafeCast<self::Y*>(:async_temporary_0), _in::unsafeCast<core::Object*>(:result));
-        break #L3;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method main() → asy::Future<void>* /* originally async */ {
-  final asy::_Future<void>* :async_future = new asy::_Future::•<void>();
-  core::bool* :is_sync = false;
-  FutureOr<void>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L4:
-      {
-        [yield] let dynamic #t4 = asy::_awaitHelper(self::foo(), :async_op_then, :async_op_error, :async_op) in null;
-        core::print(_in::unsafeCast<self::X*>(:result));
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart
deleted file mode 100644
index 50be6e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class A {
-  String call(String s) => '$s$s';
-}
-
-class B<T> {
-  T call(T t) => t;
-}
-
-class C {
-  T call<T>(T t) => t;
-}
-
-test() {
-  A a = A();
-  List<String> list1 = ['a', 'b', 'c'].map(a.call).toList();
-  List<String> list2 = ['a', 'b', 'c'].map(a).toList();
-
-  B<String> b = B();
-  List<String> list3 = ['a', 'b', 'c'].map(b.call).toList();
-  List<String> list4 = ['a', 'b', 'c'].map(b).toList();
-
-  C c = C();
-  List<String> list5 = ['a', 'b', 'c'].map(c.call).toList();
-  List<String> list6 = ['a', 'b', 'c'].map(c).toList();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.textual_outline.expect
deleted file mode 100644
index f13a69c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.textual_outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-class A {
-  String call(String s) => '$s$s';
-}
-
-class B<T> {
-  T call(T t) => t;
-}
-
-class C {
-  T call<T>(T t) => t;
-}
-
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.textual_outline_modelled.expect
deleted file mode 100644
index a95aef3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-class A {
-  String call(String s) => '$s$s';
-}
-
-class B<T> {
-  T call(T t) => t;
-}
-
-class C {
-  T call<T>(T t) => t;
-}
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.expect
deleted file mode 100644
index 7bf8079..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart:30:44: Error: The argument type 'T Function<T>(T)' can't be assigned to the parameter type 'dynamic Function(String)'.
-//   List<String> list6 = ['a', 'b', 'c'].map(c).toList();
-//                                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method call(core::String* s) → core::String*
-    return "${s}${s}";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method call(generic-covariant-impl self::B::T* t) → self::B::T*
-    return t;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method call<T extends core::Object* = dynamic>(self::C::call::T* t) → self::C::call::T*
-    return t;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  self::A* a = new self::A::•();
-  core::List<core::String*>* list1 = <core::String*>["a", "b", "c"].{core::Iterable::map}<core::String*>(a.{self::A::call}).{core::Iterable::toList}();
-  core::List<core::String*>* list2 = <core::String*>["a", "b", "c"].{core::Iterable::map}<core::String*>(let final self::A* #t1 = a in #t1.==(null) ?{(core::String*) →* core::String*} null : #t1.{self::A::call}).{core::Iterable::toList}();
-  self::B<core::String*>* b = new self::B::•<core::String*>();
-  core::List<core::String*>* list3 = <core::String*>["a", "b", "c"].{core::Iterable::map}<core::String*>(b.{self::B::call}).{core::Iterable::toList}();
-  core::List<core::String*>* list4 = <core::String*>["a", "b", "c"].{core::Iterable::map}<core::String*>(let final self::B<core::String*>* #t2 = b in #t2.==(null) ?{(core::String*) →* core::String*} null : #t2.{self::B::call}).{core::Iterable::toList}();
-  self::C* c = new self::C::•();
-  core::List<core::String*>* list5 = <core::String*>["a", "b", "c"].{core::Iterable::map}<core::String*>(c.{self::C::call}<core::String*>).{core::Iterable::toList}();
-  core::List<core::String*>* list6 = <core::String*>["a", "b", "c"].{core::Iterable::map}<dynamic>(let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart:30:44: Error: The argument type 'T Function<T>(T)' can't be assigned to the parameter type 'dynamic Function(String)'.
-  List<String> list6 = ['a', 'b', 'c'].map(c).toList();
-                                           ^" in (let final self::C* #t4 = c in #t4.==(null) ?{<T extends core::Object* = dynamic>(T*) →* T*} null : #t4.{self::C::call}) as{TypeError} (core::String*) →* dynamic).{core::Iterable::toList}() as{TypeError} core::List<core::String*>*;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.outline.expect
deleted file mode 100644
index 5a653a2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.outline.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  method call(core::String* s) → core::String*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    ;
-  method call(generic-covariant-impl self::B::T* t) → self::B::T*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method call<T extends core::Object* = dynamic>(self::C::call::T* t) → self::C::call::T*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.transformed.expect
deleted file mode 100644
index d01a7f6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart.weak.transformed.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart:30:44: Error: The argument type 'T Function<T>(T)' can't be assigned to the parameter type 'dynamic Function(String)'.
-//   List<String> list6 = ['a', 'b', 'c'].map(c).toList();
-//                                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method call(core::String* s) → core::String*
-    return "${s}${s}";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method call(generic-covariant-impl self::B::T* t) → self::B::T*
-    return t;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method call<T extends core::Object* = dynamic>(self::C::call::T* t) → self::C::call::T*
-    return t;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  self::A* a = new self::A::•();
-  core::List<core::String*>* list1 = core::_GrowableList::_literal3<core::String*>("a", "b", "c").{core::Iterable::map}<core::String*>(a.{self::A::call}).{core::Iterable::toList}();
-  core::List<core::String*>* list2 = core::_GrowableList::_literal3<core::String*>("a", "b", "c").{core::Iterable::map}<core::String*>(let final self::A* #t1 = a in #t1.==(null) ?{(core::String*) →* core::String*} null : #t1.{self::A::call}).{core::Iterable::toList}();
-  self::B<core::String*>* b = new self::B::•<core::String*>();
-  core::List<core::String*>* list3 = core::_GrowableList::_literal3<core::String*>("a", "b", "c").{core::Iterable::map}<core::String*>(b.{self::B::call}).{core::Iterable::toList}();
-  core::List<core::String*>* list4 = core::_GrowableList::_literal3<core::String*>("a", "b", "c").{core::Iterable::map}<core::String*>(let final self::B<core::String*>* #t2 = b in #t2.==(null) ?{(core::String*) →* core::String*} null : #t2.{self::B::call}).{core::Iterable::toList}();
-  self::C* c = new self::C::•();
-  core::List<core::String*>* list5 = core::_GrowableList::_literal3<core::String*>("a", "b", "c").{core::Iterable::map}<core::String*>(c.{self::C::call}<core::String*>).{core::Iterable::toList}();
-  core::List<core::String*>* list6 = core::_GrowableList::_literal3<core::String*>("a", "b", "c").{core::Iterable::map}<dynamic>(let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/bug33298.dart:30:44: Error: The argument type 'T Function<T>(T)' can't be assigned to the parameter type 'dynamic Function(String)'.
-  List<String> list6 = ['a', 'b', 'c'].map(c).toList();
-                                           ^" in (let final self::C* #t4 = c in #t4.==(null) ?{<T extends core::Object* = dynamic>(T*) →* T*} null : #t4.{self::C::call}) as{TypeError} (core::String*) →* dynamic).{core::Iterable::toList}() as{TypeError} core::List<core::String*>*;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart
deleted file mode 100644
index a7cc0d0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// See http://dartbug.com/34511 for details.
-
-class A<X> {}
-
-class B<Z> extends Object with A<Z Function()> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.textual_outline.expect
deleted file mode 100644
index 909ecab..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-class A<X> {}
-
-class B<Z> extends Object with A<Z Function()> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.textual_outline_modelled.expect
deleted file mode 100644
index 909ecab..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-class A<X> {}
-
-class B<Z> extends Object with A<Z Function()> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.expect
deleted file mode 100644
index 5cda82c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&A<Z extends core::Object* = dynamic> = core::Object with self::A<() →* self::_B&Object&A::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&A<self::_B&Object&A::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<Z extends core::Object* = dynamic> extends self::_B&Object&A<self::B::Z*> {
-  synthetic constructor •() → self::B<self::B::Z*>*
-    : super self::_B&Object&A::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.outline.expect
deleted file mode 100644
index 315401d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.outline.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&A<Z extends core::Object* = dynamic> = core::Object with self::A<() →* self::_B&Object&A::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&A<self::_B&Object&A::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<Z extends core::Object* = dynamic> extends self::_B&Object&A<self::B::Z*> {
-  synthetic constructor •() → self::B<self::B::Z*>*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.transformed.expect
deleted file mode 100644
index 16931e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug34511.dart.weak.transformed.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&A<Z extends core::Object* = dynamic> extends core::Object implements self::A<() →* self::_B&Object&A::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&A<self::_B&Object&A::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<Z extends core::Object* = dynamic> extends self::_B&Object&A<self::B::Z*> {
-  synthetic constructor •() → self::B<self::B::Z*>*
-    : super self::_B&Object&A::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart
deleted file mode 100644
index af9f7db..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class A<X> {
-  foo<Y extends X>() {}
-}
-
-class B extends A<dynamic> {}
-
-bar(B b) {
-  b.foo();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.textual_outline.expect
deleted file mode 100644
index 1b15757..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A<X> {
-  foo<Y extends X>() {}
-}
-
-class B extends A<dynamic> {}
-
-bar(B b) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.textual_outline_modelled.expect
deleted file mode 100644
index 72036e5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-bar(B b) {}
-
-class A<X> {
-  foo<Y extends X>() {}
-}
-
-class B extends A<dynamic> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.expect
deleted file mode 100644
index 4bb1bd3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  method foo<generic-covariant-impl Y extends self::A::X* = self::A::X*>() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A<dynamic> {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-static method bar(self::B* b) → dynamic {
-  b.{self::A::foo}<dynamic>();
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.outline.expect
deleted file mode 100644
index bc8adee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.outline.expect
+++ /dev/null
@@ -1,28 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    ;
-  method foo<generic-covariant-impl Y extends self::A::X* = self::A::X*>() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A<dynamic> {
-  synthetic constructor •() → self::B*
-    ;
-}
-static method bar(self::B* b) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.transformed.expect
deleted file mode 100644
index 4bb1bd3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug35470.dart.weak.transformed.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  method foo<generic-covariant-impl Y extends self::A::X* = self::A::X*>() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A<dynamic> {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-static method bar(self::B* b) → dynamic {
-  b.{self::A::foo}<dynamic>();
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart b/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart
deleted file mode 100644
index fcad45e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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.6
-
-/*@testedFeatures=checks*/
-
-class A<T extends num> {
-  void Function<S extends T>(S x) foo() {
-    print('foo: T = $T');
-    return <S extends T>(S a) {};
-  }
-}
-
-class B<T extends num> {
-  void Function(T x) foo() {
-    print('foo: T = $T');
-    return (T a) {};
-  }
-}
-
-A<num> a = new A<int>();
-B<num> b = new B<int>();
-
-main() {
-  try {
-    a.foo /*@ checkReturn=<S extends num* = dynamic>(S*) ->* void */ ();
-    throw 'Expected TypeError';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    b.foo /*@ checkReturn=(num*) ->* void */ ();
-    throw 'Expected TypeError';
-  } on TypeError catch (e) {
-    print(e);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.textual_outline.expect
deleted file mode 100644
index ba5130c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class A<T extends num> {
-  void Function<S extends T>(S x) foo() {}
-}
-
-class B<T extends num> {
-  void Function(T x) foo() {}
-}
-
-A<num> a = new A<int>();
-B<num> b = new B<int>();
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.textual_outline_modelled.expect
deleted file mode 100644
index 14bd5a1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-// @dart = 2.6
-A<num> a = new A<int>();
-B<num> b = new B<int>();
-
-class A<T extends num> {
-  void Function<S extends T>(S x) foo() {}
-}
-
-class B<T extends num> {
-  void Function(T x) foo() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.expect
deleted file mode 100644
index 112e0e4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  method foo() → <S extends self::A::T* = dynamic>(S*) →* void {
-    core::print("foo: T = ${self::A::T*}");
-    return <S extends self::A::T* = self::A::T*>(S* a) → Null {};
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method foo() → (self::B::T*) →* void {
-    core::print("foo: T = ${self::B::T*}");
-    return (self::B::T* a) → Null {};
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::A<core::num*>* a = new self::A::•<core::int*>();
-static field self::B<core::num*>* b = new self::B::•<core::int*>();
-static method main() → dynamic {
-  try {
-    self::a.{self::A::foo}() as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* void;
-    throw "Expected TypeError";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    self::b.{self::B::foo}() as{TypeError,CovarianceCheck} (core::num*) →* void;
-    throw "Expected TypeError";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.outline.expect
deleted file mode 100644
index 7828759..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.outline.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    ;
-  method foo() → <S extends self::A::T* = dynamic>(S*) →* void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    ;
-  method foo() → (self::B::T*) →* void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::A<core::num*>* a;
-static field self::B<core::num*>* b;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.transformed.expect
deleted file mode 100644
index 112e0e4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/bug37476.dart.weak.transformed.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  method foo() → <S extends self::A::T* = dynamic>(S*) →* void {
-    core::print("foo: T = ${self::A::T*}");
-    return <S extends self::A::T* = self::A::T*>(S* a) → Null {};
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method foo() → (self::B::T*) →* void {
-    core::print("foo: T = ${self::B::T*}");
-    return (self::B::T* a) → Null {};
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::A<core::num*>* a = new self::A::•<core::int*>();
-static field self::B<core::num*>* b = new self::B::•<core::int*>();
-static method main() → dynamic {
-  try {
-    self::a.{self::A::foo}() as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* void;
-    throw "Expected TypeError";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    self::b.{self::B::foo}() as{TypeError,CovarianceCheck} (core::num*) →* void;
-    throw "Expected TypeError";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart b/pkg/front_end/testcases/general_nnbd_opt_out/call.dart
deleted file mode 100644
index 6959028..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Callable {
-  call(x) {
-    return "string";
-  }
-}
-
-class CallableGetter {
-  get call => new Callable();
-}
-
-main() {
-  var closure = (x) => x;
-  var int1 = closure(1);
-  var int2 = closure.call(1);
-  var int3 = closure.call.call(1);
-  var int4 = closure.call.call.call(1);
-
-  var callable = new Callable();
-  var string1 = callable(1);
-  var string2 = callable.call(1);
-  var string3 = callable.call.call(1);
-  var string4 = callable.call.call.call(1);
-
-  var callableGetter = new CallableGetter();
-  var string5 = callableGetter(1);
-  var string6 = callableGetter.call(1);
-  var string7 = callableGetter.call.call(1);
-  var string8 = callableGetter.call.call.call(1);
-
-  var nothing1 = closure();
-  var nothing2 = closure.call();
-  var nothing3 = closure.call.call();
-  var nothing4 = closure.call.call.call();
-
-  var nothing5 = callable();
-  var nothing6 = callable.call();
-  var nothing7 = callable.call.call();
-  var nothing8 = callable.call.call.call();
-
-  var nothing9 = callableGetter();
-  var nothing10 = callableGetter.call();
-  var nothing11 = callableGetter.call.call();
-  var nothing12 = callableGetter.call.call.call();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.textual_outline.expect
deleted file mode 100644
index 1dcd347..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class Callable {
-  call(x) {}
-}
-
-class CallableGetter {
-  get call => new Callable();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.textual_outline_modelled.expect
deleted file mode 100644
index 1dcd347..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class Callable {
-  call(x) {}
-}
-
-class CallableGetter {
-  get call => new Callable();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.weak.expect
deleted file mode 100644
index f8ce601..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.weak.expect
+++ /dev/null
@@ -1,139 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:31:31: Error: Cannot invoke an instance of 'CallableGetter' because it declares 'call' to be something other than a method.
-//  - 'CallableGetter' is from 'pkg/front_end/testcases/general_nnbd_opt_out/call.dart'.
-// Try changing 'call' to a method or explicitly invoke 'call'.
-//   var string5 = callableGetter(1);
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:36:25: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing1 = closure();
-//                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:37:30: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing2 = closure.call();
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:38:35: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing3 = closure.call.call();
-//                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:39:40: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing4 = closure.call.call.call();
-//                                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:41:26: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing5 = callable();
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:42:31: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing6 = callable.call();
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:43:36: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing7 = callable.call.call();
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:44:41: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing8 = callable.call.call.call();
-//                                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/call.dart:46:32: Error: Cannot invoke an instance of 'CallableGetter' because it declares 'call' to be something other than a method.
-//  - 'CallableGetter' is from 'pkg/front_end/testcases/general_nnbd_opt_out/call.dart'.
-// Try changing 'call' to a method or explicitly invoke 'call'.
-//   var nothing9 = callableGetter();
-//                                ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Callable extends core::Object {
-  synthetic constructor •() → self::Callable*
-    : super core::Object::•()
-    ;
-  method call(dynamic x) → dynamic {
-    return "string";
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class CallableGetter extends core::Object {
-  synthetic constructor •() → self::CallableGetter*
-    : super core::Object::•()
-    ;
-  get call() → dynamic
-    return new self::Callable::•();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  (dynamic) →* dynamic closure = (dynamic x) → dynamic => x;
-  dynamic int1 = closure.call(1);
-  dynamic int2 = closure.call(1);
-  dynamic int3 = closure.call.call(1);
-  dynamic int4 = closure.call.call.call(1);
-  self::Callable* callable = new self::Callable::•();
-  dynamic string1 = callable.{self::Callable::call}(1);
-  dynamic string2 = callable.{self::Callable::call}(1);
-  dynamic string3 = callable.{self::Callable::call}.call(1);
-  dynamic string4 = callable.{self::Callable::call}.call.call(1);
-  self::CallableGetter* callableGetter = new self::CallableGetter::•();
-  dynamic string5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:31:31: Error: Cannot invoke an instance of 'CallableGetter' because it declares 'call' to be something other than a method.
- - 'CallableGetter' is from 'pkg/front_end/testcases/general_nnbd_opt_out/call.dart'.
-Try changing 'call' to a method or explicitly invoke 'call'.
-  var string5 = callableGetter(1);
-                              ^";
-  dynamic string6 = let final self::CallableGetter* #t1 = callableGetter in let final core::int* #t2 = 1 in #t1.{self::CallableGetter::call}.call(#t2);
-  dynamic string7 = callableGetter.{self::CallableGetter::call}.call(1);
-  dynamic string8 = callableGetter.{self::CallableGetter::call}.call.call(1);
-  invalid-type nothing1 = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:36:25: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing1 = closure();
-                        ^" in closure.call();
-  invalid-type nothing2 = let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:37:30: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing2 = closure.call();
-                             ^" in closure.call();
-  invalid-type nothing3 = let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:38:35: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing3 = closure.call.call();
-                                  ^" in closure.call.call();
-  invalid-type nothing4 = let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:39:40: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing4 = closure.call.call.call();
-                                       ^" in closure.call.call.call();
-  invalid-type nothing5 = let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:41:26: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing5 = callable();
-                         ^" in callable.{self::Callable::call}();
-  invalid-type nothing6 = let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:42:31: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing6 = callable.call();
-                              ^" in callable.{self::Callable::call}();
-  invalid-type nothing7 = let final<BottomType> #t9 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:43:36: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing7 = callable.call.call();
-                                   ^" in callable.{self::Callable::call}.call();
-  invalid-type nothing8 = let final<BottomType> #t10 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:44:41: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing8 = callable.call.call.call();
-                                        ^" in callable.{self::Callable::call}.call.call();
-  dynamic nothing9 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/call.dart:46:32: Error: Cannot invoke an instance of 'CallableGetter' because it declares 'call' to be something other than a method.
- - 'CallableGetter' is from 'pkg/front_end/testcases/general_nnbd_opt_out/call.dart'.
-Try changing 'call' to a method or explicitly invoke 'call'.
-  var nothing9 = callableGetter();
-                               ^";
-  dynamic nothing10 = callableGetter.{self::CallableGetter::call}.call();
-  dynamic nothing11 = callableGetter.{self::CallableGetter::call}.call();
-  dynamic nothing12 = callableGetter.{self::CallableGetter::call}.call.call();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.weak.outline.expect
deleted file mode 100644
index 8974e59..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/call.dart.weak.outline.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Callable extends core::Object {
-  synthetic constructor •() → self::Callable*
-    ;
-  method call(dynamic x) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class CallableGetter extends core::Object {
-  synthetic constructor •() → self::CallableGetter*
-    ;
-  get call() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart b/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart
deleted file mode 100644
index be9510a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// 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.6
-
-class Fisk {
-  Fisk(int x) {}
-
-  Fisk.named(int x) {}
-
-  void method(int x) {}
-
-  static void staticMethod(int x) {}
-}
-
-test() {
-  new Fisk();
-  new Fisk.named();
-  Fisk();
-  Fisk.named();
-  Fisk.staticMethod();
-  (null as Fisk).method();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.textual_outline.expect
deleted file mode 100644
index 5dd8173..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class Fisk {
-  Fisk(int x) {}
-  Fisk.named(int x) {}
-  void method(int x) {}
-  static void staticMethod(int x) {}
-}
-
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.textual_outline_modelled.expect
deleted file mode 100644
index 3887387..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class Fisk {
-  Fisk(int x) {}
-  Fisk.named(int x) {}
-  static void staticMethod(int x) {}
-  void method(int x) {}
-}
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.weak.expect
deleted file mode 100644
index cc80c15..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.weak.expect
+++ /dev/null
@@ -1,85 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:18:11: Error: Too few positional arguments: 1 required, 0 given.
-//   new Fisk();
-//           ^
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:8:3: Context: Found this candidate, but the arguments don't match.
-//   Fisk(int x) {}
-//   ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:19:17: Error: Too few positional arguments: 1 required, 0 given.
-//   new Fisk.named();
-//                 ^
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:10:3: Context: Found this candidate, but the arguments don't match.
-//   Fisk.named(int x) {}
-//   ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:20:7: Error: Too few positional arguments: 1 required, 0 given.
-//   Fisk();
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:8:3: Context: Found this candidate, but the arguments don't match.
-//   Fisk(int x) {}
-//   ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:21:13: Error: Too few positional arguments: 1 required, 0 given.
-//   Fisk.named();
-//             ^
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:10:3: Context: Found this candidate, but the arguments don't match.
-//   Fisk.named(int x) {}
-//   ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:22:20: Error: Too few positional arguments: 1 required, 0 given.
-//   Fisk.staticMethod();
-//                    ^
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:14:15: Context: Found this candidate, but the arguments don't match.
-//   static void staticMethod(int x) {}
-//               ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:23:24: Error: Too few positional arguments: 1 required, 0 given.
-//   (null as Fisk).method();
-//                        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Fisk extends core::Object {
-  constructor •(core::int* x) → self::Fisk*
-    : super core::Object::•() {}
-  constructor named(core::int* x) → self::Fisk*
-    : super core::Object::•() {}
-  method method(core::int* x) → void {}
-  static method staticMethod(core::int* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:18:11: Error: Too few positional arguments: 1 required, 0 given.
-  new Fisk();
-          ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:19:17: Error: Too few positional arguments: 1 required, 0 given.
-  new Fisk.named();
-                ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:20:7: Error: Too few positional arguments: 1 required, 0 given.
-  Fisk();
-      ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:21:13: Error: Too few positional arguments: 1 required, 0 given.
-  Fisk.named();
-            ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:22:20: Error: Too few positional arguments: 1 required, 0 given.
-  Fisk.staticMethod();
-                   ^";
-  let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart:23:24: Error: Too few positional arguments: 1 required, 0 given.
-  (null as Fisk).method();
-                       ^" in (null as self::Fisk*).{self::Fisk::method}();
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.weak.outline.expect
deleted file mode 100644
index 643d69c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/candidate_found.dart.weak.outline.expect
+++ /dev/null
@@ -1,28 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Fisk extends core::Object {
-  constructor •(core::int* x) → self::Fisk*
-    ;
-  constructor named(core::int* x) → self::Fisk*
-    ;
-  method method(core::int* x) → void
-    ;
-  static method staticMethod(core::int* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart b/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart
deleted file mode 100644
index 6720d29..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() {
-  var list = [1]
-    ..add(2)
-    ..add(3)
-    ..addAll([4, 5]);
-  print(list);
-
-  list
-    ..add(2)
-    ..length
-    ..length = 0;
-  print(list);
-
-  list
-    ..add(2)
-    ..[0]
-    ..[0] = 87;
-
-  print(list);
-
-  list = [
-    [1]
-  ]
-    ..first.last.toString()
-    ..first[0].toString()
-    ..[0].last.toString();
-
-  print(list);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.expect
deleted file mode 100644
index 8361133..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.expect
+++ /dev/null
@@ -1,65 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:28:5: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
-//  - 'List' is from 'dart:core'.
-//     [1]
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:30:13: Error: The getter 'last' isn't defined for the class 'int'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-//     ..first.last.toString()
-//             ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:31:12: Error: The operator '[]' isn't defined for the class 'int'.
-// Try correcting the operator to an existing operator, or defining a '[]' operator.
-//     ..first[0].toString()
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:32:11: Error: The getter 'last' isn't defined for the class 'int'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-//     ..[0].last.toString();
-//           ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::List<core::int*>* list = let final core::List<core::int*>* #t1 = <core::int*>[1] in block {
-    #t1.{core::List::add}(2);
-    #t1.{core::List::add}(3);
-    #t1.{core::List::addAll}(<core::int*>[4, 5]);
-  } =>#t1;
-  core::print(list);
-  let final core::List<core::int*>* #t2 = list in block {
-    #t2.{core::List::add}(2);
-    #t2.{core::List::length};
-    #t2.{core::List::length} = 0;
-  } =>#t2;
-  core::print(list);
-  let final core::List<core::int*>* #t3 = list in block {
-    #t3.{core::List::add}(2);
-    #t3.{core::List::[]}(0);
-    #t3.{core::List::[]=}(0, 87);
-  } =>#t3;
-  core::print(list);
-  list = let final core::List<core::int*>* #t4 = <core::int*>[let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:28:5: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
- - 'List' is from 'dart:core'.
-    [1]
-    ^" in <core::int*>[1] as{TypeError} core::int*] in block {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:30:13: Error: The getter 'last' isn't defined for the class 'int'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-    ..first.last.toString()
-            ^^^^".{core::Object::toString}();
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:31:12: Error: The operator '[]' isn't defined for the class 'int'.
-Try correcting the operator to an existing operator, or defining a '[]' operator.
-    ..first[0].toString()
-           ^".{core::Object::toString}();
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:32:11: Error: The getter 'last' isn't defined for the class 'int'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-    ..[0].last.toString();
-          ^^^^".{core::Object::toString}();
-  } =>#t4;
-  core::print(list);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.transformed.expect
deleted file mode 100644
index a102674..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart.weak.transformed.expect
+++ /dev/null
@@ -1,65 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:28:5: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
-//  - 'List' is from 'dart:core'.
-//     [1]
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:30:13: Error: The getter 'last' isn't defined for the class 'int'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-//     ..first.last.toString()
-//             ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:31:12: Error: The operator '[]' isn't defined for the class 'int'.
-// Try correcting the operator to an existing operator, or defining a '[]' operator.
-//     ..first[0].toString()
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:32:11: Error: The getter 'last' isn't defined for the class 'int'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-//     ..[0].last.toString();
-//           ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::List<core::int*>* list = let final core::List<core::int*>* #t1 = core::_GrowableList::_literal1<core::int*>(1) in block {
-    #t1.{core::List::add}(2);
-    #t1.{core::List::add}(3);
-    #t1.{core::List::addAll}(core::_GrowableList::_literal2<core::int*>(4, 5));
-  } =>#t1;
-  core::print(list);
-  let final core::List<core::int*>* #t2 = list in block {
-    #t2.{core::List::add}(2);
-    #t2.{core::List::length};
-    #t2.{core::List::length} = 0;
-  } =>#t2;
-  core::print(list);
-  let final core::List<core::int*>* #t3 = list in block {
-    #t3.{core::List::add}(2);
-    #t3.{core::List::[]}(0);
-    #t3.{core::List::[]=}(0, 87);
-  } =>#t3;
-  core::print(list);
-  list = let final core::List<core::int*>* #t4 = core::_GrowableList::_literal1<core::int*>(let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:28:5: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
- - 'List' is from 'dart:core'.
-    [1]
-    ^" in core::_GrowableList::_literal1<core::int*>(1) as{TypeError} core::int*) in block {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:30:13: Error: The getter 'last' isn't defined for the class 'int'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-    ..first.last.toString()
-            ^^^^".{core::Object::toString}();
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:31:12: Error: The operator '[]' isn't defined for the class 'int'.
-Try correcting the operator to an existing operator, or defining a '[]' operator.
-    ..first[0].toString()
-           ^".{core::Object::toString}();
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/cascade.dart:32:11: Error: The getter 'last' isn't defined for the class 'int'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'last'.
-    ..[0].last.toString();
-          ^^^^".{core::Object::toString}();
-  } =>#t4;
-  core::print(list);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart b/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart
deleted file mode 100644
index be0b4a2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() {
-  print("" as String);
-  print(1 as int);
-  print(1.0 as double);
-
-  print("" is String);
-  print("" is int);
-  print("" is double);
-
-  print(1 is String);
-  print(1 is int);
-  print(1 is double);
-
-  print(1.0 is String);
-  print(1.0 is int);
-  print(1.0 is double);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.expect
deleted file mode 100644
index bfac5fe..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("" as core::String*);
-  core::print(1 as core::int*);
-  core::print(1.0 as core::double*);
-  core::print("" is core::String*);
-  core::print("" is core::int*);
-  core::print("" is core::double*);
-  core::print(1 is core::String*);
-  core::print(1 is core::int*);
-  core::print(1 is core::double*);
-  core::print(1.0 is core::String*);
-  core::print(1.0 is core::int*);
-  core::print(1.0 is core::double*);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.transformed.expect
deleted file mode 100644
index 28908ee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/casts.dart.weak.transformed.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("");
-  core::print(1);
-  core::print(1.0);
-  core::print("" is core::String*);
-  core::print("" is core::int*);
-  core::print("" is core::double*);
-  core::print(1 is core::String*);
-  core::print(1 is core::int*);
-  core::print(1 is core::double*);
-  core::print(1.0 is core::String*);
-  core::print(1.0 is core::int*);
-  core::print(1.0 is core::double*);
-}
-
-
-Extra constant evaluation status:
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:12:12 -> BoolConstant(true)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:13:12 -> BoolConstant(false)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:14:12 -> BoolConstant(false)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:16:11 -> BoolConstant(false)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:17:11 -> BoolConstant(true)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:18:11 -> BoolConstant(false)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:20:13 -> BoolConstant(false)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:21:13 -> BoolConstant(false)
-Evaluated: IsExpression @ org-dartlang-testcase:///casts.dart:22:13 -> BoolConstant(true)
-Extra constant evaluation: evaluated: 21, effectively constant: 9
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart
deleted file mode 100644
index 72b6592..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {
-  print(new lib.C());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.textual_outline.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.textual_outline_modelled.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.expect
deleted file mode 100644
index ee44558..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final dynamic #t1 = CheckLibraryIsLoaded(lib) in new def::C::•());
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.transformed.expect
deleted file mode 100644
index 57b9c6d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_allocation.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in new def::C::•());
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart
deleted file mode 100644
index 41f5897..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test(x) {
-  x as lib.C;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.textual_outline.expect
deleted file mode 100644
index f56ea38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.textual_outline_modelled.expect
deleted file mode 100644
index f56ea38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.expect
deleted file mode 100644
index e575f74..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart:11:8: Error: The type 'C' is deferred loaded via prefix 'lib' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'lib' or use a supertype of 'C' that isn't deferred.
-//   x as lib.C;
-//        ^^^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test(dynamic x) → dynamic {
-  x as invalid-type;
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.outline.expect
deleted file mode 100644
index 2235d55..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test(dynamic x) → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.transformed.expect
deleted file mode 100644
index e575f74..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart.weak.transformed.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_as_check.dart:11:8: Error: The type 'C' is deferred loaded via prefix 'lib' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'lib' or use a supertype of 'C' that isn't deferred.
-//   x as lib.C;
-//        ^^^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test(dynamic x) → dynamic {
-  x as invalid-type;
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart
deleted file mode 100644
index a163d5c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {
-  lib.x = m2();
-  lib.m(m2());
-}
-
-m2() => 1;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.textual_outline.expect
deleted file mode 100644
index e2d52fb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
-m2() => 1;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.textual_outline_modelled.expect
deleted file mode 100644
index 79e9487..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-m2() => 1;
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.expect
deleted file mode 100644
index a15d266..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "deferred_lib.dart" as def;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  let final dynamic #t1 = CheckLibraryIsLoaded(lib) in def::x = self::m2() as{TypeError,ForDynamic} core::int*;
-  let final dynamic #t2 = CheckLibraryIsLoaded(lib) in def::m(self::m2());
-}
-static method m2() → dynamic
-  return 1;
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.outline.expect
deleted file mode 100644
index fcde1e9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.outline.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-static method m2() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.transformed.expect
deleted file mode 100644
index 4226f91..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args.dart.weak.transformed.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in def::x = self::m2() as{TypeError,ForDynamic} core::int*;
-  let final core::Object* #t2 = CheckLibraryIsLoaded(lib) in def::m(self::m2());
-}
-static method m2() → dynamic
-  return 1;
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart
deleted file mode 100644
index 8bd2afd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-
-test() async {
-  // The current evaluation order will trigger the check of lib.m before the
-  // loadLibrary call.
-  lib.m(await lib.loadLibrary());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.textual_outline.expect
deleted file mode 100644
index d3c388c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.textual_outline_modelled.expect
deleted file mode 100644
index d3c388c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() async {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.expect
deleted file mode 100644
index 12e71e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-library;
-import self as self;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic async {
-  let final dynamic #t1 = CheckLibraryIsLoaded(lib) in def::m(await LoadLibrary(lib));
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.outline.expect
deleted file mode 100644
index 21267fc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic async 
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.transformed.expect
deleted file mode 100644
index fd3b4a6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_args2.dart.weak.transformed.expect
+++ /dev/null
@@ -1,64 +0,0 @@
-library;
-import self as self;
-import "dart:async" as asy;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        final core::Object* #t1 = CheckLibraryIsLoaded(lib);
-        [yield] let dynamic #t2 = asy::_awaitHelper(LoadLibrary(lib), :async_op_then, :async_op_error, :async_op) in null;
-        def::m(:result);
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart
deleted file mode 100644
index ae3bce9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-
-test() {
-  lib.m(3);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.textual_outline.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.textual_outline_modelled.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.expect
deleted file mode 100644
index 1d2d900..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-library;
-import self as self;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  let final dynamic #t1 = CheckLibraryIsLoaded(lib) in def::m(3);
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.transformed.expect
deleted file mode 100644
index 5786537..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_call.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in def::m(3);
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart
deleted file mode 100644
index 56c4937..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {
-  lib.x = 2;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.textual_outline.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.textual_outline_modelled.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.expect
deleted file mode 100644
index 549e5e0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-library;
-import self as self;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  let final dynamic #t1 = CheckLibraryIsLoaded(lib) in def::x = 2;
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.transformed.expect
deleted file mode 100644
index 9426037..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_before_write.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in def::x = 2;
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart
deleted file mode 100644
index 7df187a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test(x) {
-  print(x is lib.C);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.textual_outline.expect
deleted file mode 100644
index f56ea38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.textual_outline_modelled.expect
deleted file mode 100644
index f56ea38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.expect
deleted file mode 100644
index 131bf15..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart:11:14: Error: The type 'C' is deferred loaded via prefix 'lib' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'lib' or use a supertype of 'C' that isn't deferred.
-//   print(x is lib.C);
-//              ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test(dynamic x) → dynamic {
-  core::print(x is invalid-type);
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.outline.expect
deleted file mode 100644
index 2235d55..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test(dynamic x) → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.transformed.expect
deleted file mode 100644
index 131bf15..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_is_check.dart:11:14: Error: The type 'C' is deferred loaded via prefix 'lib' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'lib' or use a supertype of 'C' that isn't deferred.
-//   print(x is lib.C);
-//              ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test(dynamic x) → dynamic {
-  core::print(x is invalid-type);
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart
deleted file mode 100644
index f287e30..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {
-  print(lib.x + 1);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.textual_outline.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.textual_outline_modelled.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.expect
deleted file mode 100644
index e27d859b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print((let final dynamic #t1 = CheckLibraryIsLoaded(lib) in def::x).{core::num::+}(1));
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.transformed.expect
deleted file mode 100644
index bb01419..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print((let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in def::x).{core::num::+}(1));
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart
deleted file mode 100644
index 66c34a1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {
-  print(lib.C.y);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.textual_outline.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.textual_outline_modelled.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.expect
deleted file mode 100644
index 7ebd7ea..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final dynamic #t1 = CheckLibraryIsLoaded(lib) in def::C::y);
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.transformed.expect
deleted file mode 100644
index a347b0a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_static_field.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in def::C::y);
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart
deleted file mode 100644
index 2758a99..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {
-  print(lib.C);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.textual_outline.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.textual_outline_modelled.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.expect
deleted file mode 100644
index efb9d56..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final dynamic #t1 = CheckLibraryIsLoaded(lib) in #C1);
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
-
-constants  {
-  #C1 = TypeLiteralConstant(self2::C*)
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.transformed.expect
deleted file mode 100644
index 2813c9c5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_read_type.dart.weak.transformed.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in #C1);
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
-
-constants  {
-  #C1 = TypeLiteralConstant(self2::C*)
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart
deleted file mode 100644
index 51e13e8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {
-  print(lib.C.m());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.textual_outline.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.textual_outline_modelled.expect
deleted file mode 100644
index e33a311..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.expect
deleted file mode 100644
index 2fb6711..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final dynamic #t1 = CheckLibraryIsLoaded(lib) in def::C::m());
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.transformed.expect
deleted file mode 100644
index 5674209..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_static_method_call.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic {}
-static method test() → dynamic {
-  core::print(let final core::Object* #t1 = CheckLibraryIsLoaded(lib) in def::C::m());
-}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart
deleted file mode 100644
index a9b2f44..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-import 'deferred_lib.dart' deferred as lib;
-
-main() => test();
-test() {
-  lib.C x = null;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.textual_outline.expect
deleted file mode 100644
index b4c7b69..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() => test();
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.textual_outline_modelled.expect
deleted file mode 100644
index b4c7b69..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as lib;
-
-main() => test();
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.expect
deleted file mode 100644
index d11845c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart:11:3: Error: The type 'C' is deferred loaded via prefix 'lib' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'lib' or use a supertype of 'C' that isn't deferred.
-//   lib.C x = null;
-//   ^^^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  return self::test();
-static method test() → dynamic {
-  invalid-type x = null;
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.outline.expect
deleted file mode 100644
index 5a345b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  ;
-static method test() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → self2::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.transformed.expect
deleted file mode 100644
index d11845c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/check_deferred_type_declaration.dart:11:3: Error: The type 'C' is deferred loaded via prefix 'lib' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'lib' or use a supertype of 'C' that isn't deferred.
-//   lib.C x = null;
-//   ^^^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
-
-static method main() → dynamic
-  return self::test();
-static method test() → dynamic {
-  invalid-type x = null;
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart b/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart
deleted file mode 100644
index d0c3b97..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test is intended to trigger a circular top-level type-inference
-// dependency involving an initializing formal where the circularity is detected
-// when inferring the type of the constructor.
-//
-// The compiler should generate an error message and it should be properly
-// formatted including offset and length of the constructor.
-var x = new C._circular(null);
-
-class C {
-  var f = new C._circular(null);
-  C._circular(this.f);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.textual_outline.expect
deleted file mode 100644
index 8152764..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-var x = new C._circular(null);
-
-class C {
-  var f = new C._circular(null);
-  C._circular(this.f);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.textual_outline_modelled.expect
deleted file mode 100644
index e1a372d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class C {
-  C._circular(this.f);
-  var f = new C._circular(null);
-}
-
-main() {}
-var x = new C._circular(null);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.expect
deleted file mode 100644
index b2a63f8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart:17:3: Error: Can't infer the type of 'C._circular': circularity found during type inference.
-// Specify the type explicitly.
-//   C._circular(this.f);
-//   ^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field self::C* f = new self::C::_circular(null);
-  constructor _circular(self::C* f) → self::C*
-    : self::C::f = f, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::C* x = new self::C::_circular(null);
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.outline.expect
deleted file mode 100644
index 1bcbae7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.outline.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart:17:3: Error: Can't infer the type of 'C._circular': circularity found during type inference.
-// Specify the type explicitly.
-//   C._circular(this.f);
-//   ^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field self::C* f;
-  constructor _circular(self::C* f) → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::C* x;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.transformed.expect
deleted file mode 100644
index b2a63f8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart.weak.transformed.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/circularity-via-initializing-formal.dart:17:3: Error: Can't infer the type of 'C._circular': circularity found during type inference.
-// Specify the type explicitly.
-//   C._circular(this.f);
-//   ^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field self::C* f = new self::C::_circular(null);
-  constructor _circular(self::C* f) → self::C*
-    : self::C::f = f, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::C* x = new self::C::_circular(null);
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart b/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart
deleted file mode 100644
index 9076c31..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class A {
-  final int x;
-  final int y;
-  A(this.y) : x = 42;
-  method() {
-    print("A.method x: $x y: $y");
-    print(this);
-    print(this.runtimeType);
-  }
-}
-
-class B extends A {
-  B(x) : super(x);
-  method() {
-    print("B.method x: $x y: $y");
-    super.method();
-  }
-}
-
-main() {
-  A a = new A(87);
-  B b = new B(117);
-  a.method();
-  b.method();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.textual_outline.expect
deleted file mode 100644
index f95711e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class A {
-  final int x;
-  final int y;
-  A(this.y) : x = 42;
-  method() {}
-}
-
-class B extends A {
-  B(x) : super(x);
-  method() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9f02021..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class A {
-  A(this.y) : x = 42;
-  final int x;
-  final int y;
-  method() {}
-}
-
-class B extends A {
-  B(x) : super(x);
-  method() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.expect
deleted file mode 100644
index fd0d329..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  final field core::int* x;
-  final field core::int* y;
-  constructor •(core::int* y) → self::A*
-    : self::A::y = y, self::A::x = 42, super core::Object::•()
-    ;
-  method method() → dynamic {
-    core::print("A.method x: ${this.{self::A::x}} y: ${this.{self::A::y}}");
-    core::print(this);
-    core::print(this.{self::A::runtimeType});
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  constructor •(dynamic x) → self::B*
-    : super self::A::•(x as{TypeError,ForDynamic} core::int*)
-    ;
-  method method() → dynamic {
-    core::print("B.method x: ${this.{self::A::x}} y: ${this.{self::A::y}}");
-    super.{self::A::method}();
-  }
-}
-static method main() → dynamic {
-  self::A* a = new self::A::•(87);
-  self::B* b = new self::B::•(117);
-  a.{self::A::method}();
-  b.{self::B::method}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.outline.expect
deleted file mode 100644
index 6973fa9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.outline.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  final field core::int* x;
-  final field core::int* y;
-  constructor •(core::int* y) → self::A*
-    ;
-  method method() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  constructor •(dynamic x) → self::B*
-    ;
-  method method() → dynamic
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.transformed.expect
deleted file mode 100644
index fd0d329..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/classes.dart.weak.transformed.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  final field core::int* x;
-  final field core::int* y;
-  constructor •(core::int* y) → self::A*
-    : self::A::y = y, self::A::x = 42, super core::Object::•()
-    ;
-  method method() → dynamic {
-    core::print("A.method x: ${this.{self::A::x}} y: ${this.{self::A::y}}");
-    core::print(this);
-    core::print(this.{self::A::runtimeType});
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  constructor •(dynamic x) → self::B*
-    : super self::A::•(x as{TypeError,ForDynamic} core::int*)
-    ;
-  method method() → dynamic {
-    core::print("B.method x: ${this.{self::A::x}} y: ${this.{self::A::y}}");
-    super.{self::A::method}();
-  }
-}
-static method main() → dynamic {
-  self::A* a = new self::A::•(87);
-  self::B* b = new self::B::•(117);
-  a.{self::A::method}();
-  b.{self::B::method}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart b/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart
deleted file mode 100644
index c0cea2a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// In the classes below the function type is cloned when the anonymous mixin
-// application is desugared into a named mixin application, in order to re-bind
-// the type builders for its subterms.
-
-// The case 'm1' covers function types with some missing parts.
-
-class Am1<X, Y> {}
-
-class Bm1<Z> extends Object with Am1<Function(int), Z> {}
-
-class Cm1<Z> extends Object with Am1<Function(int x), Z> {}
-
-class Dm1<Z> extends Object with Am1<int Function(), Z> {}
-
-class Em1<Z> extends Object with Am1<Function(), Z> {}
-
-// Compile-time error: Named parameters should have names.
-class Fm1<Z> extends Object with Am1<Function({int}), Z> {}
-
-class Gm1<Z> extends Object with Am1<Function({int x}), Z> {}
-
-class Hm1<Z> extends Object with Am1<Function([int]), Z> {}
-
-class Im1<Z> extends Object with Am1<Function([int x]), Z> {}
-
-class Jm1<Z> extends Object with Am1<Function, Z> {}
-
-class Km1<Z> extends Object with Am1<Function(Function Function), Z> {}
-
-class Lm1<Z> extends Object
-    with Am1<Function(Function Function() Function) Function(), Z> {}
-
-class Mm1<Z> = Object with Am1<Function(int), Z>;
-
-class Nm1<Z> = Object with Am1<Function(int x), Z>;
-
-class Om1<Z> = Object with Am1<int Function(), Z>;
-
-class Pm1<Z> = Object with Am1<Function(), Z>;
-
-// Compile-time error: Named parameters should have names.
-class Qm1<Z> = Object with Am1<Function({int}), Z>;
-
-class Rm1<Z> = Object with Am1<Function({int x}), Z>;
-
-class Sm1<Z> = Object with Am1<Function([int]), Z>;
-
-class Tm1<Z> = Object with Am1<Function([int x]), Z>;
-
-class Um1<Z> = Object with Am1<Function, Z>;
-
-class Vm1<Z> = Object with Am1<Function(Function Function), Z>;
-
-class Wm1<Z> = Object
-    with Am1<Function(Function Function() Function) Function(), Z>;
-
-// The case 'm2' covers function types with some missing parts that should be
-// checked against a bound.
-
-class Am2<X extends Function(), Y> {}
-
-// Compile-time error: type argument is not a subtype.
-class Bm2<Z> extends Object with Am2<Function(int), Z> {}
-
-// Compile-time error: type argument is not a subtype.
-class Cm2<Z> extends Object with Am2<Function(int x), Z> {}
-
-class Dm2<Z> extends Object with Am2<int Function(), Z> {}
-
-class Em2<Z> extends Object with Am2<Function(), Z> {}
-
-// Compile-time error: Named parameters should have names.
-class Fm2<Z> extends Object with Am2<Function({int}), Z> {}
-
-class Gm2<Z> extends Object with Am2<Function({int x}), Z> {}
-
-class Hm2<Z> extends Object with Am2<Function([int]), Z> {}
-
-class Im2<Z> extends Object with Am2<Function([int x]), Z> {}
-
-// Compile-time error: type argument is not a subtype.
-class Jm2<Z> extends Object with Am2<Function, Z> {}
-
-// Compile-time error: type argument is not a subtype.
-class Km2<Z> extends Object with Am2<Function(Function Function), Z> {}
-
-class Lm2<Z> extends Object
-    with Am2<Function(Function Function() Function) Function(), Z> {}
-
-// Compile-time error: type argument is not a subtype.
-class Mm2<Z> = Object with Am2<Function(int), Z>;
-
-// Compile-time error: type argument is not a subtype.
-class Nm2<Z> = Object with Am2<Function(int x), Z>;
-
-class Om2<Z> = Object with Am2<int Function(), Z>;
-
-class Pm2<Z> = Object with Am2<Function(), Z>;
-
-// Compile-time error: Named parameters should have names.
-class Qm2<Z> = Object with Am2<Function({int}), Z>;
-
-class Rm2<Z> = Object with Am2<Function({int x}), Z>;
-
-class Sm2<Z> = Object with Am2<Function([int]), Z>;
-
-class Tm2<Z> = Object with Am2<Function([int x]), Z>;
-
-// Compile-time error: type argument is not a subtype.
-class Um2<Z> = Object with Am2<Function, Z>;
-
-// Compile-time error: type argument is not a subtype.
-class Vm2<Z> = Object with Am2<Function(Function Function), Z>;
-
-class Wm2<Z> = Object
-    with Am2<Function(Function Function() Function) Function(), Z>;
-
-// The case 'm3' covers function types with some missing parts defined via
-// typedefs.
-
-typedef TdB = Function(int);
-
-typedef TdC = Function(int x);
-
-typedef TdD = int Function();
-
-typedef TdE = Function();
-
-// Compile-time error: Named parameters should have names.
-typedef TdF = Function({int});
-
-typedef TdG = Function({int x});
-
-typedef TdH = Function([int]);
-
-typedef TdI = Function([int x]);
-
-typedef TdJ = Function(Function Function);
-
-typedef TdK = Function(Function Function() Function) Function();
-
-class Am3<L, Y> {}
-
-class Bm3<Z> extends Object with Am3<TdB, Z> {}
-
-class Cm3<Z> extends Object with Am3<TdC, Z> {}
-
-class Dm3<Z> extends Object with Am3<TdD, Z> {}
-
-class Em3<Z> extends Object with Am3<TdE, Z> {}
-
-class Fm3<Z> extends Object with Am3<TdF, Z> {}
-
-class Gm3<Z> extends Object with Am3<TdG, Z> {}
-
-class Hm3<Z> extends Object with Am3<TdH, Z> {}
-
-class Im3<Z> extends Object with Am3<TdI, Z> {}
-
-class Jm3<Z> extends Object with Am3<TdJ, Z> {}
-
-class Km3<Z> extends Object with Am3<TdK, Z> {}
-
-// In case cloning will not be used in the examples above, here are some
-// examples that should utilize cloning of type builders and that should cover
-// some of the cases above.  Here, type variables of the class are cloned for
-// its factories, including the bounds that are type builders.
-
-class Af1<X extends Function(int)> {
-  factory Af1.foo() => null;
-}
-
-class Bf1<X extends Function(int x)> {
-  factory Bf1.foo() => null;
-}
-
-class Cf1<X extends int Function()> {
-  factory Cf1.foo() => null;
-}
-
-class Df1<X extends Function()> {
-  factory Df1.foo() => null;
-}
-
-// Compile-time error: Named parameters should have names.
-class Ef1<X extends Function({int})> {
-  factory Ef1.foo() => null;
-}
-
-class Ff1<X extends Function({int x})> {
-  factory Ff1.foo() => null;
-}
-
-class Gf1<X extends Function([int])> {
-  factory Gf1.foo() => null;
-}
-
-class Hf1<X extends Function([int x])> {
-  factory Hf1.foo() => null;
-}
-
-class If1<X extends Function> {
-  factory If1.foo() => null;
-}
-
-class Jf1<X extends Function(Function Function)> {
-  factory Jf1.foo() => null;
-}
-
-class Kf1<X extends Function(Function Function() Function) Function()> {
-  factory Kf1.foo() => null;
-}
-
-class Bf2<X extends TdB> {
-  factory Bf2.foo() => null;
-}
-
-class Cf2<X extends TdC> {
-  factory Cf2.foo() => null;
-}
-
-class Df2<X extends TdD> {
-  factory Df2.foo() => null;
-}
-
-class Ef2<X extends TdE> {
-  factory Ef2.foo() => null;
-}
-
-class Ff2<X extends TdF> {
-  factory Ff2.foo() => null;
-}
-
-class Gf2<X extends TdG> {
-  factory Gf2.foo() => null;
-}
-
-class Hf2<X extends TdH> {
-  factory Hf2.foo() => null;
-}
-
-class If2<X extends TdI> {
-  factory If2.foo() => null;
-}
-
-class Jf2<X extends TdJ> {
-  factory Jf2.foo() => null;
-}
-
-class Kf2<X extends TdK> {
-  factory Kf2.foo() => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.textual_outline.expect
deleted file mode 100644
index df07151..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.textual_outline.expect
+++ /dev/null
@@ -1,132 +0,0 @@
-// @dart = 2.6
-class Am1<X, Y> {}
-class Bm1<Z> extends Object with Am1<Function(int), Z> {}
-class Cm1<Z> extends Object with Am1<Function(int x), Z> {}
-class Dm1<Z> extends Object with Am1<int Function(), Z> {}
-class Em1<Z> extends Object with Am1<Function(), Z> {}
-class Fm1<Z> extends Object with Am1<Function({int}), Z> {}
-class Gm1<Z> extends Object with Am1<Function({int x}), Z> {}
-class Hm1<Z> extends Object with Am1<Function([int]), Z> {}
-class Im1<Z> extends Object with Am1<Function([int x]), Z> {}
-class Jm1<Z> extends Object with Am1<Function, Z> {}
-class Km1<Z> extends Object with Am1<Function(Function Function), Z> {}
-class Lm1<Z> extends Object with Am1<Function(Function Function() Function) Function(), Z> {}
-class Mm1<Z> = Object with Am1<Function(int), Z>;
-class Nm1<Z> = Object with Am1<Function(int x), Z>;
-class Om1<Z> = Object with Am1<int Function(), Z>;
-class Pm1<Z> = Object with Am1<Function(), Z>;
-class Qm1<Z> = Object with Am1<Function({int}), Z>;
-class Rm1<Z> = Object with Am1<Function({int x}), Z>;
-class Sm1<Z> = Object with Am1<Function([int]), Z>;
-class Tm1<Z> = Object with Am1<Function([int x]), Z>;
-class Um1<Z> = Object with Am1<Function, Z>;
-class Vm1<Z> = Object with Am1<Function(Function Function), Z>;
-class Wm1<Z> = Object with Am1<Function(Function Function() Function) Function(), Z>;
-class Am2<X extends Function(), Y> {}
-class Bm2<Z> extends Object with Am2<Function(int), Z> {}
-class Cm2<Z> extends Object with Am2<Function(int x), Z> {}
-class Dm2<Z> extends Object with Am2<int Function(), Z> {}
-class Em2<Z> extends Object with Am2<Function(), Z> {}
-class Fm2<Z> extends Object with Am2<Function({int}), Z> {}
-class Gm2<Z> extends Object with Am2<Function({int x}), Z> {}
-class Hm2<Z> extends Object with Am2<Function([int]), Z> {}
-class Im2<Z> extends Object with Am2<Function([int x]), Z> {}
-class Jm2<Z> extends Object with Am2<Function, Z> {}
-class Km2<Z> extends Object with Am2<Function(Function Function), Z> {}
-class Lm2<Z> extends Object with Am2<Function(Function Function() Function) Function(), Z> {}
-class Mm2<Z> = Object with Am2<Function(int), Z>;
-class Nm2<Z> = Object with Am2<Function(int x), Z>;
-class Om2<Z> = Object with Am2<int Function(), Z>;
-class Pm2<Z> = Object with Am2<Function(), Z>;
-class Qm2<Z> = Object with Am2<Function({int}), Z>;
-class Rm2<Z> = Object with Am2<Function({int x}), Z>;
-class Sm2<Z> = Object with Am2<Function([int]), Z>;
-class Tm2<Z> = Object with Am2<Function([int x]), Z>;
-class Um2<Z> = Object with Am2<Function, Z>;
-class Vm2<Z> = Object with Am2<Function(Function Function), Z>;
-class Wm2<Z> = Object with Am2<Function(Function Function() Function) Function(), Z>;
-typedef TdB = Function(int);
-typedef TdC = Function(int x);
-typedef TdD = int Function();
-typedef TdE = Function();
-typedef TdF = Function({int});
-typedef TdG = Function({int x});
-typedef TdH = Function([int]);
-typedef TdI = Function([int x]);
-typedef TdJ = Function(Function Function);
-typedef TdK = Function(Function Function() Function) Function();
-class Am3<L, Y> {}
-class Bm3<Z> extends Object with Am3<TdB, Z> {}
-class Cm3<Z> extends Object with Am3<TdC, Z> {}
-class Dm3<Z> extends Object with Am3<TdD, Z> {}
-class Em3<Z> extends Object with Am3<TdE, Z> {}
-class Fm3<Z> extends Object with Am3<TdF, Z> {}
-class Gm3<Z> extends Object with Am3<TdG, Z> {}
-class Hm3<Z> extends Object with Am3<TdH, Z> {}
-class Im3<Z> extends Object with Am3<TdI, Z> {}
-class Jm3<Z> extends Object with Am3<TdJ, Z> {}
-class Km3<Z> extends Object with Am3<TdK, Z> {}
-class Af1<X extends Function(int)> {
-  factory Af1.foo() => null;
-}
-class Bf1<X extends Function(int x)> {
-  factory Bf1.foo() => null;
-}
-class Cf1<X extends int Function()> {
-  factory Cf1.foo() => null;
-}
-class Df1<X extends Function()> {
-  factory Df1.foo() => null;
-}
-class Ef1<X extends Function({int})> {
-  factory Ef1.foo() => null;
-}
-class Ff1<X extends Function({int x})> {
-  factory Ff1.foo() => null;
-}
-class Gf1<X extends Function([int])> {
-  factory Gf1.foo() => null;
-}
-class Hf1<X extends Function([int x])> {
-  factory Hf1.foo() => null;
-}
-class If1<X extends Function> {
-  factory If1.foo() => null;
-}
-class Jf1<X extends Function(Function Function)> {
-  factory Jf1.foo() => null;
-}
-class Kf1<X extends Function(Function Function() Function) Function()> {
-  factory Kf1.foo() => null;
-}
-class Bf2<X extends TdB> {
-  factory Bf2.foo() => null;
-}
-class Cf2<X extends TdC> {
-  factory Cf2.foo() => null;
-}
-class Df2<X extends TdD> {
-  factory Df2.foo() => null;
-}
-class Ef2<X extends TdE> {
-  factory Ef2.foo() => null;
-}
-class Ff2<X extends TdF> {
-  factory Ff2.foo() => null;
-}
-class Gf2<X extends TdG> {
-  factory Gf2.foo() => null;
-}
-class Hf2<X extends TdH> {
-  factory Hf2.foo() => null;
-}
-class If2<X extends TdI> {
-  factory If2.foo() => null;
-}
-class Jf2<X extends TdJ> {
-  factory Jf2.foo() => null;
-}
-class Kf2<X extends TdK> {
-  factory Kf2.foo() => null;
-}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.expect
deleted file mode 100644
index e189517..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.expect
+++ /dev/null
@@ -1,1425 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:24:51: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Fm1<Z> extends Object with Am1<Function({int}), Z> {}
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:48:45: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Qm1<Z> = Object with Am1<Function({int}), Z>;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:79:51: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Fm2<Z> extends Object with Am2<Function({int}), Z> {}
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:107:45: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Qm2<Z> = Object with Am2<Function({int}), Z>;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:136:28: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// typedef TdF = Function({int});
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:192:34: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Ef1<X extends Function({int})> {
-//                                  ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:69:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Bm2<Z> extends Object with Am2<Function(int), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:72:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Cm2<Z> extends Object with Am2<Function(int x), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:88:7: Error: Type argument 'Function' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Jm2<Z> extends Object with Am2<Function, Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:91:7: Error: Type argument 'dynamic Function(Function)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Km2<Z> extends Object with Am2<Function(Function Function), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:97:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Mm2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Mm2<Z> = Object with Am2<Function(int), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:100:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Nm2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Nm2<Z> = Object with Am2<Function(int x), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:116:7: Error: Type argument 'Function' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Um2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Um2<Z> = Object with Am2<Function, Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:119:7: Error: Type argument 'dynamic Function(Function)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Vm2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Vm2<Z> = Object with Am2<Function(Function Function), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef TdB = (core::int*) →* dynamic;
-typedef TdC = (core::int*) →* dynamic;
-typedef TdD = () →* core::int*;
-typedef TdE = () →* dynamic;
-typedef TdF = () →* dynamic;
-typedef TdG = ({x: core::int*}) →* dynamic;
-typedef TdH = ([core::int*]) →* dynamic;
-typedef TdI = ([core::int*]) →* dynamic;
-typedef TdJ = (core::Function*) →* dynamic;
-typedef TdK = () →* (() →* core::Function*) →* dynamic;
-class Am1<X extends core::Object* = dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am1<self::Am1::X*, self::Am1::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::_Bm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm1&Object&Am1<self::_Bm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm1<Z extends core::Object* = dynamic> extends self::_Bm1&Object&Am1<self::Bm1::Z*> {
-  synthetic constructor •() → self::Bm1<self::Bm1::Z*>*
-    : super self::_Bm1&Object&Am1::•()
-    ;
-}
-abstract class _Cm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::_Cm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm1&Object&Am1<self::_Cm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm1<Z extends core::Object* = dynamic> extends self::_Cm1&Object&Am1<self::Cm1::Z*> {
-  synthetic constructor •() → self::Cm1<self::Cm1::Z*>*
-    : super self::_Cm1&Object&Am1::•()
-    ;
-}
-abstract class _Dm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* core::int*, self::_Dm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm1&Object&Am1<self::_Dm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm1<Z extends core::Object* = dynamic> extends self::_Dm1&Object&Am1<self::Dm1::Z*> {
-  synthetic constructor •() → self::Dm1<self::Dm1::Z*>*
-    : super self::_Dm1&Object&Am1::•()
-    ;
-}
-abstract class _Em1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::_Em1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em1&Object&Am1<self::_Em1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em1<Z extends core::Object* = dynamic> extends self::_Em1&Object&Am1<self::Em1::Z*> {
-  synthetic constructor •() → self::Em1<self::Em1::Z*>*
-    : super self::_Em1&Object&Am1::•()
-    ;
-}
-abstract class _Fm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::_Fm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm1&Object&Am1<self::_Fm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm1<Z extends core::Object* = dynamic> extends self::_Fm1&Object&Am1<self::Fm1::Z*> {
-  synthetic constructor •() → self::Fm1<self::Fm1::Z*>*
-    : super self::_Fm1&Object&Am1::•()
-    ;
-}
-abstract class _Gm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<({x: core::int*}) →* dynamic, self::_Gm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm1&Object&Am1<self::_Gm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm1<Z extends core::Object* = dynamic> extends self::_Gm1&Object&Am1<self::Gm1::Z*> {
-  synthetic constructor •() → self::Gm1<self::Gm1::Z*>*
-    : super self::_Gm1&Object&Am1::•()
-    ;
-}
-abstract class _Hm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::_Hm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm1&Object&Am1<self::_Hm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm1<Z extends core::Object* = dynamic> extends self::_Hm1&Object&Am1<self::Hm1::Z*> {
-  synthetic constructor •() → self::Hm1<self::Hm1::Z*>*
-    : super self::_Hm1&Object&Am1::•()
-    ;
-}
-abstract class _Im1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::_Im1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im1&Object&Am1<self::_Im1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im1<Z extends core::Object* = dynamic> extends self::_Im1&Object&Am1<self::Im1::Z*> {
-  synthetic constructor •() → self::Im1<self::Im1::Z*>*
-    : super self::_Im1&Object&Am1::•()
-    ;
-}
-abstract class _Jm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<core::Function*, self::_Jm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm1&Object&Am1<self::_Jm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm1<Z extends core::Object* = dynamic> extends self::_Jm1&Object&Am1<self::Jm1::Z*> {
-  synthetic constructor •() → self::Jm1<self::Jm1::Z*>*
-    : super self::_Jm1&Object&Am1::•()
-    ;
-}
-abstract class _Km1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::Function*) →* dynamic, self::_Km1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km1&Object&Am1<self::_Km1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km1<Z extends core::Object* = dynamic> extends self::_Km1&Object&Am1<self::Km1::Z*> {
-  synthetic constructor •() → self::Km1<self::Km1::Z*>*
-    : super self::_Km1&Object&Am1::•()
-    ;
-}
-abstract class _Lm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* (() →* core::Function*) →* dynamic, self::_Lm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Lm1&Object&Am1<self::_Lm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Lm1<Z extends core::Object* = dynamic> extends self::_Lm1&Object&Am1<self::Lm1::Z*> {
-  synthetic constructor •() → self::Lm1<self::Lm1::Z*>*
-    : super self::_Lm1&Object&Am1::•()
-    ;
-}
-class Mm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::Mm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Mm1<self::Mm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Nm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::Nm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Nm1<self::Nm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Om1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* core::int*, self::Om1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Om1<self::Om1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Pm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::Pm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Pm1<self::Pm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Qm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::Qm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Qm1<self::Qm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Rm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<({x: core::int*}) →* dynamic, self::Rm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Rm1<self::Rm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::Sm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Sm1<self::Sm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Tm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::Tm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Tm1<self::Tm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Um1<Z extends core::Object* = dynamic> = core::Object with self::Am1<core::Function*, self::Um1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Um1<self::Um1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Vm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::Function*) →* dynamic, self::Vm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Vm1<self::Vm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Wm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* (() →* core::Function*) →* dynamic, self::Wm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Wm1<self::Wm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Am2<X extends () →* dynamic = () →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am2<self::Am2::X*, self::Am2::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::_Bm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm2&Object&Am2<self::_Bm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm2<Z extends core::Object* = dynamic> extends self::_Bm2&Object&Am2<self::Bm2::Z*> {
-  synthetic constructor •() → self::Bm2<self::Bm2::Z*>*
-    : super self::_Bm2&Object&Am2::•()
-    ;
-}
-abstract class _Cm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::_Cm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm2&Object&Am2<self::_Cm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm2<Z extends core::Object* = dynamic> extends self::_Cm2&Object&Am2<self::Cm2::Z*> {
-  synthetic constructor •() → self::Cm2<self::Cm2::Z*>*
-    : super self::_Cm2&Object&Am2::•()
-    ;
-}
-abstract class _Dm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* core::int*, self::_Dm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm2&Object&Am2<self::_Dm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm2<Z extends core::Object* = dynamic> extends self::_Dm2&Object&Am2<self::Dm2::Z*> {
-  synthetic constructor •() → self::Dm2<self::Dm2::Z*>*
-    : super self::_Dm2&Object&Am2::•()
-    ;
-}
-abstract class _Em2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::_Em2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em2&Object&Am2<self::_Em2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em2<Z extends core::Object* = dynamic> extends self::_Em2&Object&Am2<self::Em2::Z*> {
-  synthetic constructor •() → self::Em2<self::Em2::Z*>*
-    : super self::_Em2&Object&Am2::•()
-    ;
-}
-abstract class _Fm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::_Fm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm2&Object&Am2<self::_Fm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm2<Z extends core::Object* = dynamic> extends self::_Fm2&Object&Am2<self::Fm2::Z*> {
-  synthetic constructor •() → self::Fm2<self::Fm2::Z*>*
-    : super self::_Fm2&Object&Am2::•()
-    ;
-}
-abstract class _Gm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<({x: core::int*}) →* dynamic, self::_Gm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm2&Object&Am2<self::_Gm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm2<Z extends core::Object* = dynamic> extends self::_Gm2&Object&Am2<self::Gm2::Z*> {
-  synthetic constructor •() → self::Gm2<self::Gm2::Z*>*
-    : super self::_Gm2&Object&Am2::•()
-    ;
-}
-abstract class _Hm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::_Hm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm2&Object&Am2<self::_Hm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm2<Z extends core::Object* = dynamic> extends self::_Hm2&Object&Am2<self::Hm2::Z*> {
-  synthetic constructor •() → self::Hm2<self::Hm2::Z*>*
-    : super self::_Hm2&Object&Am2::•()
-    ;
-}
-abstract class _Im2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::_Im2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im2&Object&Am2<self::_Im2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im2<Z extends core::Object* = dynamic> extends self::_Im2&Object&Am2<self::Im2::Z*> {
-  synthetic constructor •() → self::Im2<self::Im2::Z*>*
-    : super self::_Im2&Object&Am2::•()
-    ;
-}
-abstract class _Jm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<core::Function*, self::_Jm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm2&Object&Am2<self::_Jm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm2<Z extends core::Object* = dynamic> extends self::_Jm2&Object&Am2<self::Jm2::Z*> {
-  synthetic constructor •() → self::Jm2<self::Jm2::Z*>*
-    : super self::_Jm2&Object&Am2::•()
-    ;
-}
-abstract class _Km2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::Function*) →* dynamic, self::_Km2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km2&Object&Am2<self::_Km2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km2<Z extends core::Object* = dynamic> extends self::_Km2&Object&Am2<self::Km2::Z*> {
-  synthetic constructor •() → self::Km2<self::Km2::Z*>*
-    : super self::_Km2&Object&Am2::•()
-    ;
-}
-abstract class _Lm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* (() →* core::Function*) →* dynamic, self::_Lm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Lm2&Object&Am2<self::_Lm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Lm2<Z extends core::Object* = dynamic> extends self::_Lm2&Object&Am2<self::Lm2::Z*> {
-  synthetic constructor •() → self::Lm2<self::Lm2::Z*>*
-    : super self::_Lm2&Object&Am2::•()
-    ;
-}
-class Mm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::Mm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Mm2<self::Mm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Nm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::Nm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Nm2<self::Nm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Om2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* core::int*, self::Om2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Om2<self::Om2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Pm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::Pm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Pm2<self::Pm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Qm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::Qm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Qm2<self::Qm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Rm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<({x: core::int*}) →* dynamic, self::Rm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Rm2<self::Rm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::Sm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Sm2<self::Sm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Tm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::Tm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Tm2<self::Tm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Um2<Z extends core::Object* = dynamic> = core::Object with self::Am2<core::Function*, self::Um2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Um2<self::Um2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Vm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::Function*) →* dynamic, self::Vm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Vm2<self::Vm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Wm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* (() →* core::Function*) →* dynamic, self::Wm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Wm2<self::Wm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Am3<L extends core::Object* = dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am3<self::Am3::L*, self::Am3::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<(core::int*) →* dynamic, self::_Bm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm3&Object&Am3<self::_Bm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm3<Z extends core::Object* = dynamic> extends self::_Bm3&Object&Am3<self::Bm3::Z*> {
-  synthetic constructor •() → self::Bm3<self::Bm3::Z*>*
-    : super self::_Bm3&Object&Am3::•()
-    ;
-}
-abstract class _Cm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<(core::int*) →* dynamic, self::_Cm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm3&Object&Am3<self::_Cm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm3<Z extends core::Object* = dynamic> extends self::_Cm3&Object&Am3<self::Cm3::Z*> {
-  synthetic constructor •() → self::Cm3<self::Cm3::Z*>*
-    : super self::_Cm3&Object&Am3::•()
-    ;
-}
-abstract class _Dm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* core::int*, self::_Dm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm3&Object&Am3<self::_Dm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm3<Z extends core::Object* = dynamic> extends self::_Dm3&Object&Am3<self::Dm3::Z*> {
-  synthetic constructor •() → self::Dm3<self::Dm3::Z*>*
-    : super self::_Dm3&Object&Am3::•()
-    ;
-}
-abstract class _Em3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* dynamic, self::_Em3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em3&Object&Am3<self::_Em3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em3<Z extends core::Object* = dynamic> extends self::_Em3&Object&Am3<self::Em3::Z*> {
-  synthetic constructor •() → self::Em3<self::Em3::Z*>*
-    : super self::_Em3&Object&Am3::•()
-    ;
-}
-abstract class _Fm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* dynamic, self::_Fm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm3&Object&Am3<self::_Fm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm3<Z extends core::Object* = dynamic> extends self::_Fm3&Object&Am3<self::Fm3::Z*> {
-  synthetic constructor •() → self::Fm3<self::Fm3::Z*>*
-    : super self::_Fm3&Object&Am3::•()
-    ;
-}
-abstract class _Gm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<({x: core::int*}) →* dynamic, self::_Gm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm3&Object&Am3<self::_Gm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm3<Z extends core::Object* = dynamic> extends self::_Gm3&Object&Am3<self::Gm3::Z*> {
-  synthetic constructor •() → self::Gm3<self::Gm3::Z*>*
-    : super self::_Gm3&Object&Am3::•()
-    ;
-}
-abstract class _Hm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<([core::int*]) →* dynamic, self::_Hm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm3&Object&Am3<self::_Hm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm3<Z extends core::Object* = dynamic> extends self::_Hm3&Object&Am3<self::Hm3::Z*> {
-  synthetic constructor •() → self::Hm3<self::Hm3::Z*>*
-    : super self::_Hm3&Object&Am3::•()
-    ;
-}
-abstract class _Im3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<([core::int*]) →* dynamic, self::_Im3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im3&Object&Am3<self::_Im3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im3<Z extends core::Object* = dynamic> extends self::_Im3&Object&Am3<self::Im3::Z*> {
-  synthetic constructor •() → self::Im3<self::Im3::Z*>*
-    : super self::_Im3&Object&Am3::•()
-    ;
-}
-abstract class _Jm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<(core::Function*) →* dynamic, self::_Jm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm3&Object&Am3<self::_Jm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm3<Z extends core::Object* = dynamic> extends self::_Jm3&Object&Am3<self::Jm3::Z*> {
-  synthetic constructor •() → self::Jm3<self::Jm3::Z*>*
-    : super self::_Jm3&Object&Am3::•()
-    ;
-}
-abstract class _Km3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* (() →* core::Function*) →* dynamic, self::_Km3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km3&Object&Am3<self::_Km3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km3<Z extends core::Object* = dynamic> extends self::_Km3&Object&Am3<self::Km3::Z*> {
-  synthetic constructor •() → self::Km3<self::Km3::Z*>*
-    : super self::_Km3&Object&Am3::•()
-    ;
-}
-class Af1<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Af1<self::Af1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bf1<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Bf1<self::Bf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cf1<X extends () →* core::int* = () →* core::int*> extends core::Object {
-  static factory foo<X extends () →* core::int* = () →* core::int*>() → self::Cf1<self::Cf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Df1<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Df1<self::Df1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ef1<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ef1<self::Ef1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ff1<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic> extends core::Object {
-  static factory foo<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic>() → self::Ff1<self::Ff1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gf1<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Gf1<self::Gf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hf1<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Hf1<self::Hf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class If1<X extends core::Function* = core::Function*> extends core::Object {
-  static factory foo<X extends core::Function* = core::Function*>() → self::If1<self::If1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jf1<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic>() → self::Jf1<self::Jf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Kf1<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic>() → self::Kf1<self::Kf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bf2<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Bf2<self::Bf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cf2<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Cf2<self::Cf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Df2<X extends () →* core::int* = () →* core::int*> extends core::Object {
-  static factory foo<X extends () →* core::int* = () →* core::int*>() → self::Df2<self::Df2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ef2<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ef2<self::Ef2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ff2<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ff2<self::Ff2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gf2<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic> extends core::Object {
-  static factory foo<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic>() → self::Gf2<self::Gf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hf2<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Hf2<self::Hf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class If2<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::If2<self::If2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jf2<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic>() → self::Jf2<self::Jf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Kf2<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic>() → self::Kf2<self::Kf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.outline.expect
deleted file mode 100644
index 3c8f9dd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.outline.expect
+++ /dev/null
@@ -1,1391 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:24:51: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Fm1<Z> extends Object with Am1<Function({int}), Z> {}
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:48:45: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Qm1<Z> = Object with Am1<Function({int}), Z>;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:79:51: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Fm2<Z> extends Object with Am2<Function({int}), Z> {}
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:107:45: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Qm2<Z> = Object with Am2<Function({int}), Z>;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:136:28: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// typedef TdF = Function({int});
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:192:34: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Ef1<X extends Function({int})> {
-//                                  ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:69:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Bm2<Z> extends Object with Am2<Function(int), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:72:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Cm2<Z> extends Object with Am2<Function(int x), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:88:7: Error: Type argument 'Function' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Jm2<Z> extends Object with Am2<Function, Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:91:7: Error: Type argument 'dynamic Function(Function)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Km2<Z> extends Object with Am2<Function(Function Function), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:97:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Mm2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Mm2<Z> = Object with Am2<Function(int), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:100:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Nm2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Nm2<Z> = Object with Am2<Function(int x), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:116:7: Error: Type argument 'Function' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Um2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Um2<Z> = Object with Am2<Function, Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:119:7: Error: Type argument 'dynamic Function(Function)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Vm2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Vm2<Z> = Object with Am2<Function(Function Function), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef TdB = (core::int*) →* dynamic;
-typedef TdC = (core::int*) →* dynamic;
-typedef TdD = () →* core::int*;
-typedef TdE = () →* dynamic;
-typedef TdF = () →* dynamic;
-typedef TdG = ({x: core::int*}) →* dynamic;
-typedef TdH = ([core::int*]) →* dynamic;
-typedef TdI = ([core::int*]) →* dynamic;
-typedef TdJ = (core::Function*) →* dynamic;
-typedef TdK = () →* (() →* core::Function*) →* dynamic;
-class Am1<X extends core::Object* = dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am1<self::Am1::X*, self::Am1::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::_Bm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm1&Object&Am1<self::_Bm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm1<Z extends core::Object* = dynamic> extends self::_Bm1&Object&Am1<self::Bm1::Z*> {
-  synthetic constructor •() → self::Bm1<self::Bm1::Z*>*
-    ;
-}
-abstract class _Cm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::_Cm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm1&Object&Am1<self::_Cm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm1<Z extends core::Object* = dynamic> extends self::_Cm1&Object&Am1<self::Cm1::Z*> {
-  synthetic constructor •() → self::Cm1<self::Cm1::Z*>*
-    ;
-}
-abstract class _Dm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* core::int*, self::_Dm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm1&Object&Am1<self::_Dm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm1<Z extends core::Object* = dynamic> extends self::_Dm1&Object&Am1<self::Dm1::Z*> {
-  synthetic constructor •() → self::Dm1<self::Dm1::Z*>*
-    ;
-}
-abstract class _Em1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::_Em1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em1&Object&Am1<self::_Em1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em1<Z extends core::Object* = dynamic> extends self::_Em1&Object&Am1<self::Em1::Z*> {
-  synthetic constructor •() → self::Em1<self::Em1::Z*>*
-    ;
-}
-abstract class _Fm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::_Fm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm1&Object&Am1<self::_Fm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm1<Z extends core::Object* = dynamic> extends self::_Fm1&Object&Am1<self::Fm1::Z*> {
-  synthetic constructor •() → self::Fm1<self::Fm1::Z*>*
-    ;
-}
-abstract class _Gm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<({x: core::int*}) →* dynamic, self::_Gm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm1&Object&Am1<self::_Gm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm1<Z extends core::Object* = dynamic> extends self::_Gm1&Object&Am1<self::Gm1::Z*> {
-  synthetic constructor •() → self::Gm1<self::Gm1::Z*>*
-    ;
-}
-abstract class _Hm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::_Hm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm1&Object&Am1<self::_Hm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm1<Z extends core::Object* = dynamic> extends self::_Hm1&Object&Am1<self::Hm1::Z*> {
-  synthetic constructor •() → self::Hm1<self::Hm1::Z*>*
-    ;
-}
-abstract class _Im1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::_Im1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im1&Object&Am1<self::_Im1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im1<Z extends core::Object* = dynamic> extends self::_Im1&Object&Am1<self::Im1::Z*> {
-  synthetic constructor •() → self::Im1<self::Im1::Z*>*
-    ;
-}
-abstract class _Jm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<core::Function*, self::_Jm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm1&Object&Am1<self::_Jm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm1<Z extends core::Object* = dynamic> extends self::_Jm1&Object&Am1<self::Jm1::Z*> {
-  synthetic constructor •() → self::Jm1<self::Jm1::Z*>*
-    ;
-}
-abstract class _Km1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::Function*) →* dynamic, self::_Km1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km1&Object&Am1<self::_Km1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km1<Z extends core::Object* = dynamic> extends self::_Km1&Object&Am1<self::Km1::Z*> {
-  synthetic constructor •() → self::Km1<self::Km1::Z*>*
-    ;
-}
-abstract class _Lm1&Object&Am1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* (() →* core::Function*) →* dynamic, self::_Lm1&Object&Am1::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Lm1&Object&Am1<self::_Lm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Lm1<Z extends core::Object* = dynamic> extends self::_Lm1&Object&Am1<self::Lm1::Z*> {
-  synthetic constructor •() → self::Lm1<self::Lm1::Z*>*
-    ;
-}
-class Mm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::Mm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Mm1<self::Mm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Nm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::int*) →* dynamic, self::Nm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Nm1<self::Nm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Om1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* core::int*, self::Om1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Om1<self::Om1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Pm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::Pm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Pm1<self::Pm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Qm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* dynamic, self::Qm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Qm1<self::Qm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Rm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<({x: core::int*}) →* dynamic, self::Rm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Rm1<self::Rm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::Sm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Sm1<self::Sm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Tm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<([core::int*]) →* dynamic, self::Tm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Tm1<self::Tm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Um1<Z extends core::Object* = dynamic> = core::Object with self::Am1<core::Function*, self::Um1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Um1<self::Um1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Vm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<(core::Function*) →* dynamic, self::Vm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Vm1<self::Vm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Wm1<Z extends core::Object* = dynamic> = core::Object with self::Am1<() →* (() →* core::Function*) →* dynamic, self::Wm1::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Wm1<self::Wm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Am2<X extends () →* dynamic = () →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am2<self::Am2::X*, self::Am2::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::_Bm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm2&Object&Am2<self::_Bm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm2<Z extends core::Object* = dynamic> extends self::_Bm2&Object&Am2<self::Bm2::Z*> {
-  synthetic constructor •() → self::Bm2<self::Bm2::Z*>*
-    ;
-}
-abstract class _Cm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::_Cm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm2&Object&Am2<self::_Cm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm2<Z extends core::Object* = dynamic> extends self::_Cm2&Object&Am2<self::Cm2::Z*> {
-  synthetic constructor •() → self::Cm2<self::Cm2::Z*>*
-    ;
-}
-abstract class _Dm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* core::int*, self::_Dm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm2&Object&Am2<self::_Dm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm2<Z extends core::Object* = dynamic> extends self::_Dm2&Object&Am2<self::Dm2::Z*> {
-  synthetic constructor •() → self::Dm2<self::Dm2::Z*>*
-    ;
-}
-abstract class _Em2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::_Em2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em2&Object&Am2<self::_Em2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em2<Z extends core::Object* = dynamic> extends self::_Em2&Object&Am2<self::Em2::Z*> {
-  synthetic constructor •() → self::Em2<self::Em2::Z*>*
-    ;
-}
-abstract class _Fm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::_Fm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm2&Object&Am2<self::_Fm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm2<Z extends core::Object* = dynamic> extends self::_Fm2&Object&Am2<self::Fm2::Z*> {
-  synthetic constructor •() → self::Fm2<self::Fm2::Z*>*
-    ;
-}
-abstract class _Gm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<({x: core::int*}) →* dynamic, self::_Gm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm2&Object&Am2<self::_Gm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm2<Z extends core::Object* = dynamic> extends self::_Gm2&Object&Am2<self::Gm2::Z*> {
-  synthetic constructor •() → self::Gm2<self::Gm2::Z*>*
-    ;
-}
-abstract class _Hm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::_Hm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm2&Object&Am2<self::_Hm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm2<Z extends core::Object* = dynamic> extends self::_Hm2&Object&Am2<self::Hm2::Z*> {
-  synthetic constructor •() → self::Hm2<self::Hm2::Z*>*
-    ;
-}
-abstract class _Im2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::_Im2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im2&Object&Am2<self::_Im2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im2<Z extends core::Object* = dynamic> extends self::_Im2&Object&Am2<self::Im2::Z*> {
-  synthetic constructor •() → self::Im2<self::Im2::Z*>*
-    ;
-}
-abstract class _Jm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<core::Function*, self::_Jm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm2&Object&Am2<self::_Jm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm2<Z extends core::Object* = dynamic> extends self::_Jm2&Object&Am2<self::Jm2::Z*> {
-  synthetic constructor •() → self::Jm2<self::Jm2::Z*>*
-    ;
-}
-abstract class _Km2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::Function*) →* dynamic, self::_Km2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km2&Object&Am2<self::_Km2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km2<Z extends core::Object* = dynamic> extends self::_Km2&Object&Am2<self::Km2::Z*> {
-  synthetic constructor •() → self::Km2<self::Km2::Z*>*
-    ;
-}
-abstract class _Lm2&Object&Am2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* (() →* core::Function*) →* dynamic, self::_Lm2&Object&Am2::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Lm2&Object&Am2<self::_Lm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Lm2<Z extends core::Object* = dynamic> extends self::_Lm2&Object&Am2<self::Lm2::Z*> {
-  synthetic constructor •() → self::Lm2<self::Lm2::Z*>*
-    ;
-}
-class Mm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::Mm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Mm2<self::Mm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Nm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::int*) →* dynamic, self::Nm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Nm2<self::Nm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Om2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* core::int*, self::Om2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Om2<self::Om2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Pm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::Pm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Pm2<self::Pm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Qm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* dynamic, self::Qm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Qm2<self::Qm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Rm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<({x: core::int*}) →* dynamic, self::Rm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Rm2<self::Rm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::Sm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Sm2<self::Sm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Tm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<([core::int*]) →* dynamic, self::Tm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Tm2<self::Tm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Um2<Z extends core::Object* = dynamic> = core::Object with self::Am2<core::Function*, self::Um2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Um2<self::Um2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Vm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<(core::Function*) →* dynamic, self::Vm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Vm2<self::Vm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Wm2<Z extends core::Object* = dynamic> = core::Object with self::Am2<() →* (() →* core::Function*) →* dynamic, self::Wm2::Z*> /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::Wm2<self::Wm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Am3<L extends core::Object* = dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am3<self::Am3::L*, self::Am3::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<(core::int*) →* dynamic, self::_Bm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm3&Object&Am3<self::_Bm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm3<Z extends core::Object* = dynamic> extends self::_Bm3&Object&Am3<self::Bm3::Z*> {
-  synthetic constructor •() → self::Bm3<self::Bm3::Z*>*
-    ;
-}
-abstract class _Cm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<(core::int*) →* dynamic, self::_Cm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm3&Object&Am3<self::_Cm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm3<Z extends core::Object* = dynamic> extends self::_Cm3&Object&Am3<self::Cm3::Z*> {
-  synthetic constructor •() → self::Cm3<self::Cm3::Z*>*
-    ;
-}
-abstract class _Dm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* core::int*, self::_Dm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm3&Object&Am3<self::_Dm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm3<Z extends core::Object* = dynamic> extends self::_Dm3&Object&Am3<self::Dm3::Z*> {
-  synthetic constructor •() → self::Dm3<self::Dm3::Z*>*
-    ;
-}
-abstract class _Em3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* dynamic, self::_Em3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em3&Object&Am3<self::_Em3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em3<Z extends core::Object* = dynamic> extends self::_Em3&Object&Am3<self::Em3::Z*> {
-  synthetic constructor •() → self::Em3<self::Em3::Z*>*
-    ;
-}
-abstract class _Fm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* dynamic, self::_Fm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm3&Object&Am3<self::_Fm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm3<Z extends core::Object* = dynamic> extends self::_Fm3&Object&Am3<self::Fm3::Z*> {
-  synthetic constructor •() → self::Fm3<self::Fm3::Z*>*
-    ;
-}
-abstract class _Gm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<({x: core::int*}) →* dynamic, self::_Gm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm3&Object&Am3<self::_Gm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm3<Z extends core::Object* = dynamic> extends self::_Gm3&Object&Am3<self::Gm3::Z*> {
-  synthetic constructor •() → self::Gm3<self::Gm3::Z*>*
-    ;
-}
-abstract class _Hm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<([core::int*]) →* dynamic, self::_Hm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm3&Object&Am3<self::_Hm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm3<Z extends core::Object* = dynamic> extends self::_Hm3&Object&Am3<self::Hm3::Z*> {
-  synthetic constructor •() → self::Hm3<self::Hm3::Z*>*
-    ;
-}
-abstract class _Im3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<([core::int*]) →* dynamic, self::_Im3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im3&Object&Am3<self::_Im3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im3<Z extends core::Object* = dynamic> extends self::_Im3&Object&Am3<self::Im3::Z*> {
-  synthetic constructor •() → self::Im3<self::Im3::Z*>*
-    ;
-}
-abstract class _Jm3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<(core::Function*) →* dynamic, self::_Jm3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm3&Object&Am3<self::_Jm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm3<Z extends core::Object* = dynamic> extends self::_Jm3&Object&Am3<self::Jm3::Z*> {
-  synthetic constructor •() → self::Jm3<self::Jm3::Z*>*
-    ;
-}
-abstract class _Km3&Object&Am3<Z extends core::Object* = dynamic> = core::Object with self::Am3<() →* (() →* core::Function*) →* dynamic, self::_Km3&Object&Am3::Z*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km3&Object&Am3<self::_Km3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km3<Z extends core::Object* = dynamic> extends self::_Km3&Object&Am3<self::Km3::Z*> {
-  synthetic constructor •() → self::Km3<self::Km3::Z*>*
-    ;
-}
-class Af1<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Af1<self::Af1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bf1<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Bf1<self::Bf1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cf1<X extends () →* core::int* = () →* core::int*> extends core::Object {
-  static factory foo<X extends () →* core::int* = () →* core::int*>() → self::Cf1<self::Cf1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Df1<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Df1<self::Df1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ef1<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ef1<self::Ef1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ff1<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic> extends core::Object {
-  static factory foo<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic>() → self::Ff1<self::Ff1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gf1<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Gf1<self::Gf1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hf1<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Hf1<self::Hf1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class If1<X extends core::Function* = core::Function*> extends core::Object {
-  static factory foo<X extends core::Function* = core::Function*>() → self::If1<self::If1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jf1<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic>() → self::Jf1<self::Jf1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Kf1<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic>() → self::Kf1<self::Kf1::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bf2<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Bf2<self::Bf2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cf2<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Cf2<self::Cf2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Df2<X extends () →* core::int* = () →* core::int*> extends core::Object {
-  static factory foo<X extends () →* core::int* = () →* core::int*>() → self::Df2<self::Df2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ef2<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ef2<self::Ef2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ff2<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ff2<self::Ff2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gf2<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic> extends core::Object {
-  static factory foo<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic>() → self::Gf2<self::Gf2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hf2<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Hf2<self::Hf2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class If2<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::If2<self::If2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jf2<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic>() → self::Jf2<self::Jf2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Kf2<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic>() → self::Kf2<self::Kf2::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.transformed.expect
deleted file mode 100644
index 02dce8f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart.weak.transformed.expect
+++ /dev/null
@@ -1,1425 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:24:51: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Fm1<Z> extends Object with Am1<Function({int}), Z> {}
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:48:45: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Qm1<Z> = Object with Am1<Function({int}), Z>;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:79:51: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Fm2<Z> extends Object with Am2<Function({int}), Z> {}
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:107:45: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Qm2<Z> = Object with Am2<Function({int}), Z>;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:136:28: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// typedef TdF = Function({int});
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:192:34: Error: Expected an identifier, but got '}'.
-// Try inserting an identifier before '}'.
-// class Ef1<X extends Function({int})> {
-//                                  ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:69:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Bm2<Z> extends Object with Am2<Function(int), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:72:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Cm2<Z> extends Object with Am2<Function(int x), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:88:7: Error: Type argument 'Function' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Jm2<Z> extends Object with Am2<Function, Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:91:7: Error: Type argument 'dynamic Function(Function)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Object with Am2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Km2<Z> extends Object with Am2<Function(Function Function), Z> {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:97:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Mm2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Mm2<Z> = Object with Am2<Function(int), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:100:7: Error: Type argument 'dynamic Function(int)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Nm2'.
-// Try changing type arguments so that they conform to the bounds.
-// class Nm2<Z> = Object with Am2<Function(int x), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:116:7: Error: Type argument 'Function' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Um2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Um2<Z> = Object with Am2<Function, Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:119:7: Error: Type argument 'dynamic Function(Function)' doesn't conform to the bound 'dynamic Function()' of the type variable 'X' on 'Am2' in the supertype 'Am2' of class 'Vm2'.
-//  - 'Function' is from 'dart:core'.
-// Try changing type arguments so that they conform to the bounds.
-// class Vm2<Z> = Object with Am2<Function(Function Function), Z>;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/clone_function_type.dart:66:11: Context: This is the type variable whose bound isn't conformed to.
-// class Am2<X extends Function(), Y> {}
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef TdB = (core::int*) →* dynamic;
-typedef TdC = (core::int*) →* dynamic;
-typedef TdD = () →* core::int*;
-typedef TdE = () →* dynamic;
-typedef TdF = () →* dynamic;
-typedef TdG = ({x: core::int*}) →* dynamic;
-typedef TdH = ([core::int*]) →* dynamic;
-typedef TdI = ([core::int*]) →* dynamic;
-typedef TdJ = (core::Function*) →* dynamic;
-typedef TdK = () →* (() →* core::Function*) →* dynamic;
-class Am1<X extends core::Object* = dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am1<self::Am1::X*, self::Am1::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<(core::int*) →* dynamic, self::_Bm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm1&Object&Am1<self::_Bm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm1<Z extends core::Object* = dynamic> extends self::_Bm1&Object&Am1<self::Bm1::Z*> {
-  synthetic constructor •() → self::Bm1<self::Bm1::Z*>*
-    : super self::_Bm1&Object&Am1::•()
-    ;
-}
-abstract class _Cm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<(core::int*) →* dynamic, self::_Cm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm1&Object&Am1<self::_Cm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm1<Z extends core::Object* = dynamic> extends self::_Cm1&Object&Am1<self::Cm1::Z*> {
-  synthetic constructor •() → self::Cm1<self::Cm1::Z*>*
-    : super self::_Cm1&Object&Am1::•()
-    ;
-}
-abstract class _Dm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* core::int*, self::_Dm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm1&Object&Am1<self::_Dm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm1<Z extends core::Object* = dynamic> extends self::_Dm1&Object&Am1<self::Dm1::Z*> {
-  synthetic constructor •() → self::Dm1<self::Dm1::Z*>*
-    : super self::_Dm1&Object&Am1::•()
-    ;
-}
-abstract class _Em1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* dynamic, self::_Em1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em1&Object&Am1<self::_Em1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em1<Z extends core::Object* = dynamic> extends self::_Em1&Object&Am1<self::Em1::Z*> {
-  synthetic constructor •() → self::Em1<self::Em1::Z*>*
-    : super self::_Em1&Object&Am1::•()
-    ;
-}
-abstract class _Fm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* dynamic, self::_Fm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm1&Object&Am1<self::_Fm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm1<Z extends core::Object* = dynamic> extends self::_Fm1&Object&Am1<self::Fm1::Z*> {
-  synthetic constructor •() → self::Fm1<self::Fm1::Z*>*
-    : super self::_Fm1&Object&Am1::•()
-    ;
-}
-abstract class _Gm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<({x: core::int*}) →* dynamic, self::_Gm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm1&Object&Am1<self::_Gm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm1<Z extends core::Object* = dynamic> extends self::_Gm1&Object&Am1<self::Gm1::Z*> {
-  synthetic constructor •() → self::Gm1<self::Gm1::Z*>*
-    : super self::_Gm1&Object&Am1::•()
-    ;
-}
-abstract class _Hm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<([core::int*]) →* dynamic, self::_Hm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm1&Object&Am1<self::_Hm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm1<Z extends core::Object* = dynamic> extends self::_Hm1&Object&Am1<self::Hm1::Z*> {
-  synthetic constructor •() → self::Hm1<self::Hm1::Z*>*
-    : super self::_Hm1&Object&Am1::•()
-    ;
-}
-abstract class _Im1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<([core::int*]) →* dynamic, self::_Im1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im1&Object&Am1<self::_Im1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im1<Z extends core::Object* = dynamic> extends self::_Im1&Object&Am1<self::Im1::Z*> {
-  synthetic constructor •() → self::Im1<self::Im1::Z*>*
-    : super self::_Im1&Object&Am1::•()
-    ;
-}
-abstract class _Jm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<core::Function*, self::_Jm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm1&Object&Am1<self::_Jm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm1<Z extends core::Object* = dynamic> extends self::_Jm1&Object&Am1<self::Jm1::Z*> {
-  synthetic constructor •() → self::Jm1<self::Jm1::Z*>*
-    : super self::_Jm1&Object&Am1::•()
-    ;
-}
-abstract class _Km1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<(core::Function*) →* dynamic, self::_Km1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km1&Object&Am1<self::_Km1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km1<Z extends core::Object* = dynamic> extends self::_Km1&Object&Am1<self::Km1::Z*> {
-  synthetic constructor •() → self::Km1<self::Km1::Z*>*
-    : super self::_Km1&Object&Am1::•()
-    ;
-}
-abstract class _Lm1&Object&Am1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* (() →* core::Function*) →* dynamic, self::_Lm1&Object&Am1::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Lm1&Object&Am1<self::_Lm1&Object&Am1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Lm1<Z extends core::Object* = dynamic> extends self::_Lm1&Object&Am1<self::Lm1::Z*> {
-  synthetic constructor •() → self::Lm1<self::Lm1::Z*>*
-    : super self::_Lm1&Object&Am1::•()
-    ;
-}
-class Mm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<(core::int*) →* dynamic, self::Mm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Mm1<self::Mm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Nm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<(core::int*) →* dynamic, self::Nm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Nm1<self::Nm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Om1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* core::int*, self::Om1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Om1<self::Om1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Pm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* dynamic, self::Pm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Pm1<self::Pm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Qm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* dynamic, self::Qm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Qm1<self::Qm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Rm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<({x: core::int*}) →* dynamic, self::Rm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Rm1<self::Rm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<([core::int*]) →* dynamic, self::Sm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Sm1<self::Sm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Tm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<([core::int*]) →* dynamic, self::Tm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Tm1<self::Tm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Um1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<core::Function*, self::Um1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Um1<self::Um1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Vm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<(core::Function*) →* dynamic, self::Vm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Vm1<self::Vm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Wm1<Z extends core::Object* = dynamic> extends core::Object implements self::Am1<() →* (() →* core::Function*) →* dynamic, self::Wm1::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Wm1<self::Wm1::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Am2<X extends () →* dynamic = () →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am2<self::Am2::X*, self::Am2::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<(core::int*) →* dynamic, self::_Bm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm2&Object&Am2<self::_Bm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm2<Z extends core::Object* = dynamic> extends self::_Bm2&Object&Am2<self::Bm2::Z*> {
-  synthetic constructor •() → self::Bm2<self::Bm2::Z*>*
-    : super self::_Bm2&Object&Am2::•()
-    ;
-}
-abstract class _Cm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<(core::int*) →* dynamic, self::_Cm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm2&Object&Am2<self::_Cm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm2<Z extends core::Object* = dynamic> extends self::_Cm2&Object&Am2<self::Cm2::Z*> {
-  synthetic constructor •() → self::Cm2<self::Cm2::Z*>*
-    : super self::_Cm2&Object&Am2::•()
-    ;
-}
-abstract class _Dm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* core::int*, self::_Dm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm2&Object&Am2<self::_Dm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm2<Z extends core::Object* = dynamic> extends self::_Dm2&Object&Am2<self::Dm2::Z*> {
-  synthetic constructor •() → self::Dm2<self::Dm2::Z*>*
-    : super self::_Dm2&Object&Am2::•()
-    ;
-}
-abstract class _Em2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* dynamic, self::_Em2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em2&Object&Am2<self::_Em2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em2<Z extends core::Object* = dynamic> extends self::_Em2&Object&Am2<self::Em2::Z*> {
-  synthetic constructor •() → self::Em2<self::Em2::Z*>*
-    : super self::_Em2&Object&Am2::•()
-    ;
-}
-abstract class _Fm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* dynamic, self::_Fm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm2&Object&Am2<self::_Fm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm2<Z extends core::Object* = dynamic> extends self::_Fm2&Object&Am2<self::Fm2::Z*> {
-  synthetic constructor •() → self::Fm2<self::Fm2::Z*>*
-    : super self::_Fm2&Object&Am2::•()
-    ;
-}
-abstract class _Gm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<({x: core::int*}) →* dynamic, self::_Gm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm2&Object&Am2<self::_Gm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm2<Z extends core::Object* = dynamic> extends self::_Gm2&Object&Am2<self::Gm2::Z*> {
-  synthetic constructor •() → self::Gm2<self::Gm2::Z*>*
-    : super self::_Gm2&Object&Am2::•()
-    ;
-}
-abstract class _Hm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<([core::int*]) →* dynamic, self::_Hm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm2&Object&Am2<self::_Hm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm2<Z extends core::Object* = dynamic> extends self::_Hm2&Object&Am2<self::Hm2::Z*> {
-  synthetic constructor •() → self::Hm2<self::Hm2::Z*>*
-    : super self::_Hm2&Object&Am2::•()
-    ;
-}
-abstract class _Im2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<([core::int*]) →* dynamic, self::_Im2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im2&Object&Am2<self::_Im2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im2<Z extends core::Object* = dynamic> extends self::_Im2&Object&Am2<self::Im2::Z*> {
-  synthetic constructor •() → self::Im2<self::Im2::Z*>*
-    : super self::_Im2&Object&Am2::•()
-    ;
-}
-abstract class _Jm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<core::Function*, self::_Jm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm2&Object&Am2<self::_Jm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm2<Z extends core::Object* = dynamic> extends self::_Jm2&Object&Am2<self::Jm2::Z*> {
-  synthetic constructor •() → self::Jm2<self::Jm2::Z*>*
-    : super self::_Jm2&Object&Am2::•()
-    ;
-}
-abstract class _Km2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<(core::Function*) →* dynamic, self::_Km2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km2&Object&Am2<self::_Km2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km2<Z extends core::Object* = dynamic> extends self::_Km2&Object&Am2<self::Km2::Z*> {
-  synthetic constructor •() → self::Km2<self::Km2::Z*>*
-    : super self::_Km2&Object&Am2::•()
-    ;
-}
-abstract class _Lm2&Object&Am2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* (() →* core::Function*) →* dynamic, self::_Lm2&Object&Am2::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Lm2&Object&Am2<self::_Lm2&Object&Am2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Lm2<Z extends core::Object* = dynamic> extends self::_Lm2&Object&Am2<self::Lm2::Z*> {
-  synthetic constructor •() → self::Lm2<self::Lm2::Z*>*
-    : super self::_Lm2&Object&Am2::•()
-    ;
-}
-class Mm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<(core::int*) →* dynamic, self::Mm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Mm2<self::Mm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Nm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<(core::int*) →* dynamic, self::Nm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Nm2<self::Nm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Om2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* core::int*, self::Om2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Om2<self::Om2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Pm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* dynamic, self::Pm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Pm2<self::Pm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Qm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* dynamic, self::Qm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Qm2<self::Qm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Rm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<({x: core::int*}) →* dynamic, self::Rm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Rm2<self::Rm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<([core::int*]) →* dynamic, self::Sm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Sm2<self::Sm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Tm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<([core::int*]) →* dynamic, self::Tm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Tm2<self::Tm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Um2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<core::Function*, self::Um2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Um2<self::Um2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Vm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<(core::Function*) →* dynamic, self::Vm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Vm2<self::Vm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Wm2<Z extends core::Object* = dynamic> extends core::Object implements self::Am2<() →* (() →* core::Function*) →* dynamic, self::Wm2::Z*> /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::Wm2<self::Wm2::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Am3<L extends core::Object* = dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Am3<self::Am3::L*, self::Am3::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Bm3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<(core::int*) →* dynamic, self::_Bm3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Bm3&Object&Am3<self::_Bm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bm3<Z extends core::Object* = dynamic> extends self::_Bm3&Object&Am3<self::Bm3::Z*> {
-  synthetic constructor •() → self::Bm3<self::Bm3::Z*>*
-    : super self::_Bm3&Object&Am3::•()
-    ;
-}
-abstract class _Cm3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<(core::int*) →* dynamic, self::_Cm3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Cm3&Object&Am3<self::_Cm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cm3<Z extends core::Object* = dynamic> extends self::_Cm3&Object&Am3<self::Cm3::Z*> {
-  synthetic constructor •() → self::Cm3<self::Cm3::Z*>*
-    : super self::_Cm3&Object&Am3::•()
-    ;
-}
-abstract class _Dm3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<() →* core::int*, self::_Dm3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Dm3&Object&Am3<self::_Dm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dm3<Z extends core::Object* = dynamic> extends self::_Dm3&Object&Am3<self::Dm3::Z*> {
-  synthetic constructor •() → self::Dm3<self::Dm3::Z*>*
-    : super self::_Dm3&Object&Am3::•()
-    ;
-}
-abstract class _Em3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<() →* dynamic, self::_Em3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Em3&Object&Am3<self::_Em3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Em3<Z extends core::Object* = dynamic> extends self::_Em3&Object&Am3<self::Em3::Z*> {
-  synthetic constructor •() → self::Em3<self::Em3::Z*>*
-    : super self::_Em3&Object&Am3::•()
-    ;
-}
-abstract class _Fm3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<() →* dynamic, self::_Fm3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Fm3&Object&Am3<self::_Fm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Fm3<Z extends core::Object* = dynamic> extends self::_Fm3&Object&Am3<self::Fm3::Z*> {
-  synthetic constructor •() → self::Fm3<self::Fm3::Z*>*
-    : super self::_Fm3&Object&Am3::•()
-    ;
-}
-abstract class _Gm3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<({x: core::int*}) →* dynamic, self::_Gm3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Gm3&Object&Am3<self::_Gm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gm3<Z extends core::Object* = dynamic> extends self::_Gm3&Object&Am3<self::Gm3::Z*> {
-  synthetic constructor •() → self::Gm3<self::Gm3::Z*>*
-    : super self::_Gm3&Object&Am3::•()
-    ;
-}
-abstract class _Hm3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<([core::int*]) →* dynamic, self::_Hm3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Hm3&Object&Am3<self::_Hm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hm3<Z extends core::Object* = dynamic> extends self::_Hm3&Object&Am3<self::Hm3::Z*> {
-  synthetic constructor •() → self::Hm3<self::Hm3::Z*>*
-    : super self::_Hm3&Object&Am3::•()
-    ;
-}
-abstract class _Im3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<([core::int*]) →* dynamic, self::_Im3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Im3&Object&Am3<self::_Im3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Im3<Z extends core::Object* = dynamic> extends self::_Im3&Object&Am3<self::Im3::Z*> {
-  synthetic constructor •() → self::Im3<self::Im3::Z*>*
-    : super self::_Im3&Object&Am3::•()
-    ;
-}
-abstract class _Jm3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<(core::Function*) →* dynamic, self::_Jm3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Jm3&Object&Am3<self::_Jm3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jm3<Z extends core::Object* = dynamic> extends self::_Jm3&Object&Am3<self::Jm3::Z*> {
-  synthetic constructor •() → self::Jm3<self::Jm3::Z*>*
-    : super self::_Jm3&Object&Am3::•()
-    ;
-}
-abstract class _Km3&Object&Am3<Z extends core::Object* = dynamic> extends core::Object implements self::Am3<() →* (() →* core::Function*) →* dynamic, self::_Km3&Object&Am3::Z*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_Km3&Object&Am3<self::_Km3&Object&Am3::Z*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Km3<Z extends core::Object* = dynamic> extends self::_Km3&Object&Am3<self::Km3::Z*> {
-  synthetic constructor •() → self::Km3<self::Km3::Z*>*
-    : super self::_Km3&Object&Am3::•()
-    ;
-}
-class Af1<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Af1<self::Af1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bf1<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Bf1<self::Bf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cf1<X extends () →* core::int* = () →* core::int*> extends core::Object {
-  static factory foo<X extends () →* core::int* = () →* core::int*>() → self::Cf1<self::Cf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Df1<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Df1<self::Df1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ef1<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ef1<self::Ef1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ff1<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic> extends core::Object {
-  static factory foo<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic>() → self::Ff1<self::Ff1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gf1<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Gf1<self::Gf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hf1<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Hf1<self::Hf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class If1<X extends core::Function* = core::Function*> extends core::Object {
-  static factory foo<X extends core::Function* = core::Function*>() → self::If1<self::If1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jf1<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic>() → self::Jf1<self::Jf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Kf1<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic>() → self::Kf1<self::Kf1::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bf2<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Bf2<self::Bf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Cf2<X extends (core::int*) →* dynamic = (core::int*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::int*) →* dynamic = (core::int*) →* dynamic>() → self::Cf2<self::Cf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Df2<X extends () →* core::int* = () →* core::int*> extends core::Object {
-  static factory foo<X extends () →* core::int* = () →* core::int*>() → self::Df2<self::Df2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ef2<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ef2<self::Ef2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ff2<X extends () →* dynamic = () →* dynamic> extends core::Object {
-  static factory foo<X extends () →* dynamic = () →* dynamic>() → self::Ff2<self::Ff2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Gf2<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic> extends core::Object {
-  static factory foo<X extends ({x: core::int*}) →* dynamic = ({x: core::int*}) →* dynamic>() → self::Gf2<self::Gf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hf2<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::Hf2<self::Hf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class If2<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic> extends core::Object {
-  static factory foo<X extends ([core::int*]) →* dynamic = ([core::int*]) →* dynamic>() → self::If2<self::If2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Jf2<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends (core::Function*) →* dynamic = (core::Function*) →* dynamic>() → self::Jf2<self::Jf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Kf2<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic> extends core::Object {
-  static factory foo<X extends () →* (() →* core::Function*) →* dynamic = () →* (() →* core::Function*) →* dynamic>() → self::Kf2<self::Kf2::foo::X*>*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart b/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart
deleted file mode 100644
index b9f6c95..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Foo {
-  var _field = new Bar();
-}
-
-class Bar {}
-
-useCallback(callback) {
-  var _ = callback();
-}
-
-main() {
-  var x;
-  inner() {
-    x = new Foo();
-    return new Foo();
-  }
-
-  useCallback(inner);
-  var _ = inner()._field;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.textual_outline.expect
deleted file mode 100644
index 6a14f58..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class Foo {
-  var _field = new Bar();
-}
-
-class Bar {}
-
-useCallback(callback) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.textual_outline_modelled.expect
deleted file mode 100644
index f357b93..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class Bar {}
-
-class Foo {
-  var _field = new Bar();
-}
-
-main() {}
-useCallback(callback) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.expect
deleted file mode 100644
index a4c2d9f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field self::Bar* _field = new self::Bar::•();
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method useCallback(dynamic callback) → dynamic {
-  dynamic _ = callback.call();
-}
-static method main() → dynamic {
-  dynamic x;
-  function inner() → self::Foo* {
-    x = new self::Foo::•();
-    return new self::Foo::•();
-  }
-  self::useCallback(inner);
-  self::Bar* _ = inner.call().{self::Foo::_field};
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.outline.expect
deleted file mode 100644
index cc26bdb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.outline.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field self::Bar* _field;
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method useCallback(dynamic callback) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.transformed.expect
deleted file mode 100644
index a4c2d9f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/closure.dart.weak.transformed.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field self::Bar* _field = new self::Bar::•();
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method useCallback(dynamic callback) → dynamic {
-  dynamic _ = callback.call();
-}
-static method main() → dynamic {
-  dynamic x;
-  function inner() → self::Foo* {
-    x = new self::Foo::•();
-    return new self::Foo::•();
-  }
-  self::useCallback(inner);
-  self::Bar* _ = inner.call().{self::Foo::_field};
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart b/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart
deleted file mode 100644
index 7f884622c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-/**
- * @assertion
- *  metadata:
- *   (‘@’ qualified (‘.’ identifier)? (arguments)?)*
- *   ;
- * @description Check that it is a compile time error, if @ is missing
- * @compile-error
- * @author a.semenov@unipro.ru
- */
-
-// @dart=2.6
-
-class A {
-  const A();
-}
-
-A()
-class B {}
-
-main() {
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.textual_outline.expect
deleted file mode 100644
index 14119f9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A {
-  const A();
-}
-
-A() {}
-
-class B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.textual_outline_modelled.expect
deleted file mode 100644
index e211177..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-A() {}
-
-class A {
-  const A();
-}
-
-class B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.expect
deleted file mode 100644
index 43e9c3d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:23:1: Error: Expected '{' before this.
-// class B {}
-// ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:22:1: Error: 'A' is already declared in this scope.
-// A()
-// ^
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:18:7: Context: Previous declaration of 'A'.
-// class A {
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.outline.expect
deleted file mode 100644
index 97215d9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.outline.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:23:1: Error: Expected '{' before this.
-// class B {}
-// ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:22:1: Error: 'A' is already declared in this scope.
-// A()
-// ^
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:18:7: Context: Previous declaration of 'A'.
-// class A {
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.transformed.expect
deleted file mode 100644
index 43e9c3d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart.weak.transformed.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:23:1: Error: Expected '{' before this.
-// class B {}
-// ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:22:1: Error: 'A' is already declared in this scope.
-// A()
-// ^
-// pkg/front_end/testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04.dart:18:7: Context: Previous declaration of 'A'.
-// class A {
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart b/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart
deleted file mode 100644
index f539e4d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-// 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.6
-
-main() {}
-
-class A {}
-
-class B extends A {}
-
-class C extends B {}
-
-class D extends C {}
-
-class G<T extends A> {}
-
-class GB extends G<B> {}
-
-class GC extends G<C> {}
-
-class GD extends G<D> {}
-
-class X implements A {}
-
-class Y extends X {}
-
-class Z implements Y {}
-
-class W implements Z {}
-
-class GX implements G<A> {}
-
-class GY extends X implements GB {}
-
-class GZ implements Y, GC {}
-
-class GW implements Z, GD {}
-
-class GU extends GW {}
-
-class GV extends GU implements GW {}
-
-class ARO<S> {}
-
-class ARQ<T> extends Object implements ARO<T> {}
-
-class ARN extends ARQ<A> {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.textual_outline.expect
deleted file mode 100644
index a1e1341..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.textual_outline.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-// @dart = 2.6
-main() {}
-
-class A {}
-
-class B extends A {}
-
-class C extends B {}
-
-class D extends C {}
-
-class G<T extends A> {}
-
-class GB extends G<B> {}
-
-class GC extends G<C> {}
-
-class GD extends G<D> {}
-
-class X implements A {}
-
-class Y extends X {}
-
-class Z implements Y {}
-
-class W implements Z {}
-
-class GX implements G<A> {}
-
-class GY extends X implements GB {}
-
-class GZ implements Y, GC {}
-
-class GW implements Z, GD {}
-
-class GU extends GW {}
-
-class GV extends GU implements GW {}
-
-class ARO<S> {}
-
-class ARQ<T> extends Object implements ARO<T> {}
-
-class ARN extends ARQ<A> {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.textual_outline_modelled.expect
deleted file mode 100644
index c7fa14d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class ARN extends ARQ<A> {}
-
-class ARO<S> {}
-
-class ARQ<T> extends Object implements ARO<T> {}
-
-class B extends A {}
-
-class C extends B {}
-
-class D extends C {}
-
-class G<T extends A> {}
-
-class GB extends G<B> {}
-
-class GC extends G<C> {}
-
-class GD extends G<D> {}
-
-class GU extends GW {}
-
-class GV extends GU implements GW {}
-
-class GW implements Z, GD {}
-
-class GX implements G<A> {}
-
-class GY extends X implements GB {}
-
-class GZ implements Y, GC {}
-
-class W implements Z {}
-
-class X implements A {}
-
-class Y extends X {}
-
-class Z implements Y {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.expect
deleted file mode 100644
index 19ac8c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.expect
+++ /dev/null
@@ -1,210 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-class G<T extends self::A* = self::A*> extends core::Object {
-  synthetic constructor •() → self::G<self::G::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GB extends self::G<self::B*> {
-  synthetic constructor •() → self::GB*
-    : super self::G::•()
-    ;
-}
-class GC extends self::G<self::C*> {
-  synthetic constructor •() → self::GC*
-    : super self::G::•()
-    ;
-}
-class GD extends self::G<self::D*> {
-  synthetic constructor •() → self::GD*
-    : super self::G::•()
-    ;
-}
-class X extends core::Object implements self::A {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    : super self::X::•()
-    ;
-}
-class Z extends core::Object implements self::Y {
-  synthetic constructor •() → self::Z*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class W extends core::Object implements self::Z {
-  synthetic constructor •() → self::W*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GX extends core::Object implements self::G<self::A*> {
-  synthetic constructor •() → self::GX*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GY extends self::X implements self::GB {
-  synthetic constructor •() → self::GY*
-    : super self::X::•()
-    ;
-}
-class GZ extends core::Object implements self::Y, self::GC {
-  synthetic constructor •() → self::GZ*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GW extends core::Object implements self::Z, self::GD {
-  synthetic constructor •() → self::GW*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GU extends self::GW {
-  synthetic constructor •() → self::GU*
-    : super self::GW::•()
-    ;
-}
-class GV extends self::GU implements self::GW {
-  synthetic constructor •() → self::GV*
-    : super self::GU::•()
-    ;
-}
-class ARO<S extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::ARO<self::ARO::S*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ARQ<T extends core::Object* = dynamic> extends core::Object implements self::ARO<self::ARQ::T*> {
-  synthetic constructor •() → self::ARQ<self::ARQ::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ARN extends self::ARQ<self::A*> {
-  synthetic constructor •() → self::ARN*
-    : super self::ARQ::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.outline.expect
deleted file mode 100644
index f0e2f4b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.outline.expect
+++ /dev/null
@@ -1,190 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    ;
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-}
-class G<T extends self::A* = self::A*> extends core::Object {
-  synthetic constructor •() → self::G<self::G::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GB extends self::G<self::B*> {
-  synthetic constructor •() → self::GB*
-    ;
-}
-class GC extends self::G<self::C*> {
-  synthetic constructor •() → self::GC*
-    ;
-}
-class GD extends self::G<self::D*> {
-  synthetic constructor •() → self::GD*
-    ;
-}
-class X extends core::Object implements self::A {
-  synthetic constructor •() → self::X*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    ;
-}
-class Z extends core::Object implements self::Y {
-  synthetic constructor •() → self::Z*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class W extends core::Object implements self::Z {
-  synthetic constructor •() → self::W*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GX extends core::Object implements self::G<self::A*> {
-  synthetic constructor •() → self::GX*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GY extends self::X implements self::GB {
-  synthetic constructor •() → self::GY*
-    ;
-}
-class GZ extends core::Object implements self::Y, self::GC {
-  synthetic constructor •() → self::GZ*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GW extends core::Object implements self::Z, self::GD {
-  synthetic constructor •() → self::GW*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GU extends self::GW {
-  synthetic constructor •() → self::GU*
-    ;
-}
-class GV extends self::GU implements self::GW {
-  synthetic constructor •() → self::GV*
-    ;
-}
-class ARO<S extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::ARO<self::ARO::S*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ARQ<T extends core::Object* = dynamic> extends core::Object implements self::ARO<self::ARQ::T*> {
-  synthetic constructor •() → self::ARQ<self::ARQ::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ARN extends self::ARQ<self::A*> {
-  synthetic constructor •() → self::ARN*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.transformed.expect
deleted file mode 100644
index 19ac8c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/complex_class_hierarchy.dart.weak.transformed.expect
+++ /dev/null
@@ -1,210 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-class G<T extends self::A* = self::A*> extends core::Object {
-  synthetic constructor •() → self::G<self::G::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GB extends self::G<self::B*> {
-  synthetic constructor •() → self::GB*
-    : super self::G::•()
-    ;
-}
-class GC extends self::G<self::C*> {
-  synthetic constructor •() → self::GC*
-    : super self::G::•()
-    ;
-}
-class GD extends self::G<self::D*> {
-  synthetic constructor •() → self::GD*
-    : super self::G::•()
-    ;
-}
-class X extends core::Object implements self::A {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    : super self::X::•()
-    ;
-}
-class Z extends core::Object implements self::Y {
-  synthetic constructor •() → self::Z*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class W extends core::Object implements self::Z {
-  synthetic constructor •() → self::W*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GX extends core::Object implements self::G<self::A*> {
-  synthetic constructor •() → self::GX*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GY extends self::X implements self::GB {
-  synthetic constructor •() → self::GY*
-    : super self::X::•()
-    ;
-}
-class GZ extends core::Object implements self::Y, self::GC {
-  synthetic constructor •() → self::GZ*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GW extends core::Object implements self::Z, self::GD {
-  synthetic constructor •() → self::GW*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class GU extends self::GW {
-  synthetic constructor •() → self::GU*
-    : super self::GW::•()
-    ;
-}
-class GV extends self::GU implements self::GW {
-  synthetic constructor •() → self::GV*
-    : super self::GU::•()
-    ;
-}
-class ARO<S extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::ARO<self::ARO::S*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ARQ<T extends core::Object* = dynamic> extends core::Object implements self::ARO<self::ARQ::T*> {
-  synthetic constructor •() → self::ARQ<self::ARQ::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ARN extends self::ARQ<self::A*> {
-  synthetic constructor •() → self::ARN*
-    : super self::ARQ::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart b/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart
deleted file mode 100644
index 2c500db..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.6
-
-class A {}
-
-class B extends A {
-  A operator +(B b) => new C();
-}
-
-class C extends A {}
-
-main() {
-  Map<int, B> map = {0: new B()};
-  try {
-    map[0] += new B();
-    throw 'Expected type error';
-  } catch (_) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.textual_outline.expect
deleted file mode 100644
index 5b66c35..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {
-  A operator +(B b) => new C();
-}
-
-class C extends A {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5b66c35..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {
-  A operator +(B b) => new C();
-}
-
-class C extends A {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.expect
deleted file mode 100644
index c425212..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  operator +(self::B* b) → self::A*
-    return new self::C::•();
-}
-class C extends self::A {
-  synthetic constructor •() → self::C*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  core::Map<core::int*, self::B*>* map = <core::int*, self::B*>{0: new self::B::•()};
-  try {
-    let final core::Map<core::int*, self::B*>* #t1 = map in let final core::int* #t2 = 0 in #t1.{core::Map::[]=}(#t2, #t1.{core::Map::[]}(#t2).{self::B::+}(new self::B::•()) as{TypeError} self::B*);
-    throw "Expected type error";
-  }
-  on dynamic catch(final dynamic _) {
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.outline.expect
deleted file mode 100644
index d6b6c38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.outline.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-  operator +(self::B* b) → self::A*
-    ;
-}
-class C extends self::A {
-  synthetic constructor •() → self::C*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.transformed.expect
deleted file mode 100644
index ded690f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/compound_binary_implicit_as.dart.weak.transformed.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  operator +(self::B* b) → self::A*
-    return new self::C::•();
-}
-class C extends self::A {
-  synthetic constructor •() → self::C*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  core::Map<core::int*, self::B*>* map = <core::int*, self::B*>{0: new self::B::•()};
-  try {
-    let final core::Map<core::int*, self::B*>* #t1 = map in let final core::int* #t2 = 0 in #t1.{core::Map::[]=}(#t2, #t1.{core::Map::[]}(#t2).{self::B::+}(new self::B::•()) as{TypeError} self::B*);
-    throw "Expected type error";
-  }
-  on dynamic catch(final dynamic _) {
-  }
-}
-
-
-Extra constant evaluation status:
-Evaluated: VariableGet @ org-dartlang-testcase:///compound_binary_implicit_as.dart:18:9 -> IntConstant(0)
-Evaluated: VariableGet @ org-dartlang-testcase:///compound_binary_implicit_as.dart:18:9 -> IntConstant(0)
-Extra constant evaluation: evaluated: 16, effectively constant: 2
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart b/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart
deleted file mode 100644
index 7824b7f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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.6
-
-class A {
-  const A() : this.bad();
-
-  A.bad() {}
-}
-
-class B extends A {
-  const B() : super.bad();
-}
-
-test() {
-  print(const A());
-  print(const B());
-}
-
-main() {
-  print(new A());
-  print(new B());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.textual_outline.expect
deleted file mode 100644
index 5e13631..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class A {
-  const A() : this.bad();
-  A.bad() {}
-}
-
-class B extends A {
-  const B() : super.bad();
-}
-
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.textual_outline_modelled.expect
deleted file mode 100644
index 0bfc5d3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class A {
-  A.bad() {}
-  const A() : this.bad();
-}
-
-class B extends A {
-  const B() : super.bad();
-}
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.expect
deleted file mode 100644
index d3aac88..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart:14:21: Error: A constant constructor can't call a non-constant super constructor.
-//   const B() : super.bad();
-//                     ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart:8:20: Error: A constant constructor can't call a non-constant constructor.
-//   const A() : this.bad();
-//                    ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : this self::A::bad()
-    ;
-  constructor bad() → self::A*
-    : super core::Object::•() {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A /*hasConstConstructor*/  {
-  const constructor •() → self::B*
-    : super self::A::bad()
-    ;
-}
-static method test() → dynamic {
-  core::print(invalid-expression "Non-const constructor invocation.");
-  core::print(invalid-expression "Non-const constructor invocation.");
-}
-static method main() → dynamic {
-  core::print(new self::A::•());
-  core::print(new self::B::•());
-}
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///const_redirect_to_nonconst.dart:
-- A. (from org-dartlang-testcase:///const_redirect_to_nonconst.dart:8:9)
-- A.bad (from org-dartlang-testcase:///const_redirect_to_nonconst.dart:10:3)
-- B. (from org-dartlang-testcase:///const_redirect_to_nonconst.dart:14:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.outline.expect
deleted file mode 100644
index 30117e6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.outline.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart:14:21: Error: A constant constructor can't call a non-constant super constructor.
-//   const B() : super.bad();
-//                     ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : this self::A::bad()
-    ;
-  constructor bad() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A /*hasConstConstructor*/  {
-  const constructor •() → self::B*
-    : super self::A::bad()
-    ;
-}
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.transformed.expect
deleted file mode 100644
index d3aac88..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart.weak.transformed.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart:14:21: Error: A constant constructor can't call a non-constant super constructor.
-//   const B() : super.bad();
-//                     ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/const_redirect_to_nonconst.dart:8:20: Error: A constant constructor can't call a non-constant constructor.
-//   const A() : this.bad();
-//                    ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : this self::A::bad()
-    ;
-  constructor bad() → self::A*
-    : super core::Object::•() {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A /*hasConstConstructor*/  {
-  const constructor •() → self::B*
-    : super self::A::bad()
-    ;
-}
-static method test() → dynamic {
-  core::print(invalid-expression "Non-const constructor invocation.");
-  core::print(invalid-expression "Non-const constructor invocation.");
-}
-static method main() → dynamic {
-  core::print(new self::A::•());
-  core::print(new self::B::•());
-}
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///const_redirect_to_nonconst.dart:
-- A. (from org-dartlang-testcase:///const_redirect_to_nonconst.dart:8:9)
-- A.bad (from org-dartlang-testcase:///const_redirect_to_nonconst.dart:10:3)
-- B. (from org-dartlang-testcase:///const_redirect_to_nonconst.dart:14:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart
deleted file mode 100644
index 3d69c71..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that the type inference implementation correctly uses least
-// closure of the inferred type arguments in invocations of 'const' constructors
-// in case there are type variables in them.
-
-class _Y<T> {
-  const _Y();
-}
-
-class A<T> {
-  _Y<T> x;
-  A(this.x);
-}
-
-class B<T> extends A<T> {
-  B() : super(const _Y());
-}
-
-main() {
-  dynamic x = new B().x;
-  if (x is! _Y<Null>) {
-    throw "Unexpected run-time type: `new B().x` is ${x.runtimeType}, "
-        "but `_Y<Null>` expected";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.textual_outline.expect
deleted file mode 100644
index dfe7905..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.textual_outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-class _Y<T> {
-  const _Y();
-}
-
-class A<T> {
-  _Y<T> x;
-  A(this.x);
-}
-
-class B<T> extends A<T> {
-  B() : super(const _Y());
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.textual_outline_modelled.expect
deleted file mode 100644
index bd5e3b9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-class A<T> {
-  A(this.x);
-  _Y<T> x;
-}
-
-class B<T> extends A<T> {
-  B() : super(const _Y());
-}
-
-class _Y<T> {
-  const _Y();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.expect
deleted file mode 100644
index e2fb0a4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class _Y<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::_Y<self::_Y::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::_Y<self::A::T*>* x;
-  constructor •(self::_Y<self::A::T*>* x) → self::A<self::A::T*>*
-    : self::A::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A<self::B::T*> {
-  constructor •() → self::B<self::B::T*>*
-    : super self::A::•(#C1)
-    ;
-}
-static method main() → dynamic {
-  dynamic x = new self::B::•<dynamic>().{self::A::x};
-  if(!(x is self::_Y<Null>*)) {
-    throw "Unexpected run-time type: `new B().x` is ${x.{core::Object::runtimeType}}, but `_Y<Null>` expected";
-  }
-}
-
-constants  {
-  #C1 = self::_Y<Null> {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///constructor_const_inference.dart:
-- _Y. (from org-dartlang-testcase:///constructor_const_inference.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.outline.expect
deleted file mode 100644
index 8059549..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.outline.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class _Y<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::_Y<self::_Y::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::_Y<self::A::T*>* x;
-  constructor •(self::_Y<self::A::T*>* x) → self::A<self::A::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A<self::B::T*> {
-  constructor •() → self::B<self::B::T*>*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.transformed.expect
deleted file mode 100644
index e2fb0a4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_const_inference.dart.weak.transformed.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class _Y<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::_Y<self::_Y::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::_Y<self::A::T*>* x;
-  constructor •(self::_Y<self::A::T*>* x) → self::A<self::A::T*>*
-    : self::A::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A<self::B::T*> {
-  constructor •() → self::B<self::B::T*>*
-    : super self::A::•(#C1)
-    ;
-}
-static method main() → dynamic {
-  dynamic x = new self::B::•<dynamic>().{self::A::x};
-  if(!(x is self::_Y<Null>*)) {
-    throw "Unexpected run-time type: `new B().x` is ${x.{core::Object::runtimeType}}, but `_Y<Null>` expected";
-  }
-}
-
-constants  {
-  #C1 = self::_Y<Null> {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///constructor_const_inference.dart:
-- _Y. (from org-dartlang-testcase:///constructor_const_inference.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart
deleted file mode 100644
index 0937bb1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class A {
-  A.foo() : this.bar();
-  A.bar() : this.foo();
-  A.baz() : this.foo();
-  A() : this();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.textual_outline.expect
deleted file mode 100644
index 5bf13d8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  A.foo() : this.bar();
-  A.bar() : this.foo();
-  A.baz() : this.foo();
-  A() : this();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.textual_outline_modelled.expect
deleted file mode 100644
index 4889e4e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  A() : this();
-  A.bar() : this.foo();
-  A.baz() : this.foo();
-  A.foo() : this.bar();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.expect
deleted file mode 100644
index 59af13f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.expect
+++ /dev/null
@@ -1,42 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart:9:18: Error: Redirecting constructors can't be cyclic.
-// Try to have all constructors eventually redirect to a non-redirecting constructor.
-//   A.bar() : this.foo();
-//                  ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart:11:9: Error: Redirecting constructors can't be cyclic.
-// Try to have all constructors eventually redirect to a non-redirecting constructor.
-//   A() : this();
-//         ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  constructor foo() → self::A*
-    : this self::A::bar()
-    ;
-  constructor bar() → self::A*
-    : this self::A::foo()
-    ;
-  constructor baz() → self::A*
-    : this self::A::foo()
-    ;
-  constructor •() → self::A*
-    : this self::A::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.outline.expect
deleted file mode 100644
index a3bff12..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.outline.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  constructor foo() → self::A*
-    ;
-  constructor bar() → self::A*
-    ;
-  constructor baz() → self::A*
-    ;
-  constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.transformed.expect
deleted file mode 100644
index 59af13f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart.weak.transformed.expect
+++ /dev/null
@@ -1,42 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart:9:18: Error: Redirecting constructors can't be cyclic.
-// Try to have all constructors eventually redirect to a non-redirecting constructor.
-//   A.bar() : this.foo();
-//                  ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_cycle.dart:11:9: Error: Redirecting constructors can't be cyclic.
-// Try to have all constructors eventually redirect to a non-redirecting constructor.
-//   A() : this();
-//         ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  constructor foo() → self::A*
-    : this self::A::bar()
-    ;
-  constructor bar() → self::A*
-    : this self::A::foo()
-    ;
-  constructor baz() → self::A*
-    : this self::A::foo()
-    ;
-  constructor •() → self::A*
-    : this self::A::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart
deleted file mode 100644
index 9f7f43d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class A {
-  A();
-}
-
-class B {
-  B(int x, double y, String s);
-}
-
-class C<T> {
-  C();
-}
-
-class D<T, S> {
-  D(T x, S y);
-}
-
-void main() {
-  new A();
-  new B(0, 3.14, "foo");
-  new C();
-  new D<Object, int>(null, 3);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.textual_outline.expect
deleted file mode 100644
index 6654976..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.textual_outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-class A {
-  A();
-}
-
-class B {
-  B(int x, double y, String s);
-}
-
-class C<T> {
-  C();
-}
-
-class D<T, S> {
-  D(T x, S y);
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6654976..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-class A {
-  A();
-}
-
-class B {
-  B(int x, double y, String s);
-}
-
-class C<T> {
-  C();
-}
-
-class D<T, S> {
-  D(T x, S y);
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.expect
deleted file mode 100644
index 3e5a359..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.expect
+++ /dev/null
@@ -1,70 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  constructor •(core::int* x, core::double* y, core::String* s) → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<T extends core::Object* = dynamic, S extends core::Object* = dynamic> extends core::Object {
-  constructor •(self::D::T* x, self::D::S* y) → self::D<self::D::T*, self::D::S*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {
-  new self::A::•();
-  new self::B::•(0, 3.14, "foo");
-  new self::C::•<dynamic>();
-  new self::D::•<core::Object*, core::int*>(null, 3);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.outline.expect
deleted file mode 100644
index 77d1f0c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.outline.expect
+++ /dev/null
@@ -1,62 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  constructor •(core::int* x, core::double* y, core::String* s) → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  constructor •() → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<T extends core::Object* = dynamic, S extends core::Object* = dynamic> extends core::Object {
-  constructor •(self::D::T* x, self::D::S* y) → self::D<self::D::T*, self::D::S*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.transformed.expect
deleted file mode 100644
index 3e5a359..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_function_types.dart.weak.transformed.expect
+++ /dev/null
@@ -1,70 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  constructor •(core::int* x, core::double* y, core::String* s) → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<T extends core::Object* = dynamic, S extends core::Object* = dynamic> extends core::Object {
-  constructor •(self::D::T* x, self::D::S* y) → self::D<self::D::T*, self::D::S*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {
-  new self::A::•();
-  new self::B::•(0, 3.14, "foo");
-  new self::C::•<dynamic>();
-  new self::D::•<core::Object*, core::int*>(null, 3);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart
deleted file mode 100644
index 7546f4e5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class C1 { int f; C1() : ; }
-class C2 { int f; C2() : f; }
-class C3 { int f; C3() : f++; }
-
-main() {
-  var c1 = new C1();
-  c1.toString();
-  var c2 = new C2();
-  c2.toString();
-  var c3 = new C3();
-  c3.toString();
-}
-
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.textual_outline.expect
deleted file mode 100644
index 995d0d4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class C1 {
-  int f;
-  C1() : =;
-}
-class C2 {
-  int f;
-  C2() : f=;
-}
-class C3 {
-  int f;
-  C3() : =f++;
-}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.expect
deleted file mode 100644
index 0306f2a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.expect
+++ /dev/null
@@ -1,87 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:7:24: Error: Expected an initializer.
-// class C1 { int f; C1() : ; }
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:8:26: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-// class C2 { int f; C2() : f; }
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:9:26: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-// class C3 { int f; C3() : f++; }
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:9:26: Error: Can't access 'this' in a field initializer to read 'f'.
-// class C3 { int f; C3() : f++; }
-//                          ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  field core::int* f = null;
-  constructor •() → self::C1*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:7:26: Error: This couldn't be parsed.
-class C1 { int f; C1() : ; }
-                         ^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C2 extends core::Object {
-  field core::int* f;
-  constructor •() → self::C2*
-    : self::C2::f = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:8:27: Error: This couldn't be parsed.
-class C2 { int f; C2() : f; }
-                          ^" as{TypeError,ForDynamic} core::int*, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C3 extends core::Object {
-  field core::int* f = null;
-  constructor •() → self::C3*
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:9:26: Error: This couldn't be parsed.
-class C3 { int f; C3() : f++; }
-                         ^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::C1* c1 = new self::C1::•();
-  c1.{self::C1::toString}();
-  self::C2* c2 = new self::C2::•();
-  c2.{self::C2::toString}();
-  self::C3* c3 = new self::C3::•();
-  c3.{self::C3::toString}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.outline.expect
deleted file mode 100644
index 60ccdb3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.outline.expect
+++ /dev/null
@@ -1,68 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:7:24: Error: Expected an initializer.
-// class C1 { int f; C1() : ; }
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:8:26: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-// class C2 { int f; C2() : f; }
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:9:26: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-// class C3 { int f; C3() : f++; }
-//                          ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  field core::int* f;
-  constructor •() → self::C1*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C2 extends core::Object {
-  field core::int* f;
-  constructor •() → self::C2*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C3 extends core::Object {
-  field core::int* f;
-  constructor •() → self::C3*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.transformed.expect
deleted file mode 100644
index 6ede57f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart.weak.transformed.expect
+++ /dev/null
@@ -1,87 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:7:24: Error: Expected an initializer.
-// class C1 { int f; C1() : ; }
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:8:26: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-// class C2 { int f; C2() : f; }
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:9:26: Error: Expected an assignment after the field name.
-// To initialize a field, use the syntax 'name = value'.
-// class C3 { int f; C3() : f++; }
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:9:26: Error: Can't access 'this' in a field initializer to read 'f'.
-// class C3 { int f; C3() : f++; }
-//                          ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C1 extends core::Object {
-  field core::int* f = null;
-  constructor •() → self::C1*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:7:26: Error: This couldn't be parsed.
-class C1 { int f; C1() : ; }
-                         ^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C2 extends core::Object {
-  field core::int* f;
-  constructor •() → self::C2*
-    : self::C2::f = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:8:27: Error: This couldn't be parsed.
-class C2 { int f; C2() : f; }
-                          ^", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C3 extends core::Object {
-  field core::int* f = null;
-  constructor •() → self::C3*
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/constructor_initializer_invalid.dart:9:26: Error: This couldn't be parsed.
-class C3 { int f; C3() : f++; }
-                         ^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::C1* c1 = new self::C1::•();
-  c1.{self::C1::toString}();
-  self::C2* c2 = new self::C2::•();
-  c2.{self::C2::toString}();
-  self::C3* c3 = new self::C3::•();
-  c3.{self::C3::toString}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart b/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart
deleted file mode 100644
index c1b8cc4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import "continue_inference_after_error_lib.dart" as lib;
-
-class C {}
-
-test() {
-  lib(new C().missing());
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.textual_outline.expect
deleted file mode 100644
index 07cb3bd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-import "continue_inference_after_error_lib.dart" as lib;
-
-class C {}
-
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.textual_outline_modelled.expect
deleted file mode 100644
index a5d615d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-import "continue_inference_after_error_lib.dart" as lib;
-
-class C {}
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.expect
deleted file mode 100644
index 132fa37..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:3: Error: A prefix can't be used as an expression.
-//   lib(new C().missing());
-//   ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:15: Error: The method 'missing' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'missing'.
-//   lib(new C().missing());
-//               ^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///continue_inference_after_error_lib.dart" as lib;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:3: Error: A prefix can't be used as an expression.
-  lib(new C().missing());
-  ^^^" in let final core::Object* #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:15: Error: The method 'missing' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'missing'.
-  lib(new C().missing());
-              ^^^^^^^" in null;
-}
-static method main() → dynamic {}
-
-library /*isNonNullableByDefault*/;
-import self as self2;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.outline.expect
deleted file mode 100644
index 5473a25..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///continue_inference_after_error_lib.dart" as lib;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
-
-library /*isNonNullableByDefault*/;
-import self as self2;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.transformed.expect
deleted file mode 100644
index 132fa37..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart.weak.transformed.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:3: Error: A prefix can't be used as an expression.
-//   lib(new C().missing());
-//   ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:15: Error: The method 'missing' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'missing'.
-//   lib(new C().missing());
-//               ^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///continue_inference_after_error_lib.dart" as lib;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:3: Error: A prefix can't be used as an expression.
-  lib(new C().missing());
-  ^^^" in let final core::Object* #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart:12:15: Error: The method 'missing' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'missing'.
-  lib(new C().missing());
-              ^^^^^^^" in null;
-}
-static method main() → dynamic {}
-
-library /*isNonNullableByDefault*/;
-import self as self2;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error_lib.dart
deleted file mode 100644
index 87869b0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/continue_inference_after_error_lib.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright (c) 2018, 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.
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart
deleted file mode 100644
index fecc3b5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart
+++ /dev/null
@@ -1,41 +0,0 @@
-// 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.6
-
-main() {
-  final aList = <int>[
-    1,
-    if (oracle()) 2,
-    if (oracle()) 3 else -1,
-    if (oracle()) if (oracle()) 4,
-    for (int i in <int>[5, 6, 7]) i,
-    for (int i in <int>[8, 9, 10]) if (oracle()) i,
-    for (int i = 11; i <= 14; ++i) i,
-  ];
-  final aSet = <int>{
-    1,
-    if (oracle()) 2,
-    if (oracle()) 3 else -1,
-    if (oracle()) if (oracle()) 4,
-    for (int i in <int>[5, 6, 7]) i,
-    for (int i in <int>[8, 9, 10]) if (oracle()) i,
-    for (int i = 11; i <= 14; ++i) i,
-  };
-  final aMap = <int, int>{
-    1: 1,
-    if (oracle()) 2: 2,
-    if (oracle()) 3: 3 else -1: -1,
-    if (oracle()) if (oracle()) 4: 4,
-    for (int i in <int>[5, 6, 7]) i: i,
-    for (int i in <int>[8, 9, 10]) if (oracle()) i: i,
-    for (int i = 11; i <= 14; ++i) i: i,
-  };
-
-  print(aList);
-  print(aSet);
-  print(aMap);
-}
-
-oracle() => true;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.textual_outline.expect
deleted file mode 100644
index 7436629..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-oracle() => true;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7436629..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-oracle() => true;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.expect
deleted file mode 100644
index bc26325..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.expect
+++ /dev/null
@@ -1,71 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method main() → dynamic {
-  final core::List<core::int*>* aList = block {
-    final core::List<core::int*>* #t1 = <core::int*>[1];
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t1.{core::List::add}{Invariant}(2);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t1.{core::List::add}{Invariant}(3);
-    else
-      #t1.{core::List::add}{Invariant}(1.{core::int::unary-}());
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t1.{core::List::add}{Invariant}(4);
-    for (core::int* i in <core::int*>[5, 6, 7])
-      #t1.{core::List::add}{Invariant}(i);
-    for (core::int* i in <core::int*>[8, 9, 10])
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t1.{core::List::add}{Invariant}(i);
-    for (core::int* i = 11; i.{core::num::<=}(14); i = i.{core::num::+}(1))
-      #t1.{core::List::add}{Invariant}(i);
-  } =>#t1;
-  final core::Set<core::int*>* aSet = block {
-    final core::Set<core::int*>* #t2 = col::LinkedHashSet::•<core::int*>();
-    #t2.{core::Set::add}{Invariant}(1);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t2.{core::Set::add}{Invariant}(2);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t2.{core::Set::add}{Invariant}(3);
-    else
-      #t2.{core::Set::add}{Invariant}(1.{core::int::unary-}());
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t2.{core::Set::add}{Invariant}(4);
-    for (core::int* i in <core::int*>[5, 6, 7])
-      #t2.{core::Set::add}{Invariant}(i);
-    for (core::int* i in <core::int*>[8, 9, 10])
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t2.{core::Set::add}{Invariant}(i);
-    for (core::int* i = 11; i.{core::num::<=}(14); i = i.{core::num::+}(1))
-      #t2.{core::Set::add}{Invariant}(i);
-  } =>#t2;
-  final core::Map<core::int*, core::int*>* aMap = block {
-    final core::Map<core::int*, core::int*>* #t3 = <core::int*, core::int*>{};
-    #t3.{core::Map::[]=}{Invariant}(1, 1);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t3.{core::Map::[]=}{Invariant}(2, 2);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t3.{core::Map::[]=}{Invariant}(3, 3);
-    else
-      #t3.{core::Map::[]=}{Invariant}(1.{core::int::unary-}(), 1.{core::int::unary-}());
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t3.{core::Map::[]=}{Invariant}(4, 4);
-    for (core::int* i in <core::int*>[5, 6, 7])
-      #t3.{core::Map::[]=}{Invariant}(i, i);
-    for (core::int* i in <core::int*>[8, 9, 10])
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t3.{core::Map::[]=}{Invariant}(i, i);
-    for (core::int* i = 11; i.{core::num::<=}(14); i = i.{core::num::+}(1))
-      #t3.{core::Map::[]=}{Invariant}(i, i);
-  } =>#t3;
-  core::print(aList);
-  core::print(aSet);
-  core::print(aMap);
-}
-static method oracle() → dynamic
-  return true;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.outline.expect
deleted file mode 100644
index b0c1797..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
-static method oracle() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.transformed.expect
deleted file mode 100644
index b49f9a8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection.dart.weak.transformed.expect
+++ /dev/null
@@ -1,109 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method main() → dynamic {
-  final core::List<core::int*>* aList = block {
-    final core::List<core::int*>* #t1 = core::_GrowableList::_literal1<core::int*>(1);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t1.{core::List::add}{Invariant}(2);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t1.{core::List::add}{Invariant}(3);
-    else
-      #t1.{core::List::add}{Invariant}(1.{core::int::unary-}());
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t1.{core::List::add}{Invariant}(4);
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(5, 6, 7).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        #t1.{core::List::add}{Invariant}(i);
-      }
-    }
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(8, 9, 10).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-          #t1.{core::List::add}{Invariant}(i);
-      }
-    }
-    for (core::int* i = 11; i.{core::num::<=}(14); i = i.{core::num::+}(1))
-      #t1.{core::List::add}{Invariant}(i);
-  } =>#t1;
-  final core::Set<core::int*>* aSet = block {
-    final core::Set<core::int*>* #t2 = new col::_CompactLinkedHashSet::•<core::int*>();
-    #t2.{core::Set::add}{Invariant}(1);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t2.{core::Set::add}{Invariant}(2);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t2.{core::Set::add}{Invariant}(3);
-    else
-      #t2.{core::Set::add}{Invariant}(1.{core::int::unary-}());
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t2.{core::Set::add}{Invariant}(4);
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(5, 6, 7).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        #t2.{core::Set::add}{Invariant}(i);
-      }
-    }
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(8, 9, 10).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-          #t2.{core::Set::add}{Invariant}(i);
-      }
-    }
-    for (core::int* i = 11; i.{core::num::<=}(14); i = i.{core::num::+}(1))
-      #t2.{core::Set::add}{Invariant}(i);
-  } =>#t2;
-  final core::Map<core::int*, core::int*>* aMap = block {
-    final core::Map<core::int*, core::int*>* #t3 = <core::int*, core::int*>{};
-    #t3.{core::Map::[]=}{Invariant}(1, 1);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t3.{core::Map::[]=}{Invariant}(2, 2);
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      #t3.{core::Map::[]=}{Invariant}(3, 3);
-    else
-      #t3.{core::Map::[]=}{Invariant}(1.{core::int::unary-}(), 1.{core::int::unary-}());
-    if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-        #t3.{core::Map::[]=}{Invariant}(4, 4);
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(5, 6, 7).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        #t3.{core::Map::[]=}{Invariant}(i, i);
-      }
-    }
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(8, 9, 10).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        if(self::oracle() as{TypeError,ForDynamic} core::bool*)
-          #t3.{core::Map::[]=}{Invariant}(i, i);
-      }
-    }
-    for (core::int* i = 11; i.{core::num::<=}(14); i = i.{core::num::+}(1))
-      #t3.{core::Map::[]=}{Invariant}(i, i);
-  } =>#t3;
-  core::print(aList);
-  core::print(aSet);
-  core::print(aMap);
-}
-static method oracle() → dynamic
-  return true;
-
-
-Extra constant evaluation status:
-Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.dart:11:26 -> IntConstant(-1)
-Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.dart:20:26 -> IntConstant(-1)
-Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.dart:29:29 -> IntConstant(-1)
-Evaluated: MethodInvocation @ org-dartlang-testcase:///control_flow_collection.dart:29:33 -> IntConstant(-1)
-Extra constant evaluation: evaluated: 158, effectively constant: 4
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart
deleted file mode 100644
index 030a68e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart
+++ /dev/null
@@ -1,274 +0,0 @@
-// 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.6
-
-// Oracle is generic to test the inference in conditions of if-elements.
-oracle<T>([T t]) => true;
-
-testIfElement(dynamic dynVar, List<int> listInt, List<double> listDouble,
-    Map<String, int> mapToInt, Map<String, double> mapToDouble) {
-  var list10 = [if (oracle("foo")) 42];
-  var set10 = {if (oracle("foo")) 42, null};
-  var map10 = {if (oracle("foo")) "bar": 42, "baz": null};
-  var list11 = [if (oracle("foo")) dynVar];
-  var set11 = {if (oracle("foo")) dynVar, null};
-  var map11 = {if (oracle("foo")) "bar": dynVar, "baz": null};
-  var list12 = [if (oracle("foo")) [42]];
-  var set12 = {if (oracle("foo")) [42], null};
-  var map12 = {if (oracle("foo")) "bar": [42], "baz": null};
-  var list20 = [if (oracle("foo")) ...[42]];
-  var set20 = {if (oracle("foo")) ...[42], null};
-  var map20 = {if (oracle("foo")) ...{"bar": 42}, "baz": null};
-  var list21 = [if (oracle("foo")) ...[dynVar]];
-  var set21 = {if (oracle("foo")) ...[dynVar], null};
-  var map21 = {if (oracle("foo")) ...{"bar": dynVar}, "baz": null};
-  var list22 = [if (oracle("foo")) ...[[42]]];
-  var set22 = {if (oracle("foo")) ...[[42]], null};
-  var map22 = {if (oracle("foo")) ...{"bar": [42]}, "baz": null};
-  var list30 = [if (oracle("foo")) if (oracle()) ...[42]];
-  var set30 = {if (oracle("foo")) if (oracle()) ...[42], null};
-  var map30 = {if (oracle("foo")) if (oracle()) ...{"bar": 42}, "baz": null};
-  var list31 = [if (oracle("foo")) if (oracle()) ...[dynVar]];
-  var set31 = {if (oracle("foo")) if (oracle()) ...[dynVar], null};
-  var map31 = {if (oracle("foo")) if (oracle()) ...{"bar": dynVar}, "baz": null};
-  var list33 = [if (oracle("foo")) if (oracle()) ...[[42]]];
-  var set33 = {if (oracle("foo")) if (oracle()) ...[[42]], null};
-  var map33 = {if (oracle("foo")) if (oracle()) ...{"bar": [42]}, "baz": null};
-  List<List<int>> list40 = [if (oracle("foo")) ...[[]]];
-  Set<List<int>> set40 = {if (oracle("foo")) ...[[]], null};
-  Map<String, List<int>> map40 = {if (oracle("foo")) ...{"bar", []}, "baz": null};
-  List<List<int>> list41 = [if (oracle("foo")) ...{[]}];
-  Set<List<int>> set41 = {if (oracle("foo")) ...{[]}, null};
-  List<List<int>> list42 = [if (oracle("foo")) if (oracle()) ...[[]]];
-  Set<List<int>> set42 = {if (oracle("foo")) if (oracle()) ...[[]], null};
-  Map<String, List<int>> map42 = {if (oracle("foo")) if (oracle()) ...{"bar": []}, "baz": null};
-  List<int> list50 = [if (oracle("foo")) ...[]];
-  Set<int> set50 = {if (oracle("foo")) ...[], null};
-  Map<String, int> map50 = {if (oracle("foo")) ...{}, "baz": null};
-  List<int> list51 = [if (oracle("foo")) ...{}];
-  Set<int> set51 = {if (oracle("foo")) ...{}, null};
-  List<int> list52 = [if (oracle("foo")) if (oracle()) ...[]];
-  Set<int> set52 = {if (oracle("foo")) if (oracle()) ...[], null};
-  Map<String, int> map52 = {if (oracle("foo")) if (oracle()) ...{}, "baz": null};
-  List<List<int>> list60 = [if (oracle("foo")) ...[[]]];
-  Set<List<int>> set60 = {if (oracle("foo")) ...[[]], null};
-  Map<String, List<int>> map60 = {if (oracle("foo")) ...{"bar": []}, "baz": null};
-  List<List<int>> list61 = [if (oracle("foo")) if (oracle()) ...[[]]];
-  Set<List<int>> set61 = {if (oracle("foo")) if (oracle()) ...[[]], null};
-  Map<String, List<int>> map61 = {if (oracle("foo")) if (oracle()) ...{"bar": []}, "baz": null};
-  List<List<int>> list70 = [if (oracle("foo")) []];
-  Set<List<int>> set70 = {if (oracle("foo")) [], null};
-  List<List<int>> list71 = [if (oracle("foo")) if (oracle()) []];
-  Set<List<int>> set71 = {if (oracle("foo")) if (oracle()) [], null};
-  var list80 = [if (oracle("foo")) 42 else 3.14];
-  var set80 = {if (oracle("foo")) 42 else 3.14, null};
-  var map80 = {if (oracle("foo")) "bar": 42 else "bar": 3.14, "baz": null};
-  var list81 = [if (oracle("foo")) ...listInt else ...listDouble];
-  var set81 = {if (oracle("foo")) ...listInt else ...listDouble, null};
-  var map81 = {if (oracle("foo")) ...mapToInt else ...mapToDouble, "baz": null};
-  var list82 = [if (oracle("foo")) ...listInt else ...dynVar];
-  var set82 = {if (oracle("foo")) ...listInt else ...dynVar, null};
-  var map82 = {if (oracle("foo")) ...mapToInt else ...dynVar, null};
-  var list83 = [if (oracle("foo")) 42 else ...listDouble];
-  var set83 = {if (oracle("foo")) ...listInt else 3.14, null};
-  var map83 = {if (oracle("foo")) ...mapToInt else "bar": 3.14, "baz": null};
-  List<int> list90 = [if (oracle("foo")) dynVar];
-  Set<int> set90 = {if (oracle("foo")) dynVar, null};
-  Map<String, int> map90 = {if (oracle("foo")) "bar": dynVar, "baz": null};
-  List<int> list91 = [if (oracle("foo")) ...dynVar];
-  Set<int> set91 = {if (oracle("foo")) ...dynVar, null};
-  Map<String, int> map91 = {if (oracle("foo")) ...dynVar, "baz": null};
-  List<int> list100 = [if (dynVar) 42];
-  Set<int> set100 = {if (dynVar) 42};
-  Map<int, int> map100 = {if (dynVar) 42: 42};
-}
-
-testIfElementErrors(Map<int, int> map) {
-  <int>[if (oracle("foo")) "bar"];
-  <int>{if (oracle("foo")) "bar", null};
-  <String, int>{if (oracle("foo")) "bar": "bar", "baz": null};
-  <int>[if (oracle("foo")) ...["bar"]];
-  <int>{if (oracle("foo")) ...["bar"], null};
-  <String, int>{if (oracle("foo")) ...{"bar": "bar"}, "baz": null};
-  <int>[if (oracle("foo")) ...map];
-  <int>{if (oracle("foo")) ...map, null};
-  <String, int>{if (oracle("foo")) ...["bar"], "baz": null};
-  <String>[if (oracle("foo")) 42 else 3.14];
-  <String>{if (oracle("foo")) 42 else 3.14, null};
-  <String, String>{if (oracle("foo")) "bar": 42 else "baz": 3.14, "baz": null};
-  <int>[if (oracle("foo")) ...map else 42];
-  <int>{if (oracle("foo")) ...map else 42, null};
-  <String, int>{if (oracle("foo")) ...[42] else "bar": 42, "baz": null};
-  <int>[if (oracle("foo")) 42 else ...map];
-  <int>{if (oracle("foo")) ...map else 42, null};
-  <String, int>{if (oracle("foo")) "bar": 42 else ...[42], "baz": null};
-
-  Set<dynamic> set10 = {if (oracle("foo")) 42 else "bar": 3.14};
-  Map<dynamic, dynamic> map10 = {if (oracle("foo")) 42 else "bar": 3.14};
-  Set<dynamic> set11 = {if (oracle("foo")) "bar": 3.14 else 42};
-  Map<dynamic, dynamic> map11 = {if (oracle("foo")) "bar": 3.14 else 42};
-  var map12 = {if (oracle("foo")) 42 else "bar": 3.14};
-  var map13 = {if (oracle("foo")) "bar": 3.14 else 42};
-  List<int> list20 = [if (42) 42];
-  Set<int> set20 = {if (42) 42};
-  Map<int, int> map30 = {if (42) 42: 42};
-  List<String> list40 = <String>[if (oracle("foo")) true else 42];
-  Set<String> set40 = <String>{if (oracle("foo")) true else 42};
-  Map<String, int> map40 = <String, int>{if (oracle("foo")) true: 42 else 42: 42};
-  Map<int, String> map41 = <int, String>{if (oracle("foo")) 42: true else 42: 42};
-}
-
-testForElement(dynamic dynVar, List<int> listInt, List<double> listDouble, int
-    index, Map<String, int> mapStringInt, Map<String, double> mapStringDouble) {
-  var list10 = [for (int i = 0; oracle("foo"); i++) 42];
-  var set10 = {for (int i = 0; oracle("foo"); i++) 42, null};
-  var map10 = {for (int i = 0; oracle("foo"); i++) "bar": 42, "baz": null};
-  var list11 = [for (int i = 0; oracle("foo"); i++) dynVar];
-  var set11 = {for (int i = 0; oracle("foo"); i++) dynVar, null};
-  var map11 = {for (int i = 0; oracle("foo"); i++) "bar": dynVar, "baz": null};
-  var list12 = [for (int i = 0; oracle("foo"); i++) [42]];
-  var set12 = {for (int i = 0; oracle("foo"); i++) [42], null};
-  var map12 = {for (int i = 0; oracle("foo"); i++) "bar": [42], "baz": null};
-  var list20 = [for (int i = 0; oracle("foo"); i++) ...[42]];
-  var set20 = {for (int i = 0; oracle("foo"); i++) ...[42], null};
-  var map20 = {for (int i = 0; oracle("foo"); i++) ...{"bar": 42}, "baz": null};
-  var list21 = [for (int i = 0; oracle("foo"); i++) ...[dynVar]];
-  var set21 = {for (int i = 0; oracle("foo"); i++) ...[dynVar], null};
-  var map21 = {for (int i = 0; oracle("foo"); i++) ...{"bar": dynVar}, "baz": null};
-  var list22 = [for (int i = 0; oracle("foo"); i++) ...[[42]]];
-  var set22 = {for (int i = 0; oracle("foo"); i++) ...[[42]], null};
-  var map22 = {for (int i = 0; oracle("foo"); i++) ...{"bar": [42]}, "baz": null};
-  var list30 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...[42]];
-  var set30 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...[42], null};
-  var map30 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...{"bar": 42}, "baz": null};
-  var list31 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...[dynVar]];
-  var set31 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...[dynVar], null};
-  var map31 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...{"bar": dynVar}, "baz": null};
-  var list33 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...[[42]]];
-  var set33 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...[[42]], null};
-  var map33 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...{"bar": [42]}, "baz": null};
-  List<List<int>> list40 = [for (int i = 0; oracle("foo"); i++) ...[[]]];
-  Set<List<int>> set40 = {for (int i = 0; oracle("foo"); i++) ...[[]], null};
-  Map<String, List<int>> map40 = {for (int i = 0; oracle("foo"); i++) ...{"bar": []}, "baz": null};
-  List<List<int>> list41 = [for (int i = 0; oracle("foo"); i++) ...{[]}];
-  Set<List<int>> set41 = {for (int i = 0; oracle("foo"); i++) ...{[]}, null};
-  List<List<int>> list42 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...[[]]];
-  Set<List<int>> set42 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...[[]], null};
-  Map<String, List<int>> map42 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...{"bar": []}, "baz": null};
-  List<int> list50 = [for (int i = 0; oracle("foo"); i++) ...[]];
-  Set<int> set50 = {for (int i = 0; oracle("foo"); i++) ...[], null};
-  Map<String, int> map50 = {for (int i = 0; oracle("foo"); i++) ...{}, "baz": null};
-  List<int> list51 = [for (int i = 0; oracle("foo"); i++) ...{}];
-  Set<int> set51 = {for (int i = 0; oracle("foo"); i++) ...{}, null};
-  List<int> list52 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...[]];
-  Set<int> set52 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...[], null};
-  List<List<int>> list60 = [for (int i = 0; oracle("foo"); i++) ...[[]]];
-  Set<List<int>> set60 = {for (int i = 0; oracle("foo"); i++) ...[[]], null};
-  Map<String, List<int>> map60 = {for (int i = 0; oracle("foo"); i++) ...{"bar": []}, "baz": null};
-  List<List<int>> list61 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...[[]]];
-  Set<List<int>> set61 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...[[]], null};
-  Map<String, List<int>> map61 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...{"bar": []}, "baz": null};
-  List<List<int>> list70 = [for (int i = 0; oracle("foo"); i++) []];
-  Set<List<int>> set70 = {for (int i = 0; oracle("foo"); i++) [], null};
-  Map<String, List<int>> map70 = {for (int i = 0; oracle("foo"); i++) "bar": [], "baz": null};
-  List<List<int>> list71 = [for (int i = 0; oracle("foo"); i++) if (oracle()) []];
-  Set<List<int>> set71 = {for (int i = 0; oracle("foo"); i++) if (oracle()) [], null};
-  Map<String, List<int>> map71 = {for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": [], "baz": null};
-  var list80 = [for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14];
-  var set80 = {for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14, null};
-  var map80 = {for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else "bar": 3.14, "baz": null};
-  var list81 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...listInt else ...listDouble];
-  var set81 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...listInt else ...listDouble, null};
-  var map81 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...mapStringInt else ...mapStringDouble, "baz": null};
-  var list82 = [for (int i = 0; oracle("foo"); i++) if (oracle()) ...listInt else ...dynVar];
-  var set82 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...listInt else ...dynVar, null};
-  var map82 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...mapStringInt else ...dynVar, "baz": null};
-  var list83 = [for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else ...listDouble];
-  var set83 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...listInt else 3.14, null};
-  var map83 = {for (int i = 0; oracle("foo"); i++) if (oracle()) ...mapStringInt else "bar": 3.14, "baz": null};
-  List<int> list90 = [for (int i = 0; oracle("foo"); i++) dynVar];
-  Set<int> set90 = {for (int i = 0; oracle("foo"); i++) dynVar, null};
-  Map<String, int> map90 = {for (int i = 0; oracle("foo"); i++) "bar": dynVar, "baz": null};
-  List<int> list91 = [for (int i = 0; oracle("foo"); i++) ...dynVar];
-  Set<int> set91 = {for (int i = 0; oracle("foo"); i++) ...dynVar, null};
-  Map<String, int> map91 = {for (int i = 0; oracle("foo"); i++) ...dynVar, "baz": null};
-  List<int> list100 = <int>[for (index = 0; oracle("foo"); index++) 42];
-  Set<int> set100 = <int>{for (index = 0; oracle("foo"); index++) 42};
-  Map<String, int> map100 = <String, int>{for (index = 0; oracle("foo"); index++) "bar": 42};
-  var list110 = [for (var i in [1, 2, 3]) i];
-  var set110 = {for (var i in [1, 2, 3]) i, null};
-  var map110 = {for (var i in [1, 2, 3]) "bar": i, "baz": null};
-  List<int> list120 = [for (var i in dynVar) i];
-  Set<int> set120 = {for (var i in dynVar) i, null};
-  Map<String, int> map120 = {for (var i in dynVar) "bar": i, "baz": null};
-  List<int> list130 = [for (var i = 1; i < 2; i++) i];
-  Set<int> set130 = {for (var i = 1; i < 2; i++) i};
-  Map<int, int> map130 = {for (var i = 1; i < 2; i++) i: i};
-}
-
-testForElementErrors(Map<int, int> map, List<int> list) async {
-  <int>[for (int i = 0; oracle("foo"); i++) "bar"];
-  <int>{for (int i = 0; oracle("foo"); i++) "bar", null};
-  <int, int>{for (int i = 0; oracle("foo"); i++) "bar": "bar", "baz": null};
-  <int>[for (int i = 0; oracle("foo"); i++) ...["bar"]];
-  <int>{for (int i = 0; oracle("foo"); i++) ...["bar"], null};
-  <int, int>{for (int i = 0; oracle("foo"); i++) ...{"bar": "bar"}, "baz": null};
-  <int>[for (int i = 0; oracle("foo"); i++) ...map];
-  <int>{for (int i = 0; oracle("foo"); i++) ...map, null};
-  <int, int>{for (int i = 0; oracle("foo"); i++) ...list, 42: null};
-  <String>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14];
-  <String>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14, null};
-  <String, String>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else "bar": 3.14, "baz": null};
-  <int>[for (int i = 0; oracle("foo"); i++) if (oracle()) ...map else 42];
-  <int>{for (int i = 0; oracle("foo"); i++) if (oracle()) ...map else 42, null};
-  <String, int>{for (int i = 0; oracle("foo"); i++) if (oracle()) ...list else "bar": 42, "baz": null};
-  <int>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else ...map];
-  <int>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else ...map, null};
-  <String, int>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else ...list, "baz": null};
-
-  final i = 0;
-  <int>[for (i in <int>[1]) i];
-  <int>{for (i in <int>[1]) i, null};
-	<String, int>{for (i in <int>[1]) "bar": i, "baz": null};
-
-  var list10 = [for (var i in "not iterable") i];
-  var set10 = {for (var i in "not iterable") i, null};
-  var map10 = {for (var i in "not iterable") "bar": i, "baz": null};
-  var list20 = [for (int i in ["not", "int"]) i];
-  var set20 = {for (int i in ["not", "int"]) i, null};
-  var map20 = {for (int i in ["not", "int"]) "bar": i, "baz": null};
-  var list30 = [await for (var i in "not stream") i];
-  var set30 = {await for (var i in "not stream") i, null};
-  var map30 = {await for (var i in "not stream") "bar": i, "baz": null};
-  var list40 = [await for (int i in Stream.fromIterable(["not", "int"])) i];
-  var set40 = {await for (int i in Stream.fromIterable(["not", "int"])) i, null};
-  var map40 = {await for (int i in Stream.fromIterable(["not", "int"])) "bar": i, "baz": null};
-  var list50 = [await for (;;) 42];
-  var set50 = {await for (;;) 42, null};
-  var map50 = {await for (;;) "bar": 42, "baz": null};
-  var list60 = [for (; "not bool";) 42];
-  var set60 = {for (; "not bool";) 42, null};
-  var map60 = {for (; "not bool";) "bar": 42, "baz": null};
-}
-
-testForElementErrorsNotAsync(Stream<int> stream) {
-  <int>[await for (int i in stream) i];
-  <int>{await for (int i in stream) i};
-  <String, int>{await for (int i in stream) "bar": i};
-}
-
-class A {}
-
-class B extends A {
-  int get foo => 42;
-}
-
-testPromotion(A a) {
-  List<int> list10 = [if (a is B) a.foo];
-  Set<int> set10 = {if (a is B) a.foo};
-  Map<int, int> map10 = {if (a is B) a.foo: a.foo};
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.textual_outline.expect
deleted file mode 100644
index 3974366..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.textual_outline.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-// @dart = 2.6
-oracle<T>([T t]) => true;
-testIfElement(dynamic dynVar, List<int> listInt, List<double> listDouble,
-    Map<String, int> mapToInt, Map<String, double> mapToDouble) {}
-testIfElementErrors(Map<int, int> map) {}
-testForElement(
-    dynamic dynVar,
-    List<int> listInt,
-    List<double> listDouble,
-    int index,
-    Map<String, int> mapStringInt,
-    Map<String, double> mapStringDouble) {}
-testForElementErrors(Map<int, int> map, List<int> list) async {}
-testForElementErrorsNotAsync(Stream<int> stream) {}
-
-class A {}
-
-class B extends A {
-  int get foo => 42;
-}
-
-testPromotion(A a) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.textual_outline_modelled.expect
deleted file mode 100644
index 1d03b2c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {
-  int get foo => 42;
-}
-
-main() {}
-oracle<T>([T t]) => true;
-testForElement(
-    dynamic dynVar,
-    List<int> listInt,
-    List<double> listDouble,
-    int index,
-    Map<String, int> mapStringInt,
-    Map<String, double> mapStringDouble) {}
-testForElementErrors(Map<int, int> map, List<int> list) async {}
-testForElementErrorsNotAsync(Stream<int> stream) {}
-testIfElement(dynamic dynVar, List<int> listInt, List<double> listDouble,
-    Map<String, int> mapToInt, Map<String, double> mapToDouble) {}
-testIfElementErrors(Map<int, int> map) {}
-testPromotion(A a) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.expect
deleted file mode 100644
index c3d3cee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.expect
+++ /dev/null
@@ -1,2158 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:41:34: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   Map<String, List<int>> map40 = {if (oracle("foo")) ...{"bar", []}, "baz": null};
-//                                  ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:73:38: Error: Unexpected type 'Map<String, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   var map82 = {if (oracle("foo")) ...mapToInt else ...dynVar, null};
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:108:44: Error: Expected ':' after this.
-//   Set<dynamic> set10 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:109:53: Error: Expected ':' after this.
-//   Map<dynamic, dynamic> map10 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:110:61: Error: Expected ':' after this.
-//   Set<dynamic> set11 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:111:70: Error: Expected ':' after this.
-//   Map<dynamic, dynamic> map11 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:112:35: Error: Expected ':' after this.
-//   var map12 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:113:52: Error: Expected ':' after this.
-//   var map13 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:89:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[if (oracle("foo")) "bar"];
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:90:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{if (oracle("foo")) "bar", null};
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:91:43: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <String, int>{if (oracle("foo")) "bar": "bar", "baz": null};
-//                                           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:92:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[if (oracle("foo")) ...["bar"]];
-//                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:93:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{if (oracle("foo")) ...["bar"], null};
-//                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:94:47: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <String, int>{if (oracle("foo")) ...{"bar": "bar"}, "baz": null};
-//                                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:95:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[if (oracle("foo")) ...map];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:96:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{if (oracle("foo")) ...map, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:97:39: Error: Unexpected type 'List<String>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{if (oracle("foo")) ...["bar"], "baz": null};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>[if (oracle("foo")) 42 else 3.14];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>[if (oracle("foo")) 42 else 3.14];
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>{if (oracle("foo")) 42 else 3.14, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>{if (oracle("foo")) 42 else 3.14, null};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:46: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String, String>{if (oracle("foo")) "bar": 42 else "baz": 3.14, "baz": null};
-//                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:61: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String, String>{if (oracle("foo")) "bar": 42 else "baz": 3.14, "baz": null};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:101:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[if (oracle("foo")) ...map else 42];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:102:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{if (oracle("foo")) ...map else 42, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:103:39: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{if (oracle("foo")) ...[42] else "bar": 42, "baz": null};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:104:39: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[if (oracle("foo")) 42 else ...map];
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:105:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{if (oracle("foo")) ...map else 42, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:106:54: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{if (oracle("foo")) "bar": 42 else ...[42], "baz": null};
-//                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:108:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   Set<dynamic> set10 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:110:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   Set<dynamic> set11 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:114:27: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-//   List<int> list20 = [if (42) 42];
-//                           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:115:25: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-//   Set<int> set20 = {if (42) 42};
-//                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:116:30: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-//   Map<int, int> map30 = {if (42) 42: 42};
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:53: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   List<String> list40 = <String>[if (oracle("foo")) true else 42];
-//                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:63: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   List<String> list40 = <String>[if (oracle("foo")) true else 42];
-//                                                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:51: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   Set<String> set40 = <String>{if (oracle("foo")) true else 42};
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:61: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   Set<String> set40 = <String>{if (oracle("foo")) true else 42};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:61: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   Map<String, int> map40 = <String, int>{if (oracle("foo")) true: 42 else 42: 42};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:75: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   Map<String, int> map40 = <String, int>{if (oracle("foo")) true: 42 else 42: 42};
-//                                                                           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:65: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   Map<int, String> map41 = <int, String>{if (oracle("foo")) 42: true else 42: 42};
-//                                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:79: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   Map<int, String> map41 = <int, String>{if (oracle("foo")) 42: true else 42: 42};
-//                                                                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:232:14: Error: Can't assign to the final variable 'i'.
-//   <int>[for (i in <int>[1]) i];
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:233:14: Error: Can't assign to the final variable 'i'.
-//   <int>{for (i in <int>[1]) i, null};
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:234:21: Error: Can't assign to the final variable 'i'.
-// 	<String, int>{for (i in <int>[1]) "bar": i, "baz": null};
-// 	                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:248:17: Error: The keyword 'await' isn't allowed for a normal 'for' statement.
-// Try removing the keyword, or use a for-each statement.
-//   var list50 = [await for (;;) 42];
-//                 ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:249:16: Error: The keyword 'await' isn't allowed for a normal 'for' statement.
-// Try removing the keyword, or use a for-each statement.
-//   var set50 = {await for (;;) 42, null};
-//                ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:250:16: Error: The keyword 'await' isn't allowed for a normal 'for' statement.
-// Try removing the keyword, or use a for-each statement.
-//   var map50 = {await for (;;) "bar": 42, "baz": null};
-//                ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:212:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[for (int i = 0; oracle("foo"); i++) "bar"];
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:213:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{for (int i = 0; oracle("foo"); i++) "bar", null};
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:50: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) "bar": "bar", "baz": null};
-//                                                  ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) "bar": "bar", "baz": null};
-//                                                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) "bar": "bar", "baz": null};
-//                                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:215:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[for (int i = 0; oracle("foo"); i++) ...["bar"]];
-//                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:216:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{for (int i = 0; oracle("foo"); i++) ...["bar"], null};
-//                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:54: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...{"bar": "bar"}, "baz": null};
-//                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:61: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...{"bar": "bar"}, "baz": null};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:69: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...{"bar": "bar"}, "baz": null};
-//                                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:218:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[for (int i = 0; oracle("foo"); i++) ...map];
-//                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:219:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{for (int i = 0; oracle("foo"); i++) ...map, null};
-//                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:220:53: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...list, 42: null};
-//                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14];
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14];
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14, null};
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14, null};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:77: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String, String>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else "bar": 3.14, "baz": null};
-//                                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:92: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String, String>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else "bar": 3.14, "baz": null};
-//                                                                                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:224:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[for (int i = 0; oracle("foo"); i++) if (oracle()) ...map else 42];
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:225:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{for (int i = 0; oracle("foo"); i++) if (oracle()) ...map else 42, null};
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:226:70: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{for (int i = 0; oracle("foo"); i++) if (oracle()) ...list else "bar": 42, "baz": null};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:227:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else ...map];
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:228:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else ...map, null};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:229:85: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else ...list, "baz": null};
-//                                                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:236:31: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
-//  - 'Iterable' is from 'dart:core'.
-//   var list10 = [for (var i in "not iterable") i];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:237:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
-//  - 'Iterable' is from 'dart:core'.
-//   var set10 = {for (var i in "not iterable") i, null};
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:238:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
-//  - 'Iterable' is from 'dart:core'.
-//   var map10 = {for (var i in "not iterable") "bar": i, "baz": null};
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list20 = [for (int i in ["not", "int"]) i];
-//                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:39: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list20 = [for (int i in ["not", "int"]) i];
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set20 = {for (int i in ["not", "int"]) i, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set20 = {for (int i in ["not", "int"]) i, null};
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map20 = {for (int i in ["not", "int"]) "bar": i, "baz": null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map20 = {for (int i in ["not", "int"]) "bar": i, "baz": null};
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:242:37: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
-//  - 'Stream' is from 'dart:async'.
-//   var list30 = [await for (var i in "not stream") i];
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:243:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
-//  - 'Stream' is from 'dart:async'.
-//   var set30 = {await for (var i in "not stream") i, null};
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:244:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
-//  - 'Stream' is from 'dart:async'.
-//   var map30 = {await for (var i in "not stream") "bar": i, "baz": null};
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list40 = [await for (int i in Stream.fromIterable(["not", "int"])) i];
-//                                                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:65: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list40 = [await for (int i in Stream.fromIterable(["not", "int"])) i];
-//                                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set40 = {await for (int i in Stream.fromIterable(["not", "int"])) i, null};
-//                                                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set40 = {await for (int i in Stream.fromIterable(["not", "int"])) i, null};
-//                                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map40 = {await for (int i in Stream.fromIterable(["not", "int"])) "bar": i, "baz": null};
-//                                                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map40 = {await for (int i in Stream.fromIterable(["not", "int"])) "bar": i, "baz": null};
-//                                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:251:24: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-//   var list60 = [for (; "not bool";) 42];
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:252:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-//   var set60 = {for (; "not bool";) 42, null};
-//                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:253:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-//   var map60 = {for (; "not bool";) "bar": 42, "baz": null};
-//                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:257:26: Error: The asynchronous for-in can only be used in functions marked with 'async' or 'async*'.
-// Try marking the function body with either 'async' or 'async*', or removing the 'await' before the for loop.
-//   <int>[await for (int i in stream) i];
-//                          ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:258:26: Error: The asynchronous for-in can only be used in functions marked with 'async' or 'async*'.
-// Try marking the function body with either 'async' or 'async*', or removing the 'await' before the for loop.
-//   <int>{await for (int i in stream) i};
-//                          ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:259:34: Error: The asynchronous for-in can only be used in functions marked with 'async' or 'async*'.
-// Try marking the function body with either 'async' or 'async*', or removing the 'await' before the for loop.
-//   <String, int>{await for (int i in stream) "bar": i};
-//                                  ^^
-//
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-import "dart:async" as asy;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  get foo() → core::int*
-    return 42;
-}
-static method oracle<T extends core::Object* = dynamic>([self::oracle::T* t = #C1]) → dynamic
-  return true;
-static method testIfElement(dynamic dynVar, core::List<core::int*>* listInt, core::List<core::double*>* listDouble, core::Map<core::String*, core::int*>* mapToInt, core::Map<core::String*, core::double*>* mapToDouble) → dynamic {
-  core::List<core::int*>* list10 = block {
-    final core::List<core::int*>* #t1 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t1.{core::List::add}{Invariant}(42);
-  } =>#t1;
-  core::Set<core::int*>* set10 = block {
-    final core::Set<core::int*>* #t2 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t2.{core::Set::add}{Invariant}(42);
-    #t2.{core::Set::add}{Invariant}(null);
-  } =>#t2;
-  core::Map<core::String*, core::int*>* map10 = block {
-    final core::Map<core::String*, core::int*>* #t3 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t3.{core::Map::[]=}{Invariant}("bar", 42);
-    #t3.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t3;
-  core::List<dynamic>* list11 = block {
-    final core::List<dynamic>* #t4 = <dynamic>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t4.{core::List::add}{Invariant}(dynVar);
-  } =>#t4;
-  core::Set<dynamic>* set11 = block {
-    final core::Set<dynamic>* #t5 = col::LinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t5.{core::Set::add}{Invariant}(dynVar);
-    #t5.{core::Set::add}{Invariant}(null);
-  } =>#t5;
-  core::Map<core::String*, dynamic>* map11 = block {
-    final core::Map<core::String*, dynamic>* #t6 = <core::String*, dynamic>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t6.{core::Map::[]=}{Invariant}("bar", dynVar);
-    #t6.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t6;
-  core::List<core::List<core::int*>*>* list12 = block {
-    final core::List<core::List<core::int*>*>* #t7 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t7.{core::List::add}{Invariant}(<core::int*>[42]);
-  } =>#t7;
-  core::Set<core::List<core::int*>*>* set12 = block {
-    final core::Set<core::List<core::int*>*>* #t8 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t8.{core::Set::add}{Invariant}(<core::int*>[42]);
-    #t8.{core::Set::add}{Invariant}(null);
-  } =>#t8;
-  core::Map<core::String*, core::List<core::int*>*>* map12 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t9 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t9.{core::Map::[]=}{Invariant}("bar", <core::int*>[42]);
-    #t9.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t9;
-  core::List<core::int*>* list20 = block {
-    final core::List<core::int*>* #t10 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t10.{core::List::addAll}{Invariant}(<core::int*>[42]);
-  } =>#t10;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t11 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t11.{core::Set::addAll}{Invariant}(<core::int*>[42]);
-    #t11.{core::Set::add}{Invariant}(null);
-  } =>#t11;
-  core::Map<core::String*, core::int*>* map20 = block {
-    final core::Map<core::String*, core::int*>* #t12 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, core::int*>* #t13 in <core::String*, core::int*>{"bar": 42}.{core::Map::entries})
-        #t12.{core::Map::[]=}{Invariant}(#t13.{core::MapEntry::key}, #t13.{core::MapEntry::value});
-    #t12.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t12;
-  core::List<dynamic>* list21 = block {
-    final core::List<dynamic>* #t14 = <dynamic>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t14.{core::List::addAll}{Invariant}(<dynamic>[dynVar]);
-  } =>#t14;
-  core::Set<dynamic>* set21 = block {
-    final core::Set<dynamic>* #t15 = col::LinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t15.{core::Set::addAll}{Invariant}(<dynamic>[dynVar]);
-    #t15.{core::Set::add}{Invariant}(null);
-  } =>#t15;
-  core::Map<core::String*, dynamic>* map21 = block {
-    final core::Map<core::String*, dynamic>* #t16 = <core::String*, dynamic>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, dynamic>* #t17 in <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries})
-        #t16.{core::Map::[]=}{Invariant}(#t17.{core::MapEntry::key}, #t17.{core::MapEntry::value});
-    #t16.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t16;
-  core::List<core::List<core::int*>*>* list22 = block {
-    final core::List<core::List<core::int*>*>* #t18 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t18.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-  } =>#t18;
-  core::Set<core::List<core::int*>*>* set22 = block {
-    final core::Set<core::List<core::int*>*>* #t19 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t19.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-    #t19.{core::Set::add}{Invariant}(null);
-  } =>#t19;
-  core::Map<core::String*, core::List<core::int*>*>* map22 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t20 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t21 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[42]}.{core::Map::entries})
-        #t20.{core::Map::[]=}{Invariant}(#t21.{core::MapEntry::key}, #t21.{core::MapEntry::value});
-    #t20.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t20;
-  core::List<core::int*>* list30 = block {
-    final core::List<core::int*>* #t22 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t22.{core::List::addAll}{Invariant}(<core::int*>[42]);
-  } =>#t22;
-  core::Set<core::int*>* set30 = block {
-    final core::Set<core::int*>* #t23 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t23.{core::Set::addAll}{Invariant}(<core::int*>[42]);
-    #t23.{core::Set::add}{Invariant}(null);
-  } =>#t23;
-  core::Map<core::String*, core::int*>* map30 = block {
-    final core::Map<core::String*, core::int*>* #t24 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::int*>* #t25 in <core::String*, core::int*>{"bar": 42}.{core::Map::entries})
-          #t24.{core::Map::[]=}{Invariant}(#t25.{core::MapEntry::key}, #t25.{core::MapEntry::value});
-    #t24.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t24;
-  core::List<dynamic>* list31 = block {
-    final core::List<dynamic>* #t26 = <dynamic>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t26.{core::List::addAll}{Invariant}(<dynamic>[dynVar]);
-  } =>#t26;
-  core::Set<dynamic>* set31 = block {
-    final core::Set<dynamic>* #t27 = col::LinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t27.{core::Set::addAll}{Invariant}(<dynamic>[dynVar]);
-    #t27.{core::Set::add}{Invariant}(null);
-  } =>#t27;
-  core::Map<core::String*, dynamic>* map31 = block {
-    final core::Map<core::String*, dynamic>* #t28 = <core::String*, dynamic>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, dynamic>* #t29 in <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries})
-          #t28.{core::Map::[]=}{Invariant}(#t29.{core::MapEntry::key}, #t29.{core::MapEntry::value});
-    #t28.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t28;
-  core::List<core::List<core::int*>*>* list33 = block {
-    final core::List<core::List<core::int*>*>* #t30 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t30.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-  } =>#t30;
-  core::Set<core::List<core::int*>*>* set33 = block {
-    final core::Set<core::List<core::int*>*>* #t31 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t31.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-    #t31.{core::Set::add}{Invariant}(null);
-  } =>#t31;
-  core::Map<core::String*, core::List<core::int*>*>* map33 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t32 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t33 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[42]}.{core::Map::entries})
-          #t32.{core::Map::[]=}{Invariant}(#t33.{core::MapEntry::key}, #t33.{core::MapEntry::value});
-    #t32.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t32;
-  core::List<core::List<core::int*>*>* list40 = block {
-    final core::List<core::List<core::int*>*>* #t34 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t34.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t34;
-  core::Set<core::List<core::int*>*>* set40 = block {
-    final core::Set<core::List<core::int*>*>* #t35 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t35.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t35.{core::Set::add}{Invariant}(null);
-  } =>#t35;
-  core::Map<core::String*, core::List<core::int*>*>* map40 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:41:34: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  Map<String, List<int>> map40 = {if (oracle(\"foo\")) ...{\"bar\", []}, \"baz\": null};
-                                 ^";
-  core::List<core::List<core::int*>*>* list41 = block {
-    final core::List<core::List<core::int*>*>* #t36 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t36.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t37 = col::LinkedHashSet::•<core::List<core::int*>*>();
-        #t37.{core::Set::add}{Invariant}(<core::int*>[]);
-      } =>#t37);
-  } =>#t36;
-  core::Set<core::List<core::int*>*>* set41 = block {
-    final core::Set<core::List<core::int*>*>* #t38 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t38.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t39 = col::LinkedHashSet::•<core::List<core::int*>*>();
-        #t39.{core::Set::add}{Invariant}(<core::int*>[]);
-      } =>#t39);
-    #t38.{core::Set::add}{Invariant}(null);
-  } =>#t38;
-  core::List<core::List<core::int*>*>* list42 = block {
-    final core::List<core::List<core::int*>*>* #t40 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t40.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t40;
-  core::Set<core::List<core::int*>*>* set42 = block {
-    final core::Set<core::List<core::int*>*>* #t41 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t41.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t41.{core::Set::add}{Invariant}(null);
-  } =>#t41;
-  core::Map<core::String*, core::List<core::int*>*>* map42 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t42 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t43 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[]}.{core::Map::entries})
-          #t42.{core::Map::[]=}{Invariant}(#t43.{core::MapEntry::key}, #t43.{core::MapEntry::value});
-    #t42.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t42;
-  core::List<core::int*>* list50 = block {
-    final core::List<core::int*>* #t44 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t44.{core::List::addAll}{Invariant}(<core::int*>[]);
-  } =>#t44;
-  core::Set<core::int*>* set50 = block {
-    final core::Set<core::int*>* #t45 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t45.{core::Set::addAll}{Invariant}(<core::int*>[]);
-    #t45.{core::Set::add}{Invariant}(null);
-  } =>#t45;
-  core::Map<core::String*, core::int*>* map50 = block {
-    final core::Map<core::String*, core::int*>* #t46 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, core::int*>* #t47 in <core::String*, core::int*>{}.{core::Map::entries})
-        #t46.{core::Map::[]=}{Invariant}(#t47.{core::MapEntry::key}, #t47.{core::MapEntry::value});
-    #t46.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t46;
-  core::List<core::int*>* list51 = block {
-    final core::List<core::int*>* #t48 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t48.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t49 = col::LinkedHashSet::•<core::int*>();
-      } =>#t49);
-  } =>#t48;
-  core::Set<core::int*>* set51 = block {
-    final core::Set<core::int*>* #t50 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t50.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t51 = col::LinkedHashSet::•<core::int*>();
-      } =>#t51);
-    #t50.{core::Set::add}{Invariant}(null);
-  } =>#t50;
-  core::List<core::int*>* list52 = block {
-    final core::List<core::int*>* #t52 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t52.{core::List::addAll}{Invariant}(<core::int*>[]);
-  } =>#t52;
-  core::Set<core::int*>* set52 = block {
-    final core::Set<core::int*>* #t53 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t53.{core::Set::addAll}{Invariant}(<core::int*>[]);
-    #t53.{core::Set::add}{Invariant}(null);
-  } =>#t53;
-  core::Map<core::String*, core::int*>* map52 = block {
-    final core::Map<core::String*, core::int*>* #t54 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::int*>* #t55 in <core::String*, core::int*>{}.{core::Map::entries})
-          #t54.{core::Map::[]=}{Invariant}(#t55.{core::MapEntry::key}, #t55.{core::MapEntry::value});
-    #t54.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t54;
-  core::List<core::List<core::int*>*>* list60 = block {
-    final core::List<core::List<core::int*>*>* #t56 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t56.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t56;
-  core::Set<core::List<core::int*>*>* set60 = block {
-    final core::Set<core::List<core::int*>*>* #t57 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t57.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t57.{core::Set::add}{Invariant}(null);
-  } =>#t57;
-  core::Map<core::String*, core::List<core::int*>*>* map60 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t58 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t59 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[]}.{core::Map::entries})
-        #t58.{core::Map::[]=}{Invariant}(#t59.{core::MapEntry::key}, #t59.{core::MapEntry::value});
-    #t58.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t58;
-  core::List<core::List<core::int*>*>* list61 = block {
-    final core::List<core::List<core::int*>*>* #t60 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t60.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t60;
-  core::Set<core::List<core::int*>*>* set61 = block {
-    final core::Set<core::List<core::int*>*>* #t61 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t61.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t61.{core::Set::add}{Invariant}(null);
-  } =>#t61;
-  core::Map<core::String*, core::List<core::int*>*>* map61 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t62 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t63 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[]}.{core::Map::entries})
-          #t62.{core::Map::[]=}{Invariant}(#t63.{core::MapEntry::key}, #t63.{core::MapEntry::value});
-    #t62.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t62;
-  core::List<core::List<core::int*>*>* list70 = block {
-    final core::List<core::List<core::int*>*>* #t64 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t64.{core::List::add}{Invariant}(<core::int*>[]);
-  } =>#t64;
-  core::Set<core::List<core::int*>*>* set70 = block {
-    final core::Set<core::List<core::int*>*>* #t65 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t65.{core::Set::add}{Invariant}(<core::int*>[]);
-    #t65.{core::Set::add}{Invariant}(null);
-  } =>#t65;
-  core::List<core::List<core::int*>*>* list71 = block {
-    final core::List<core::List<core::int*>*>* #t66 = <core::List<core::int*>*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t66.{core::List::add}{Invariant}(<core::int*>[]);
-  } =>#t66;
-  core::Set<core::List<core::int*>*>* set71 = block {
-    final core::Set<core::List<core::int*>*>* #t67 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t67.{core::Set::add}{Invariant}(<core::int*>[]);
-    #t67.{core::Set::add}{Invariant}(null);
-  } =>#t67;
-  core::List<core::num*>* list80 = block {
-    final core::List<core::num*>* #t68 = <core::num*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t68.{core::List::add}{Invariant}(42);
-    else
-      #t68.{core::List::add}{Invariant}(3.14);
-  } =>#t68;
-  core::Set<core::num*>* set80 = block {
-    final core::Set<core::num*>* #t69 = col::LinkedHashSet::•<core::num*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t69.{core::Set::add}{Invariant}(42);
-    else
-      #t69.{core::Set::add}{Invariant}(3.14);
-    #t69.{core::Set::add}{Invariant}(null);
-  } =>#t69;
-  core::Map<core::String*, core::num*>* map80 = block {
-    final core::Map<core::String*, core::num*>* #t70 = <core::String*, core::num*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t70.{core::Map::[]=}{Invariant}("bar", 42);
-    else
-      #t70.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t70.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t70;
-  core::List<core::num*>* list81 = block {
-    final core::List<core::num*>* #t71 = <core::num*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t71.{core::List::addAll}{Invariant}(listInt);
-    else
-      #t71.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t71;
-  core::Set<core::num*>* set81 = block {
-    final core::Set<core::num*>* #t72 = col::LinkedHashSet::•<core::num*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t72.{core::Set::addAll}{Invariant}(listInt);
-    else
-      #t72.{core::Set::addAll}{Invariant}(listDouble);
-    #t72.{core::Set::add}{Invariant}(null);
-  } =>#t72;
-  core::Map<core::String*, core::num*>* map81 = block {
-    final core::Map<core::String*, core::num*>* #t73 = <core::String*, core::num*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, core::num*>* #t74 in mapToInt.{core::Map::entries})
-        #t73.{core::Map::[]=}{Invariant}(#t74.{core::MapEntry::key}, #t74.{core::MapEntry::value});
-    else
-      for (final core::MapEntry<core::String*, core::num*>* #t75 in mapToDouble.{core::Map::entries})
-        #t73.{core::Map::[]=}{Invariant}(#t75.{core::MapEntry::key}, #t75.{core::MapEntry::value});
-    #t73.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t73;
-  core::List<dynamic>* list82 = block {
-    final core::List<dynamic>* #t76 = <dynamic>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t76.{core::List::addAll}{Invariant}(listInt);
-    else
-      #t76.{core::List::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-  } =>#t76;
-  core::Set<dynamic>* set82 = block {
-    final core::Set<dynamic>* #t77 = col::LinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t77.{core::Set::addAll}{Invariant}(listInt);
-    else
-      #t77.{core::Set::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t77.{core::Set::add}{Invariant}(null);
-  } =>#t77;
-  core::Set<dynamic>* map82 = block {
-    final core::Set<dynamic>* #t78 = col::LinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t78.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:73:38: Error: Unexpected type 'Map<String, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  var map82 = {if (oracle(\"foo\")) ...mapToInt else ...dynVar, null};
-                                     ^");
-    else
-      #t78.{core::Set::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t78.{core::Set::add}{Invariant}(null);
-  } =>#t78;
-  core::List<core::num*>* list83 = block {
-    final core::List<core::num*>* #t79 = <core::num*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t79.{core::List::add}{Invariant}(42);
-    else
-      #t79.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t79;
-  core::Set<core::num*>* set83 = block {
-    final core::Set<core::num*>* #t80 = col::LinkedHashSet::•<core::num*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t80.{core::Set::addAll}{Invariant}(listInt);
-    else
-      #t80.{core::Set::add}{Invariant}(3.14);
-    #t80.{core::Set::add}{Invariant}(null);
-  } =>#t80;
-  core::Map<core::String*, core::num*>* map83 = block {
-    final core::Map<core::String*, core::num*>* #t81 = <core::String*, core::num*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, core::num*>* #t82 in mapToInt.{core::Map::entries})
-        #t81.{core::Map::[]=}{Invariant}(#t82.{core::MapEntry::key}, #t82.{core::MapEntry::value});
-    else
-      #t81.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t81.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t81;
-  core::List<core::int*>* list90 = block {
-    final core::List<core::int*>* #t83 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t83.{core::List::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-  } =>#t83;
-  core::Set<core::int*>* set90 = block {
-    final core::Set<core::int*>* #t84 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t84.{core::Set::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-    #t84.{core::Set::add}{Invariant}(null);
-  } =>#t84;
-  core::Map<core::String*, core::int*>* map90 = block {
-    final core::Map<core::String*, core::int*>* #t85 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t85.{core::Map::[]=}{Invariant}("bar", dynVar as{TypeError,ForDynamic} core::int*);
-    #t85.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t85;
-  core::List<core::int*>* list91 = block {
-    final core::List<core::int*>* #t86 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final dynamic #t87 in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*) {
-        final core::int* #t88 = #t87 as{TypeError} core::int*;
-        #t86.{core::List::add}{Invariant}(#t88);
-      }
-  } =>#t86;
-  core::Set<core::int*>* set91 = block {
-    final core::Set<core::int*>* #t89 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final dynamic #t90 in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*) {
-        final core::int* #t91 = #t90 as{TypeError} core::int*;
-        #t89.{core::Set::add}{Invariant}(#t91);
-      }
-    #t89.{core::Set::add}{Invariant}(null);
-  } =>#t89;
-  core::Map<core::String*, core::int*>* map91 = block {
-    final core::Map<core::String*, core::int*>* #t92 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<dynamic, dynamic>* #t93 in (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}) {
-        final core::String* #t94 = #t93.{core::MapEntry::key} as{TypeError} core::String*;
-        final core::int* #t95 = #t93.{core::MapEntry::value} as{TypeError} core::int*;
-        #t92.{core::Map::[]=}{Invariant}(#t94, #t95);
-      }
-    #t92.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t92;
-  core::List<core::int*>* list100 = block {
-    final core::List<core::int*>* #t96 = <core::int*>[];
-    if(dynVar as{TypeError,ForDynamic} core::bool*)
-      #t96.{core::List::add}{Invariant}(42);
-  } =>#t96;
-  core::Set<core::int*>* set100 = block {
-    final core::Set<core::int*>* #t97 = col::LinkedHashSet::•<core::int*>();
-    if(dynVar as{TypeError,ForDynamic} core::bool*)
-      #t97.{core::Set::add}{Invariant}(42);
-  } =>#t97;
-  core::Map<core::int*, core::int*>* map100 = block {
-    final core::Map<core::int*, core::int*>* #t98 = <core::int*, core::int*>{};
-    if(dynVar as{TypeError,ForDynamic} core::bool*)
-      #t98.{core::Map::[]=}{Invariant}(42, 42);
-  } =>#t98;
-}
-static method testIfElementErrors(core::Map<core::int*, core::int*>* map) → dynamic {
-  block {
-    final core::List<core::int*>* #t99 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t99.{core::List::add}{Invariant}(let final<BottomType> #t100 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:89:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[if (oracle(\"foo\")) \"bar\"];
-                           ^" in "bar" as{TypeError} core::int*);
-  } =>#t99;
-  block {
-    final core::Set<core::int*>* #t101 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t101.{core::Set::add}{Invariant}(let final<BottomType> #t102 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:90:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{if (oracle(\"foo\")) \"bar\", null};
-                           ^" in "bar" as{TypeError} core::int*);
-    #t101.{core::Set::add}{Invariant}(null);
-  } =>#t101;
-  block {
-    final core::Map<core::String*, core::int*>* #t103 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t103.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t104 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:91:43: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <String, int>{if (oracle(\"foo\")) \"bar\": \"bar\", \"baz\": null};
-                                          ^" in "bar" as{TypeError} core::int*);
-    #t103.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t103;
-  block {
-    final core::List<core::int*>* #t105 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t105.{core::List::addAll}{Invariant}(<core::int*>[let final<BottomType> #t106 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:92:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[if (oracle(\"foo\")) ...[\"bar\"]];
-                               ^" in "bar" as{TypeError} core::int*]);
-  } =>#t105;
-  block {
-    final core::Set<core::int*>* #t107 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t107.{core::Set::addAll}{Invariant}(<core::int*>[let final<BottomType> #t108 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:93:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{if (oracle(\"foo\")) ...[\"bar\"], null};
-                               ^" in "bar" as{TypeError} core::int*]);
-    #t107.{core::Set::add}{Invariant}(null);
-  } =>#t107;
-  block {
-    final core::Map<core::String*, core::int*>* #t109 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      for (final core::MapEntry<core::String*, core::int*>* #t110 in <core::String*, core::int*>{"bar": let final<BottomType> #t111 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:94:47: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <String, int>{if (oracle(\"foo\")) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                              ^" in "bar" as{TypeError} core::int*}.{core::Map::entries})
-        #t109.{core::Map::[]=}{Invariant}(#t110.{core::MapEntry::key}, #t110.{core::MapEntry::value});
-    #t109.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t109;
-  block {
-    final core::List<core::int*>* #t112 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t112.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:95:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[if (oracle(\"foo\")) ...map];
-                              ^");
-  } =>#t112;
-  block {
-    final core::Set<core::int*>* #t113 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t113.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:96:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{if (oracle(\"foo\")) ...map, null};
-                              ^");
-    #t113.{core::Set::add}{Invariant}(null);
-  } =>#t113;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:97:39: Error: Unexpected type 'List<String>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[\"bar\"], \"baz\": null};
-                                      ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:97:39: Error: Unexpected type 'List<String>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[\"bar\"], \"baz\": null};
-                                      ^": null};
-  block {
-    final core::List<core::String*>* #t114 = <core::String*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t114.{core::List::add}{Invariant}(let final<BottomType> #t115 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>[if (oracle(\"foo\")) 42 else 3.14];
-                              ^" in 42 as{TypeError} core::String*);
-    else
-      #t114.{core::List::add}{Invariant}(let final<BottomType> #t116 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>[if (oracle(\"foo\")) 42 else 3.14];
-                                      ^" in 3.14 as{TypeError} core::String*);
-  } =>#t114;
-  block {
-    final core::Set<core::String*>* #t117 = col::LinkedHashSet::•<core::String*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t117.{core::Set::add}{Invariant}(let final<BottomType> #t118 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>{if (oracle(\"foo\")) 42 else 3.14, null};
-                              ^" in 42 as{TypeError} core::String*);
-    else
-      #t117.{core::Set::add}{Invariant}(let final<BottomType> #t119 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>{if (oracle(\"foo\")) 42 else 3.14, null};
-                                      ^" in 3.14 as{TypeError} core::String*);
-    #t117.{core::Set::add}{Invariant}(null);
-  } =>#t117;
-  block {
-    final core::Map<core::String*, core::String*>* #t120 = <core::String*, core::String*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t120.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t121 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:46: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String, String>{if (oracle(\"foo\")) \"bar\": 42 else \"baz\": 3.14, \"baz\": null};
-                                             ^" in 42 as{TypeError} core::String*);
-    else
-      #t120.{core::Map::[]=}{Invariant}("baz", let final<BottomType> #t122 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:61: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String, String>{if (oracle(\"foo\")) \"bar\": 42 else \"baz\": 3.14, \"baz\": null};
-                                                            ^" in 3.14 as{TypeError} core::String*);
-    #t120.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t120;
-  block {
-    final core::List<core::int*>* #t123 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t123.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:101:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[if (oracle(\"foo\")) ...map else 42];
-                              ^");
-    else
-      #t123.{core::List::add}{Invariant}(42);
-  } =>#t123;
-  block {
-    final core::Set<core::int*>* #t124 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t124.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:102:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{if (oracle(\"foo\")) ...map else 42, null};
-                              ^");
-    else
-      #t124.{core::Set::add}{Invariant}(42);
-    #t124.{core::Set::add}{Invariant}(null);
-  } =>#t124;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:103:39: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[42] else \"bar\": 42, \"baz\": null};
-                                      ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:103:39: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[42] else \"bar\": 42, \"baz\": null};
-                                      ^": null};
-  block {
-    final core::List<core::int*>* #t125 = <core::int*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t125.{core::List::add}{Invariant}(42);
-    else
-      #t125.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:104:39: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[if (oracle(\"foo\")) 42 else ...map];
-                                      ^");
-  } =>#t125;
-  block {
-    final core::Set<core::int*>* #t126 = col::LinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t126.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:105:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{if (oracle(\"foo\")) ...map else 42, null};
-                              ^");
-    else
-      #t126.{core::Set::add}{Invariant}(42);
-    #t126.{core::Set::add}{Invariant}(null);
-  } =>#t126;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:106:54: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) \"bar\": 42 else ...[42], \"baz\": null};
-                                                     ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:106:54: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) \"bar\": 42 else ...[42], \"baz\": null};
-                                                     ^": null};
-  core::Set<dynamic>* set10 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:108:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  Set<dynamic> set10 = {if (oracle(\"foo\")) 42 else \"bar\": 3.14};
-                       ^";
-  core::Map<dynamic, dynamic>* map10 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:109:53: Error: Expected ':' after this.
-  Map<dynamic, dynamic> map10 = {if (oracle(\"foo\")) 42 else \"bar\": 3.14};
-                                                    ^": null};
-  core::Set<dynamic>* set11 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:110:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  Set<dynamic> set11 = {if (oracle(\"foo\")) \"bar\": 3.14 else 42};
-                       ^";
-  core::Map<dynamic, dynamic>* map11 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:111:70: Error: Expected ':' after this.
-  Map<dynamic, dynamic> map11 = {if (oracle(\"foo\")) \"bar\": 3.14 else 42};
-                                                                     ^": null};
-  core::Map<dynamic, Null>* map12 = <dynamic, Null>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:112:35: Error: Expected ':' after this.
-  var map12 = {if (oracle(\"foo\")) 42 else \"bar\": 3.14};
-                                  ^": null};
-  core::Map<dynamic, Null>* map13 = <dynamic, Null>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:113:52: Error: Expected ':' after this.
-  var map13 = {if (oracle(\"foo\")) \"bar\": 3.14 else 42};
-                                                   ^": null};
-  core::List<core::int*>* list20 = block {
-    final core::List<core::int*>* #t127 = <core::int*>[];
-    if(let final<BottomType> #t128 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:114:27: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-  List<int> list20 = [if (42) 42];
-                          ^" in 42 as{TypeError} core::bool*)
-      #t127.{core::List::add}{Invariant}(42);
-  } =>#t127;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t129 = col::LinkedHashSet::•<core::int*>();
-    if(let final<BottomType> #t130 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:115:25: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-  Set<int> set20 = {if (42) 42};
-                        ^" in 42 as{TypeError} core::bool*)
-      #t129.{core::Set::add}{Invariant}(42);
-  } =>#t129;
-  core::Map<core::int*, core::int*>* map30 = block {
-    final core::Map<core::int*, core::int*>* #t131 = <core::int*, core::int*>{};
-    if(let final<BottomType> #t132 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:116:30: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-  Map<int, int> map30 = {if (42) 42: 42};
-                             ^" in 42 as{TypeError} core::bool*)
-      #t131.{core::Map::[]=}{Invariant}(42, 42);
-  } =>#t131;
-  core::List<core::String*>* list40 = block {
-    final core::List<core::String*>* #t133 = <core::String*>[];
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t133.{core::List::add}{Invariant}(let final<BottomType> #t134 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:53: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  List<String> list40 = <String>[if (oracle(\"foo\")) true else 42];
-                                                    ^" in true as{TypeError} core::String*);
-    else
-      #t133.{core::List::add}{Invariant}(let final<BottomType> #t135 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:63: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  List<String> list40 = <String>[if (oracle(\"foo\")) true else 42];
-                                                              ^" in 42 as{TypeError} core::String*);
-  } =>#t133;
-  core::Set<core::String*>* set40 = block {
-    final core::Set<core::String*>* #t136 = col::LinkedHashSet::•<core::String*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t136.{core::Set::add}{Invariant}(let final<BottomType> #t137 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:51: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  Set<String> set40 = <String>{if (oracle(\"foo\")) true else 42};
-                                                  ^" in true as{TypeError} core::String*);
-    else
-      #t136.{core::Set::add}{Invariant}(let final<BottomType> #t138 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:61: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  Set<String> set40 = <String>{if (oracle(\"foo\")) true else 42};
-                                                            ^" in 42 as{TypeError} core::String*);
-  } =>#t136;
-  core::Map<core::String*, core::int*>* map40 = block {
-    final core::Map<core::String*, core::int*>* #t139 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t139.{core::Map::[]=}{Invariant}(let final<BottomType> #t140 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:61: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  Map<String, int> map40 = <String, int>{if (oracle(\"foo\")) true: 42 else 42: 42};
-                                                            ^" in true as{TypeError} core::String*, 42);
-    else
-      #t139.{core::Map::[]=}{Invariant}(let final<BottomType> #t141 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:75: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  Map<String, int> map40 = <String, int>{if (oracle(\"foo\")) true: 42 else 42: 42};
-                                                                          ^" in 42 as{TypeError} core::String*, 42);
-  } =>#t139;
-  core::Map<core::int*, core::String*>* map41 = block {
-    final core::Map<core::int*, core::String*>* #t142 = <core::int*, core::String*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t142.{core::Map::[]=}{Invariant}(42, let final<BottomType> #t143 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:65: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  Map<int, String> map41 = <int, String>{if (oracle(\"foo\")) 42: true else 42: 42};
-                                                                ^" in true as{TypeError} core::String*);
-    else
-      #t142.{core::Map::[]=}{Invariant}(42, let final<BottomType> #t144 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:79: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  Map<int, String> map41 = <int, String>{if (oracle(\"foo\")) 42: true else 42: 42};
-                                                                              ^" in 42 as{TypeError} core::String*);
-  } =>#t142;
-}
-static method testForElement(dynamic dynVar, core::List<core::int*>* listInt, core::List<core::double*>* listDouble, core::int* index, core::Map<core::String*, core::int*>* mapStringInt, core::Map<core::String*, core::double*>* mapStringDouble) → dynamic {
-  core::List<core::int*>* list10 = block {
-    final core::List<core::int*>* #t145 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t145.{core::List::add}{Invariant}(42);
-  } =>#t145;
-  core::Set<core::int*>* set10 = block {
-    final core::Set<core::int*>* #t146 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t146.{core::Set::add}{Invariant}(42);
-    #t146.{core::Set::add}{Invariant}(null);
-  } =>#t146;
-  core::Map<core::String*, core::int*>* map10 = block {
-    final core::Map<core::String*, core::int*>* #t147 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t147.{core::Map::[]=}{Invariant}("bar", 42);
-    #t147.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t147;
-  core::List<dynamic>* list11 = block {
-    final core::List<dynamic>* #t148 = <dynamic>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t148.{core::List::add}{Invariant}(dynVar);
-  } =>#t148;
-  core::Set<dynamic>* set11 = block {
-    final core::Set<dynamic>* #t149 = col::LinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t149.{core::Set::add}{Invariant}(dynVar);
-    #t149.{core::Set::add}{Invariant}(null);
-  } =>#t149;
-  core::Map<core::String*, dynamic>* map11 = block {
-    final core::Map<core::String*, dynamic>* #t150 = <core::String*, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t150.{core::Map::[]=}{Invariant}("bar", dynVar);
-    #t150.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t150;
-  core::List<core::List<core::int*>*>* list12 = block {
-    final core::List<core::List<core::int*>*>* #t151 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t151.{core::List::add}{Invariant}(<core::int*>[42]);
-  } =>#t151;
-  core::Set<core::List<core::int*>*>* set12 = block {
-    final core::Set<core::List<core::int*>*>* #t152 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t152.{core::Set::add}{Invariant}(<core::int*>[42]);
-    #t152.{core::Set::add}{Invariant}(null);
-  } =>#t152;
-  core::Map<core::String*, core::List<core::int*>*>* map12 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t153 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t153.{core::Map::[]=}{Invariant}("bar", <core::int*>[42]);
-    #t153.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t153;
-  core::List<core::int*>* list20 = block {
-    final core::List<core::int*>* #t154 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t154.{core::List::addAll}{Invariant}(<core::int*>[42]);
-  } =>#t154;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t155 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t155.{core::Set::addAll}{Invariant}(<core::int*>[42]);
-    #t155.{core::Set::add}{Invariant}(null);
-  } =>#t155;
-  core::Map<core::String*, core::int*>* map20 = block {
-    final core::Map<core::String*, core::int*>* #t156 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<core::String*, core::int*>* #t157 in <core::String*, core::int*>{"bar": 42}.{core::Map::entries})
-        #t156.{core::Map::[]=}{Invariant}(#t157.{core::MapEntry::key}, #t157.{core::MapEntry::value});
-    #t156.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t156;
-  core::List<dynamic>* list21 = block {
-    final core::List<dynamic>* #t158 = <dynamic>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t158.{core::List::addAll}{Invariant}(<dynamic>[dynVar]);
-  } =>#t158;
-  core::Set<dynamic>* set21 = block {
-    final core::Set<dynamic>* #t159 = col::LinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t159.{core::Set::addAll}{Invariant}(<dynamic>[dynVar]);
-    #t159.{core::Set::add}{Invariant}(null);
-  } =>#t159;
-  core::Map<core::String*, dynamic>* map21 = block {
-    final core::Map<core::String*, dynamic>* #t160 = <core::String*, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<core::String*, dynamic>* #t161 in <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries})
-        #t160.{core::Map::[]=}{Invariant}(#t161.{core::MapEntry::key}, #t161.{core::MapEntry::value});
-    #t160.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t160;
-  core::List<core::List<core::int*>*>* list22 = block {
-    final core::List<core::List<core::int*>*>* #t162 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t162.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-  } =>#t162;
-  core::Set<core::List<core::int*>*>* set22 = block {
-    final core::Set<core::List<core::int*>*>* #t163 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t163.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-    #t163.{core::Set::add}{Invariant}(null);
-  } =>#t163;
-  core::Map<core::String*, core::List<core::int*>*>* map22 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t164 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t165 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[42]}.{core::Map::entries})
-        #t164.{core::Map::[]=}{Invariant}(#t165.{core::MapEntry::key}, #t165.{core::MapEntry::value});
-    #t164.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t164;
-  core::List<core::int*>* list30 = block {
-    final core::List<core::int*>* #t166 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t166.{core::List::addAll}{Invariant}(<core::int*>[42]);
-  } =>#t166;
-  core::Set<core::int*>* set30 = block {
-    final core::Set<core::int*>* #t167 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t167.{core::Set::addAll}{Invariant}(<core::int*>[42]);
-    #t167.{core::Set::add}{Invariant}(null);
-  } =>#t167;
-  core::Map<core::String*, core::int*>* map30 = block {
-    final core::Map<core::String*, core::int*>* #t168 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::int*>* #t169 in <core::String*, core::int*>{"bar": 42}.{core::Map::entries})
-          #t168.{core::Map::[]=}{Invariant}(#t169.{core::MapEntry::key}, #t169.{core::MapEntry::value});
-    #t168.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t168;
-  core::List<dynamic>* list31 = block {
-    final core::List<dynamic>* #t170 = <dynamic>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t170.{core::List::addAll}{Invariant}(<dynamic>[dynVar]);
-  } =>#t170;
-  core::Set<dynamic>* set31 = block {
-    final core::Set<dynamic>* #t171 = col::LinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t171.{core::Set::addAll}{Invariant}(<dynamic>[dynVar]);
-    #t171.{core::Set::add}{Invariant}(null);
-  } =>#t171;
-  core::Map<core::String*, dynamic>* map31 = block {
-    final core::Map<core::String*, dynamic>* #t172 = <core::String*, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, dynamic>* #t173 in <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries})
-          #t172.{core::Map::[]=}{Invariant}(#t173.{core::MapEntry::key}, #t173.{core::MapEntry::value});
-    #t172.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t172;
-  core::List<core::List<core::int*>*>* list33 = block {
-    final core::List<core::List<core::int*>*>* #t174 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t174.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-  } =>#t174;
-  core::Set<core::List<core::int*>*>* set33 = block {
-    final core::Set<core::List<core::int*>*>* #t175 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t175.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[42]]);
-    #t175.{core::Set::add}{Invariant}(null);
-  } =>#t175;
-  core::Map<core::String*, core::List<core::int*>*>* map33 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t176 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t177 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[42]}.{core::Map::entries})
-          #t176.{core::Map::[]=}{Invariant}(#t177.{core::MapEntry::key}, #t177.{core::MapEntry::value});
-    #t176.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t176;
-  core::List<core::List<core::int*>*>* list40 = block {
-    final core::List<core::List<core::int*>*>* #t178 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t178.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t178;
-  core::Set<core::List<core::int*>*>* set40 = block {
-    final core::Set<core::List<core::int*>*>* #t179 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t179.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t179.{core::Set::add}{Invariant}(null);
-  } =>#t179;
-  core::Map<core::String*, core::List<core::int*>*>* map40 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t180 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t181 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[]}.{core::Map::entries})
-        #t180.{core::Map::[]=}{Invariant}(#t181.{core::MapEntry::key}, #t181.{core::MapEntry::value});
-    #t180.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t180;
-  core::List<core::List<core::int*>*>* list41 = block {
-    final core::List<core::List<core::int*>*>* #t182 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t182.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t183 = col::LinkedHashSet::•<core::List<core::int*>*>();
-        #t183.{core::Set::add}{Invariant}(<core::int*>[]);
-      } =>#t183);
-  } =>#t182;
-  core::Set<core::List<core::int*>*>* set41 = block {
-    final core::Set<core::List<core::int*>*>* #t184 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t184.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t185 = col::LinkedHashSet::•<core::List<core::int*>*>();
-        #t185.{core::Set::add}{Invariant}(<core::int*>[]);
-      } =>#t185);
-    #t184.{core::Set::add}{Invariant}(null);
-  } =>#t184;
-  core::List<core::List<core::int*>*>* list42 = block {
-    final core::List<core::List<core::int*>*>* #t186 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t186.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t186;
-  core::Set<core::List<core::int*>*>* set42 = block {
-    final core::Set<core::List<core::int*>*>* #t187 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t187.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t187.{core::Set::add}{Invariant}(null);
-  } =>#t187;
-  core::Map<core::String*, core::List<core::int*>*>* map42 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t188 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t189 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[]}.{core::Map::entries})
-          #t188.{core::Map::[]=}{Invariant}(#t189.{core::MapEntry::key}, #t189.{core::MapEntry::value});
-    #t188.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t188;
-  core::List<core::int*>* list50 = block {
-    final core::List<core::int*>* #t190 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t190.{core::List::addAll}{Invariant}(<core::int*>[]);
-  } =>#t190;
-  core::Set<core::int*>* set50 = block {
-    final core::Set<core::int*>* #t191 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t191.{core::Set::addAll}{Invariant}(<core::int*>[]);
-    #t191.{core::Set::add}{Invariant}(null);
-  } =>#t191;
-  core::Map<core::String*, core::int*>* map50 = block {
-    final core::Map<core::String*, core::int*>* #t192 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<core::String*, core::int*>* #t193 in <core::String*, core::int*>{}.{core::Map::entries})
-        #t192.{core::Map::[]=}{Invariant}(#t193.{core::MapEntry::key}, #t193.{core::MapEntry::value});
-    #t192.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t192;
-  core::List<core::int*>* list51 = block {
-    final core::List<core::int*>* #t194 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t194.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t195 = col::LinkedHashSet::•<core::int*>();
-      } =>#t195);
-  } =>#t194;
-  core::Set<core::int*>* set51 = block {
-    final core::Set<core::int*>* #t196 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t196.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t197 = col::LinkedHashSet::•<core::int*>();
-      } =>#t197);
-    #t196.{core::Set::add}{Invariant}(null);
-  } =>#t196;
-  core::List<core::int*>* list52 = block {
-    final core::List<core::int*>* #t198 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t198.{core::List::addAll}{Invariant}(<core::int*>[]);
-  } =>#t198;
-  core::Set<core::int*>* set52 = block {
-    final core::Set<core::int*>* #t199 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t199.{core::Set::addAll}{Invariant}(<core::int*>[]);
-    #t199.{core::Set::add}{Invariant}(null);
-  } =>#t199;
-  core::List<core::List<core::int*>*>* list60 = block {
-    final core::List<core::List<core::int*>*>* #t200 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t200.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t200;
-  core::Set<core::List<core::int*>*>* set60 = block {
-    final core::Set<core::List<core::int*>*>* #t201 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t201.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t201.{core::Set::add}{Invariant}(null);
-  } =>#t201;
-  core::Map<core::String*, core::List<core::int*>*>* map60 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t202 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t203 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[]}.{core::Map::entries})
-        #t202.{core::Map::[]=}{Invariant}(#t203.{core::MapEntry::key}, #t203.{core::MapEntry::value});
-    #t202.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t202;
-  core::List<core::List<core::int*>*>* list61 = block {
-    final core::List<core::List<core::int*>*>* #t204 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t204.{core::List::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t204;
-  core::Set<core::List<core::int*>*>* set61 = block {
-    final core::Set<core::List<core::int*>*>* #t205 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t205.{core::Set::addAll}{Invariant}(<core::List<core::int*>*>[<core::int*>[]]);
-    #t205.{core::Set::add}{Invariant}(null);
-  } =>#t205;
-  core::Map<core::String*, core::List<core::int*>*>* map61 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t206 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t207 in <core::String*, core::List<core::int*>*>{"bar": <core::int*>[]}.{core::Map::entries})
-          #t206.{core::Map::[]=}{Invariant}(#t207.{core::MapEntry::key}, #t207.{core::MapEntry::value});
-    #t206.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t206;
-  core::List<core::List<core::int*>*>* list70 = block {
-    final core::List<core::List<core::int*>*>* #t208 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t208.{core::List::add}{Invariant}(<core::int*>[]);
-  } =>#t208;
-  core::Set<core::List<core::int*>*>* set70 = block {
-    final core::Set<core::List<core::int*>*>* #t209 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t209.{core::Set::add}{Invariant}(<core::int*>[]);
-    #t209.{core::Set::add}{Invariant}(null);
-  } =>#t209;
-  core::Map<core::String*, core::List<core::int*>*>* map70 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t210 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t210.{core::Map::[]=}{Invariant}("bar", <core::int*>[]);
-    #t210.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t210;
-  core::List<core::List<core::int*>*>* list71 = block {
-    final core::List<core::List<core::int*>*>* #t211 = <core::List<core::int*>*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t211.{core::List::add}{Invariant}(<core::int*>[]);
-  } =>#t211;
-  core::Set<core::List<core::int*>*>* set71 = block {
-    final core::Set<core::List<core::int*>*>* #t212 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t212.{core::Set::add}{Invariant}(<core::int*>[]);
-    #t212.{core::Set::add}{Invariant}(null);
-  } =>#t212;
-  core::Map<core::String*, core::List<core::int*>*>* map71 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t213 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t213.{core::Map::[]=}{Invariant}("bar", <core::int*>[]);
-    #t213.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t213;
-  core::List<core::num*>* list80 = block {
-    final core::List<core::num*>* #t214 = <core::num*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t214.{core::List::add}{Invariant}(42);
-      else
-        #t214.{core::List::add}{Invariant}(3.14);
-  } =>#t214;
-  core::Set<core::num*>* set80 = block {
-    final core::Set<core::num*>* #t215 = col::LinkedHashSet::•<core::num*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t215.{core::Set::add}{Invariant}(42);
-      else
-        #t215.{core::Set::add}{Invariant}(3.14);
-    #t215.{core::Set::add}{Invariant}(null);
-  } =>#t215;
-  core::Map<core::String*, core::num*>* map80 = block {
-    final core::Map<core::String*, core::num*>* #t216 = <core::String*, core::num*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t216.{core::Map::[]=}{Invariant}("bar", 42);
-      else
-        #t216.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t216.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t216;
-  core::List<core::num*>* list81 = block {
-    final core::List<core::num*>* #t217 = <core::num*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t217.{core::List::addAll}{Invariant}(listInt);
-      else
-        #t217.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t217;
-  core::Set<core::num*>* set81 = block {
-    final core::Set<core::num*>* #t218 = col::LinkedHashSet::•<core::num*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t218.{core::Set::addAll}{Invariant}(listInt);
-      else
-        #t218.{core::Set::addAll}{Invariant}(listDouble);
-    #t218.{core::Set::add}{Invariant}(null);
-  } =>#t218;
-  core::Map<core::String*, core::num*>* map81 = block {
-    final core::Map<core::String*, core::num*>* #t219 = <core::String*, core::num*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::num*>* #t220 in mapStringInt.{core::Map::entries})
-          #t219.{core::Map::[]=}{Invariant}(#t220.{core::MapEntry::key}, #t220.{core::MapEntry::value});
-      else
-        for (final core::MapEntry<core::String*, core::num*>* #t221 in mapStringDouble.{core::Map::entries})
-          #t219.{core::Map::[]=}{Invariant}(#t221.{core::MapEntry::key}, #t221.{core::MapEntry::value});
-    #t219.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t219;
-  core::List<dynamic>* list82 = block {
-    final core::List<dynamic>* #t222 = <dynamic>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t222.{core::List::addAll}{Invariant}(listInt);
-      else
-        #t222.{core::List::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-  } =>#t222;
-  core::Set<dynamic>* set82 = block {
-    final core::Set<dynamic>* #t223 = col::LinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t223.{core::Set::addAll}{Invariant}(listInt);
-      else
-        #t223.{core::Set::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t223.{core::Set::add}{Invariant}(null);
-  } =>#t223;
-  core::Map<dynamic, dynamic>* map82 = block {
-    final core::Map<dynamic, dynamic>* #t224 = <dynamic, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<dynamic, dynamic>* #t225 in mapStringInt.{core::Map::entries})
-          #t224.{core::Map::[]=}{Invariant}(#t225.{core::MapEntry::key}, #t225.{core::MapEntry::value});
-      else
-        for (final core::MapEntry<dynamic, dynamic>* #t226 in (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries})
-          #t224.{core::Map::[]=}{Invariant}(#t226.{core::MapEntry::key}, #t226.{core::MapEntry::value});
-    #t224.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t224;
-  core::List<core::num*>* list83 = block {
-    final core::List<core::num*>* #t227 = <core::num*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t227.{core::List::add}{Invariant}(42);
-      else
-        #t227.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t227;
-  core::Set<core::num*>* set83 = block {
-    final core::Set<core::num*>* #t228 = col::LinkedHashSet::•<core::num*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t228.{core::Set::addAll}{Invariant}(listInt);
-      else
-        #t228.{core::Set::add}{Invariant}(3.14);
-    #t228.{core::Set::add}{Invariant}(null);
-  } =>#t228;
-  core::Map<core::String*, core::num*>* map83 = block {
-    final core::Map<core::String*, core::num*>* #t229 = <core::String*, core::num*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        for (final core::MapEntry<core::String*, core::num*>* #t230 in mapStringInt.{core::Map::entries})
-          #t229.{core::Map::[]=}{Invariant}(#t230.{core::MapEntry::key}, #t230.{core::MapEntry::value});
-      else
-        #t229.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t229.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t229;
-  core::List<core::int*>* list90 = block {
-    final core::List<core::int*>* #t231 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t231.{core::List::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-  } =>#t231;
-  core::Set<core::int*>* set90 = block {
-    final core::Set<core::int*>* #t232 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t232.{core::Set::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-    #t232.{core::Set::add}{Invariant}(null);
-  } =>#t232;
-  core::Map<core::String*, core::int*>* map90 = block {
-    final core::Map<core::String*, core::int*>* #t233 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t233.{core::Map::[]=}{Invariant}("bar", dynVar as{TypeError,ForDynamic} core::int*);
-    #t233.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t233;
-  core::List<core::int*>* list91 = block {
-    final core::List<core::int*>* #t234 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final dynamic #t235 in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*) {
-        final core::int* #t236 = #t235 as{TypeError} core::int*;
-        #t234.{core::List::add}{Invariant}(#t236);
-      }
-  } =>#t234;
-  core::Set<core::int*>* set91 = block {
-    final core::Set<core::int*>* #t237 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final dynamic #t238 in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*) {
-        final core::int* #t239 = #t238 as{TypeError} core::int*;
-        #t237.{core::Set::add}{Invariant}(#t239);
-      }
-    #t237.{core::Set::add}{Invariant}(null);
-  } =>#t237;
-  core::Map<core::String*, core::int*>* map91 = block {
-    final core::Map<core::String*, core::int*>* #t240 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<dynamic, dynamic>* #t241 in (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}) {
-        final core::String* #t242 = #t241.{core::MapEntry::key} as{TypeError} core::String*;
-        final core::int* #t243 = #t241.{core::MapEntry::value} as{TypeError} core::int*;
-        #t240.{core::Map::[]=}{Invariant}(#t242, #t243);
-      }
-    #t240.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t240;
-  core::List<core::int*>* list100 = block {
-    final core::List<core::int*>* #t244 = <core::int*>[];
-    for (final core::int* #t245 = index = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; index = index.{core::num::+}(1))
-      #t244.{core::List::add}{Invariant}(42);
-  } =>#t244;
-  core::Set<core::int*>* set100 = block {
-    final core::Set<core::int*>* #t246 = col::LinkedHashSet::•<core::int*>();
-    for (final core::int* #t247 = index = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; index = index.{core::num::+}(1))
-      #t246.{core::Set::add}{Invariant}(42);
-  } =>#t246;
-  core::Map<core::String*, core::int*>* map100 = block {
-    final core::Map<core::String*, core::int*>* #t248 = <core::String*, core::int*>{};
-    for (final core::int* #t249 = index = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; index = index.{core::num::+}(1))
-      #t248.{core::Map::[]=}{Invariant}("bar", 42);
-  } =>#t248;
-  core::List<core::int*>* list110 = block {
-    final core::List<core::int*>* #t250 = <core::int*>[];
-    for (core::int* i in <core::int*>[1, 2, 3])
-      #t250.{core::List::add}{Invariant}(i);
-  } =>#t250;
-  core::Set<core::int*>* set110 = block {
-    final core::Set<core::int*>* #t251 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i in <core::int*>[1, 2, 3])
-      #t251.{core::Set::add}{Invariant}(i);
-    #t251.{core::Set::add}{Invariant}(null);
-  } =>#t251;
-  core::Map<core::String*, core::int*>* map110 = block {
-    final core::Map<core::String*, core::int*>* #t252 = <core::String*, core::int*>{};
-    for (core::int* i in <core::int*>[1, 2, 3])
-      #t252.{core::Map::[]=}{Invariant}("bar", i);
-    #t252.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t252;
-  core::List<core::int*>* list120 = block {
-    final core::List<core::int*>* #t253 = <core::int*>[];
-    for (dynamic i in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*)
-      #t253.{core::List::add}{Invariant}(i as{TypeError,ForDynamic} core::int*);
-  } =>#t253;
-  core::Set<core::int*>* set120 = block {
-    final core::Set<core::int*>* #t254 = col::LinkedHashSet::•<core::int*>();
-    for (dynamic i in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*)
-      #t254.{core::Set::add}{Invariant}(i as{TypeError,ForDynamic} core::int*);
-    #t254.{core::Set::add}{Invariant}(null);
-  } =>#t254;
-  core::Map<core::String*, core::int*>* map120 = block {
-    final core::Map<core::String*, core::int*>* #t255 = <core::String*, core::int*>{};
-    for (dynamic i in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*)
-      #t255.{core::Map::[]=}{Invariant}("bar", i as{TypeError,ForDynamic} core::int*);
-    #t255.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t255;
-  core::List<core::int*>* list130 = block {
-    final core::List<core::int*>* #t256 = <core::int*>[];
-    for (core::int* i = 1; i.{core::num::<}(2); i = i.{core::num::+}(1))
-      #t256.{core::List::add}{Invariant}(i);
-  } =>#t256;
-  core::Set<core::int*>* set130 = block {
-    final core::Set<core::int*>* #t257 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 1; i.{core::num::<}(2); i = i.{core::num::+}(1))
-      #t257.{core::Set::add}{Invariant}(i);
-  } =>#t257;
-  core::Map<core::int*, core::int*>* map130 = block {
-    final core::Map<core::int*, core::int*>* #t258 = <core::int*, core::int*>{};
-    for (core::int* i = 1; i.{core::num::<}(2); i = i.{core::num::+}(1))
-      #t258.{core::Map::[]=}{Invariant}(i, i);
-  } =>#t258;
-}
-static method testForElementErrors(core::Map<core::int*, core::int*>* map, core::List<core::int*>* list) → dynamic async {
-  block {
-    final core::List<core::int*>* #t259 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t259.{core::List::add}{Invariant}(let final<BottomType> #t260 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:212:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) \"bar\"];
-                                            ^" in "bar" as{TypeError} core::int*);
-  } =>#t259;
-  block {
-    final core::Set<core::int*>* #t261 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t261.{core::Set::add}{Invariant}(let final<BottomType> #t262 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:213:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\", null};
-                                            ^" in "bar" as{TypeError} core::int*);
-    #t261.{core::Set::add}{Invariant}(null);
-  } =>#t261;
-  block {
-    final core::Map<core::int*, core::int*>* #t263 = <core::int*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t263.{core::Map::[]=}{Invariant}(let final<BottomType> #t264 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:50: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\": \"bar\", \"baz\": null};
-                                                 ^" in "bar" as{TypeError} core::int*, let final<BottomType> #t265 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\": \"bar\", \"baz\": null};
-                                                        ^" in "bar" as{TypeError} core::int*);
-    #t263.{core::Map::[]=}{Invariant}(let final<BottomType> #t266 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\": \"bar\", \"baz\": null};
-                                                               ^" in "baz" as{TypeError} core::int*, null);
-  } =>#t263;
-  block {
-    final core::List<core::int*>* #t267 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t267.{core::List::addAll}{Invariant}(<core::int*>[let final<BottomType> #t268 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:215:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) ...[\"bar\"]];
-                                                ^" in "bar" as{TypeError} core::int*]);
-  } =>#t267;
-  block {
-    final core::Set<core::int*>* #t269 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t269.{core::Set::addAll}{Invariant}(<core::int*>[let final<BottomType> #t270 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:216:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) ...[\"bar\"], null};
-                                                ^" in "bar" as{TypeError} core::int*]);
-    #t269.{core::Set::add}{Invariant}(null);
-  } =>#t269;
-  block {
-    final core::Map<core::int*, core::int*>* #t271 = <core::int*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      for (final core::MapEntry<core::int*, core::int*>* #t272 in <core::int*, core::int*>{let final<BottomType> #t273 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:54: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                                     ^" in "bar" as{TypeError} core::int*: let final<BottomType> #t274 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:61: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                                            ^" in "bar" as{TypeError} core::int*}.{core::Map::entries})
-        #t271.{core::Map::[]=}{Invariant}(#t272.{core::MapEntry::key}, #t272.{core::MapEntry::value});
-    #t271.{core::Map::[]=}{Invariant}(let final<BottomType> #t275 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:69: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                                                    ^" in "baz" as{TypeError} core::int*, null);
-  } =>#t271;
-  block {
-    final core::List<core::int*>* #t276 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t276.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:218:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) ...map];
-                                               ^");
-  } =>#t276;
-  block {
-    final core::Set<core::int*>* #t277 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t277.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:219:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) ...map, null};
-                                               ^");
-    #t277.{core::Set::add}{Invariant}(null);
-  } =>#t277;
-  <core::int*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:220:53: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...list, 42: null};
-                                                    ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:220:53: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...list, 42: null};
-                                                    ^": null};
-  block {
-    final core::List<core::String*>* #t278 = <core::String*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t278.{core::List::add}{Invariant}(let final<BottomType> #t279 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14];
-                                                             ^" in 42 as{TypeError} core::String*);
-      else
-        #t278.{core::List::add}{Invariant}(let final<BottomType> #t280 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14];
-                                                                     ^" in 3.14 as{TypeError} core::String*);
-  } =>#t278;
-  block {
-    final core::Set<core::String*>* #t281 = col::LinkedHashSet::•<core::String*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t281.{core::Set::add}{Invariant}(let final<BottomType> #t282 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14, null};
-                                                             ^" in 42 as{TypeError} core::String*);
-      else
-        #t281.{core::Set::add}{Invariant}(let final<BottomType> #t283 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14, null};
-                                                                     ^" in 3.14 as{TypeError} core::String*);
-    #t281.{core::Set::add}{Invariant}(null);
-  } =>#t281;
-  block {
-    final core::Map<core::String*, core::String*>* #t284 = <core::String*, core::String*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t284.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t285 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:77: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String, String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else \"bar\": 3.14, \"baz\": null};
-                                                                            ^" in 42 as{TypeError} core::String*);
-      else
-        #t284.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t286 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:92: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String, String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else \"bar\": 3.14, \"baz\": null};
-                                                                                           ^" in 3.14 as{TypeError} core::String*);
-    #t284.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t284;
-  block {
-    final core::List<core::int*>* #t287 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t287.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:224:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...map else 42];
-                                                             ^");
-      else
-        #t287.{core::List::add}{Invariant}(42);
-  } =>#t287;
-  block {
-    final core::Set<core::int*>* #t288 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t288.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:225:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...map else 42, null};
-                                                             ^");
-      else
-        #t288.{core::Set::add}{Invariant}(42);
-    #t288.{core::Set::add}{Invariant}(null);
-  } =>#t288;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:226:70: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...list else \"bar\": 42, \"baz\": null};
-                                                                     ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:226:70: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...list else \"bar\": 42, \"baz\": null};
-                                                                     ^": null};
-  block {
-    final core::List<core::int*>* #t289 = <core::int*>[];
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t289.{core::List::add}{Invariant}(42);
-      else
-        #t289.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:227:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else ...map];
-                                                                     ^");
-  } =>#t289;
-  block {
-    final core::Set<core::int*>* #t290 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t290.{core::Set::add}{Invariant}(42);
-      else
-        #t290.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:228:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else ...map, null};
-                                                                     ^");
-    #t290.{core::Set::add}{Invariant}(null);
-  } =>#t290;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:229:85: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else ...list, \"baz\": null};
-                                                                                    ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:229:85: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else ...list, \"baz\": null};
-                                                                                    ^": null};
-  final core::int* i = 0;
-  block {
-    final core::List<core::int*>* #t291 = <core::int*>[];
-    for (final core::int* #t292 in <core::int*>[1]) {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:232:14: Error: Can't assign to the final variable 'i'.
-  <int>[for (i in <int>[1]) i];
-             ^";
-      #t291.{core::List::add}{Invariant}(i);
-    }
-  } =>#t291;
-  block {
-    final core::Set<core::int*>* #t293 = col::LinkedHashSet::•<core::int*>();
-    for (final core::int* #t294 in <core::int*>[1]) {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:233:14: Error: Can't assign to the final variable 'i'.
-  <int>{for (i in <int>[1]) i, null};
-             ^";
-      #t293.{core::Set::add}{Invariant}(i);
-    }
-    #t293.{core::Set::add}{Invariant}(null);
-  } =>#t293;
-  block {
-    final core::Map<core::String*, core::int*>* #t295 = <core::String*, core::int*>{};
-    for (final core::int* #t296 in <core::int*>[1]) {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:234:21: Error: Can't assign to the final variable 'i'.
-\t<String, int>{for (i in <int>[1]) \"bar\": i, \"baz\": null};
-\t                   ^";
-      #t295.{core::Map::[]=}{Invariant}("bar", i);
-    }
-    #t295.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t295;
-  core::List<dynamic>* list10 = block {
-    final core::List<dynamic>* #t297 = <dynamic>[];
-    for (dynamic i in let final<BottomType> #t298 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:236:31: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
- - 'Iterable' is from 'dart:core'.
-  var list10 = [for (var i in \"not iterable\") i];
-                              ^" in "not iterable" as{TypeError} core::Iterable<dynamic>*)
-      #t297.{core::List::add}{Invariant}(i);
-  } =>#t297;
-  core::Set<dynamic>* set10 = block {
-    final core::Set<dynamic>* #t299 = col::LinkedHashSet::•<dynamic>();
-    for (dynamic i in let final<BottomType> #t300 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:237:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
- - 'Iterable' is from 'dart:core'.
-  var set10 = {for (var i in \"not iterable\") i, null};
-                             ^" in "not iterable" as{TypeError} core::Iterable<dynamic>*)
-      #t299.{core::Set::add}{Invariant}(i);
-    #t299.{core::Set::add}{Invariant}(null);
-  } =>#t299;
-  core::Map<core::String*, dynamic>* map10 = block {
-    final core::Map<core::String*, dynamic>* #t301 = <core::String*, dynamic>{};
-    for (dynamic i in let final<BottomType> #t302 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:238:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
- - 'Iterable' is from 'dart:core'.
-  var map10 = {for (var i in \"not iterable\") \"bar\": i, \"baz\": null};
-                             ^" in "not iterable" as{TypeError} core::Iterable<dynamic>*)
-      #t301.{core::Map::[]=}{Invariant}("bar", i);
-    #t301.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t301;
-  core::List<core::int*>* list20 = block {
-    final core::List<core::int*>* #t303 = <core::int*>[];
-    for (core::int* i in <core::int*>[let final<BottomType> #t304 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list20 = [for (int i in [\"not\", \"int\"]) i];
-                               ^" in "not" as{TypeError} core::int*, let final<BottomType> #t305 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:39: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list20 = [for (int i in [\"not\", \"int\"]) i];
-                                      ^" in "int" as{TypeError} core::int*])
-      #t303.{core::List::add}{Invariant}(i);
-  } =>#t303;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t306 = col::LinkedHashSet::•<core::int*>();
-    for (core::int* i in <core::int*>[let final<BottomType> #t307 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set20 = {for (int i in [\"not\", \"int\"]) i, null};
-                              ^" in "not" as{TypeError} core::int*, let final<BottomType> #t308 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set20 = {for (int i in [\"not\", \"int\"]) i, null};
-                                     ^" in "int" as{TypeError} core::int*])
-      #t306.{core::Set::add}{Invariant}(i);
-    #t306.{core::Set::add}{Invariant}(null);
-  } =>#t306;
-  core::Map<core::String*, core::int*>* map20 = block {
-    final core::Map<core::String*, core::int*>* #t309 = <core::String*, core::int*>{};
-    for (core::int* i in <core::int*>[let final<BottomType> #t310 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map20 = {for (int i in [\"not\", \"int\"]) \"bar\": i, \"baz\": null};
-                              ^" in "not" as{TypeError} core::int*, let final<BottomType> #t311 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map20 = {for (int i in [\"not\", \"int\"]) \"bar\": i, \"baz\": null};
-                                     ^" in "int" as{TypeError} core::int*])
-      #t309.{core::Map::[]=}{Invariant}("bar", i);
-    #t309.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t309;
-  core::List<dynamic>* list30 = block {
-    final core::List<dynamic>* #t312 = <dynamic>[];
-    await for (dynamic i in let final<BottomType> #t313 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:242:37: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
- - 'Stream' is from 'dart:async'.
-  var list30 = [await for (var i in \"not stream\") i];
-                                    ^" in "not stream" as{TypeError} asy::Stream<dynamic>*)
-      #t312.{core::List::add}{Invariant}(i);
-  } =>#t312;
-  core::Set<dynamic>* set30 = block {
-    final core::Set<dynamic>* #t314 = col::LinkedHashSet::•<dynamic>();
-    await for (dynamic i in let final<BottomType> #t315 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:243:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
- - 'Stream' is from 'dart:async'.
-  var set30 = {await for (var i in \"not stream\") i, null};
-                                   ^" in "not stream" as{TypeError} asy::Stream<dynamic>*)
-      #t314.{core::Set::add}{Invariant}(i);
-    #t314.{core::Set::add}{Invariant}(null);
-  } =>#t314;
-  core::Map<core::String*, dynamic>* map30 = block {
-    final core::Map<core::String*, dynamic>* #t316 = <core::String*, dynamic>{};
-    await for (dynamic i in let final<BottomType> #t317 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:244:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
- - 'Stream' is from 'dart:async'.
-  var map30 = {await for (var i in \"not stream\") \"bar\": i, \"baz\": null};
-                                   ^" in "not stream" as{TypeError} asy::Stream<dynamic>*)
-      #t316.{core::Map::[]=}{Invariant}("bar", i);
-    #t316.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t316;
-  core::List<core::int*>* list40 = block {
-    final core::List<core::int*>* #t318 = <core::int*>[];
-    await for (core::int* i in asy::Stream::fromIterable<core::int*>(<core::int*>[let final<BottomType> #t319 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list40 = [await for (int i in Stream.fromIterable([\"not\", \"int\"])) i];
-                                                         ^" in "not" as{TypeError} core::int*, let final<BottomType> #t320 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:65: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list40 = [await for (int i in Stream.fromIterable([\"not\", \"int\"])) i];
-                                                                ^" in "int" as{TypeError} core::int*]))
-      #t318.{core::List::add}{Invariant}(i);
-  } =>#t318;
-  core::Set<core::int*>* set40 = block {
-    final core::Set<core::int*>* #t321 = col::LinkedHashSet::•<core::int*>();
-    await for (core::int* i in asy::Stream::fromIterable<core::int*>(<core::int*>[let final<BottomType> #t322 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) i, null};
-                                                        ^" in "not" as{TypeError} core::int*, let final<BottomType> #t323 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) i, null};
-                                                               ^" in "int" as{TypeError} core::int*]))
-      #t321.{core::Set::add}{Invariant}(i);
-    #t321.{core::Set::add}{Invariant}(null);
-  } =>#t321;
-  core::Map<core::String*, core::int*>* map40 = block {
-    final core::Map<core::String*, core::int*>* #t324 = <core::String*, core::int*>{};
-    await for (core::int* i in asy::Stream::fromIterable<core::int*>(<core::int*>[let final<BottomType> #t325 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) \"bar\": i, \"baz\": null};
-                                                        ^" in "not" as{TypeError} core::int*, let final<BottomType> #t326 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) \"bar\": i, \"baz\": null};
-                                                               ^" in "int" as{TypeError} core::int*]))
-      #t324.{core::Map::[]=}{Invariant}("bar", i);
-    #t324.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t324;
-  core::List<core::int*>* list50 = block {
-    final core::List<core::int*>* #t327 = <core::int*>[];
-    for (; ; )
-      #t327.{core::List::add}{Invariant}(42);
-  } =>#t327;
-  core::Set<core::int*>* set50 = block {
-    final core::Set<core::int*>* #t328 = col::LinkedHashSet::•<core::int*>();
-    for (; ; )
-      #t328.{core::Set::add}{Invariant}(42);
-    #t328.{core::Set::add}{Invariant}(null);
-  } =>#t328;
-  core::Map<core::String*, core::int*>* map50 = block {
-    final core::Map<core::String*, core::int*>* #t329 = <core::String*, core::int*>{};
-    for (; ; )
-      #t329.{core::Map::[]=}{Invariant}("bar", 42);
-    #t329.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t329;
-  core::List<core::int*>* list60 = block {
-    final core::List<core::int*>* #t330 = <core::int*>[];
-    for (; let final<BottomType> #t331 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:251:24: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-  var list60 = [for (; \"not bool\";) 42];
-                       ^" in "not bool" as{TypeError} core::bool*; )
-      #t330.{core::List::add}{Invariant}(42);
-  } =>#t330;
-  core::Set<core::int*>* set60 = block {
-    final core::Set<core::int*>* #t332 = col::LinkedHashSet::•<core::int*>();
-    for (; let final<BottomType> #t333 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:252:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-  var set60 = {for (; \"not bool\";) 42, null};
-                      ^" in "not bool" as{TypeError} core::bool*; )
-      #t332.{core::Set::add}{Invariant}(42);
-    #t332.{core::Set::add}{Invariant}(null);
-  } =>#t332;
-  core::Map<core::String*, core::int*>* map60 = block {
-    final core::Map<core::String*, core::int*>* #t334 = <core::String*, core::int*>{};
-    for (; let final<BottomType> #t335 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:253:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-  var map60 = {for (; \"not bool\";) \"bar\": 42, \"baz\": null};
-                      ^" in "not bool" as{TypeError} core::bool*; )
-      #t334.{core::Map::[]=}{Invariant}("bar", 42);
-    #t334.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t334;
-}
-static method testForElementErrorsNotAsync(asy::Stream<core::int*>* stream) → dynamic {
-  block {
-    final core::List<core::int*>* #t336 = <core::int*>[];
-    await for (core::int* i in stream)
-      #t336.{core::List::add}{Invariant}(i);
-  } =>#t336;
-  block {
-    final core::Set<core::int*>* #t337 = col::LinkedHashSet::•<core::int*>();
-    await for (core::int* i in stream)
-      #t337.{core::Set::add}{Invariant}(i);
-  } =>#t337;
-  block {
-    final core::Map<core::String*, core::int*>* #t338 = <core::String*, core::int*>{};
-    await for (core::int* i in stream)
-      #t338.{core::Map::[]=}{Invariant}("bar", i);
-  } =>#t338;
-}
-static method testPromotion(self::A* a) → dynamic {
-  core::List<core::int*>* list10 = block {
-    final core::List<core::int*>* #t339 = <core::int*>[];
-    if(a is self::B*)
-      #t339.{core::List::add}{Invariant}(a{self::B*}.{self::B::foo});
-  } =>#t339;
-  core::Set<core::int*>* set10 = block {
-    final core::Set<core::int*>* #t340 = col::LinkedHashSet::•<core::int*>();
-    if(a is self::B*)
-      #t340.{core::Set::add}{Invariant}(a{self::B*}.{self::B::foo});
-  } =>#t340;
-  core::Map<core::int*, core::int*>* map10 = block {
-    final core::Map<core::int*, core::int*>* #t341 = <core::int*, core::int*>{};
-    if(a is self::B*)
-      #t341.{core::Map::[]=}{Invariant}(a{self::B*}.{self::B::foo}, a{self::B*}.{self::B::foo});
-  } =>#t341;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.outline.expect
deleted file mode 100644
index f57be4c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.outline.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-  get foo() → core::int*
-    ;
-}
-static method oracle<T extends core::Object* = dynamic>([self::oracle::T* t]) → dynamic
-  ;
-static method testIfElement(dynamic dynVar, core::List<core::int*>* listInt, core::List<core::double*>* listDouble, core::Map<core::String*, core::int*>* mapToInt, core::Map<core::String*, core::double*>* mapToDouble) → dynamic
-  ;
-static method testIfElementErrors(core::Map<core::int*, core::int*>* map) → dynamic
-  ;
-static method testForElement(dynamic dynVar, core::List<core::int*>* listInt, core::List<core::double*>* listDouble, core::int* index, core::Map<core::String*, core::int*>* mapStringInt, core::Map<core::String*, core::double*>* mapStringDouble) → dynamic
-  ;
-static method testForElementErrors(core::Map<core::int*, core::int*>* map, core::List<core::int*>* list) → dynamic async 
-  ;
-static method testForElementErrorsNotAsync(asy::Stream<core::int*>* stream) → dynamic
-  ;
-static method testPromotion(self::A* a) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.transformed.expect
deleted file mode 100644
index 18135e9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart.weak.transformed.expect
+++ /dev/null
@@ -1,2534 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:41:34: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   Map<String, List<int>> map40 = {if (oracle("foo")) ...{"bar", []}, "baz": null};
-//                                  ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:73:38: Error: Unexpected type 'Map<String, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   var map82 = {if (oracle("foo")) ...mapToInt else ...dynVar, null};
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:108:44: Error: Expected ':' after this.
-//   Set<dynamic> set10 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:109:53: Error: Expected ':' after this.
-//   Map<dynamic, dynamic> map10 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:110:61: Error: Expected ':' after this.
-//   Set<dynamic> set11 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:111:70: Error: Expected ':' after this.
-//   Map<dynamic, dynamic> map11 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:112:35: Error: Expected ':' after this.
-//   var map12 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:113:52: Error: Expected ':' after this.
-//   var map13 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:89:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[if (oracle("foo")) "bar"];
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:90:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{if (oracle("foo")) "bar", null};
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:91:43: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <String, int>{if (oracle("foo")) "bar": "bar", "baz": null};
-//                                           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:92:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[if (oracle("foo")) ...["bar"]];
-//                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:93:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{if (oracle("foo")) ...["bar"], null};
-//                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:94:47: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <String, int>{if (oracle("foo")) ...{"bar": "bar"}, "baz": null};
-//                                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:95:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[if (oracle("foo")) ...map];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:96:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{if (oracle("foo")) ...map, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:97:39: Error: Unexpected type 'List<String>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{if (oracle("foo")) ...["bar"], "baz": null};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>[if (oracle("foo")) 42 else 3.14];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>[if (oracle("foo")) 42 else 3.14];
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>{if (oracle("foo")) 42 else 3.14, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>{if (oracle("foo")) 42 else 3.14, null};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:46: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String, String>{if (oracle("foo")) "bar": 42 else "baz": 3.14, "baz": null};
-//                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:61: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String, String>{if (oracle("foo")) "bar": 42 else "baz": 3.14, "baz": null};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:101:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[if (oracle("foo")) ...map else 42];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:102:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{if (oracle("foo")) ...map else 42, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:103:39: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{if (oracle("foo")) ...[42] else "bar": 42, "baz": null};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:104:39: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[if (oracle("foo")) 42 else ...map];
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:105:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{if (oracle("foo")) ...map else 42, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:106:54: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{if (oracle("foo")) "bar": 42 else ...[42], "baz": null};
-//                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:108:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   Set<dynamic> set10 = {if (oracle("foo")) 42 else "bar": 3.14};
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:110:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   Set<dynamic> set11 = {if (oracle("foo")) "bar": 3.14 else 42};
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:114:27: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-//   List<int> list20 = [if (42) 42];
-//                           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:115:25: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-//   Set<int> set20 = {if (42) 42};
-//                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:116:30: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-//   Map<int, int> map30 = {if (42) 42: 42};
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:53: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   List<String> list40 = <String>[if (oracle("foo")) true else 42];
-//                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:63: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   List<String> list40 = <String>[if (oracle("foo")) true else 42];
-//                                                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:51: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   Set<String> set40 = <String>{if (oracle("foo")) true else 42};
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:61: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   Set<String> set40 = <String>{if (oracle("foo")) true else 42};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:61: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   Map<String, int> map40 = <String, int>{if (oracle("foo")) true: 42 else 42: 42};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:75: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   Map<String, int> map40 = <String, int>{if (oracle("foo")) true: 42 else 42: 42};
-//                                                                           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:65: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-//   Map<int, String> map41 = <int, String>{if (oracle("foo")) 42: true else 42: 42};
-//                                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:79: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   Map<int, String> map41 = <int, String>{if (oracle("foo")) 42: true else 42: 42};
-//                                                                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:232:14: Error: Can't assign to the final variable 'i'.
-//   <int>[for (i in <int>[1]) i];
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:233:14: Error: Can't assign to the final variable 'i'.
-//   <int>{for (i in <int>[1]) i, null};
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:234:21: Error: Can't assign to the final variable 'i'.
-// 	<String, int>{for (i in <int>[1]) "bar": i, "baz": null};
-// 	                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:248:17: Error: The keyword 'await' isn't allowed for a normal 'for' statement.
-// Try removing the keyword, or use a for-each statement.
-//   var list50 = [await for (;;) 42];
-//                 ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:249:16: Error: The keyword 'await' isn't allowed for a normal 'for' statement.
-// Try removing the keyword, or use a for-each statement.
-//   var set50 = {await for (;;) 42, null};
-//                ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:250:16: Error: The keyword 'await' isn't allowed for a normal 'for' statement.
-// Try removing the keyword, or use a for-each statement.
-//   var map50 = {await for (;;) "bar": 42, "baz": null};
-//                ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:212:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[for (int i = 0; oracle("foo"); i++) "bar"];
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:213:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{for (int i = 0; oracle("foo"); i++) "bar", null};
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:50: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) "bar": "bar", "baz": null};
-//                                                  ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) "bar": "bar", "baz": null};
-//                                                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) "bar": "bar", "baz": null};
-//                                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:215:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>[for (int i = 0; oracle("foo"); i++) ...["bar"]];
-//                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:216:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int>{for (int i = 0; oracle("foo"); i++) ...["bar"], null};
-//                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:54: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...{"bar": "bar"}, "baz": null};
-//                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:61: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...{"bar": "bar"}, "baz": null};
-//                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:69: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...{"bar": "bar"}, "baz": null};
-//                                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:218:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[for (int i = 0; oracle("foo"); i++) ...map];
-//                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:219:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{for (int i = 0; oracle("foo"); i++) ...map, null};
-//                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:220:53: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <int, int>{for (int i = 0; oracle("foo"); i++) ...list, 42: null};
-//                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14];
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14];
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14, null};
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else 3.14, null};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:77: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-//   <String, String>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else "bar": 3.14, "baz": null};
-//                                                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:92: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-//   <String, String>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else "bar": 3.14, "baz": null};
-//                                                                                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:224:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[for (int i = 0; oracle("foo"); i++) if (oracle()) ...map else 42];
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:225:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{for (int i = 0; oracle("foo"); i++) if (oracle()) ...map else 42, null};
-//                                                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:226:70: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{for (int i = 0; oracle("foo"); i++) if (oracle()) ...list else "bar": 42, "baz": null};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:227:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>[for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else ...map];
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:228:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
-//  - 'Map' is from 'dart:core'.
-//   <int>{for (int i = 0; oracle("foo"); i++) if (oracle()) 42 else ...map, null};
-//                                                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:229:85: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
-//  - 'List' is from 'dart:core'.
-//   <String, int>{for (int i = 0; oracle("foo"); i++) if (oracle()) "bar": 42 else ...list, "baz": null};
-//                                                                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:236:31: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
-//  - 'Iterable' is from 'dart:core'.
-//   var list10 = [for (var i in "not iterable") i];
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:237:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
-//  - 'Iterable' is from 'dart:core'.
-//   var set10 = {for (var i in "not iterable") i, null};
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:238:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
-//  - 'Iterable' is from 'dart:core'.
-//   var map10 = {for (var i in "not iterable") "bar": i, "baz": null};
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list20 = [for (int i in ["not", "int"]) i];
-//                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:39: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list20 = [for (int i in ["not", "int"]) i];
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set20 = {for (int i in ["not", "int"]) i, null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set20 = {for (int i in ["not", "int"]) i, null};
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map20 = {for (int i in ["not", "int"]) "bar": i, "baz": null};
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map20 = {for (int i in ["not", "int"]) "bar": i, "baz": null};
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:242:37: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
-//  - 'Stream' is from 'dart:async'.
-//   var list30 = [await for (var i in "not stream") i];
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:243:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
-//  - 'Stream' is from 'dart:async'.
-//   var set30 = {await for (var i in "not stream") i, null};
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:244:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
-//  - 'Stream' is from 'dart:async'.
-//   var map30 = {await for (var i in "not stream") "bar": i, "baz": null};
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list40 = [await for (int i in Stream.fromIterable(["not", "int"])) i];
-//                                                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:65: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var list40 = [await for (int i in Stream.fromIterable(["not", "int"])) i];
-//                                                                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set40 = {await for (int i in Stream.fromIterable(["not", "int"])) i, null};
-//                                                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var set40 = {await for (int i in Stream.fromIterable(["not", "int"])) i, null};
-//                                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map40 = {await for (int i in Stream.fromIterable(["not", "int"])) "bar": i, "baz": null};
-//                                                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   var map40 = {await for (int i in Stream.fromIterable(["not", "int"])) "bar": i, "baz": null};
-//                                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:251:24: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-//   var list60 = [for (; "not bool";) 42];
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:252:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-//   var set60 = {for (; "not bool";) 42, null};
-//                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:253:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-//   var map60 = {for (; "not bool";) "bar": 42, "baz": null};
-//                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:257:26: Error: The asynchronous for-in can only be used in functions marked with 'async' or 'async*'.
-// Try marking the function body with either 'async' or 'async*', or removing the 'await' before the for loop.
-//   <int>[await for (int i in stream) i];
-//                          ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:258:26: Error: The asynchronous for-in can only be used in functions marked with 'async' or 'async*'.
-// Try marking the function body with either 'async' or 'async*', or removing the 'await' before the for loop.
-//   <int>{await for (int i in stream) i};
-//                          ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:259:34: Error: The asynchronous for-in can only be used in functions marked with 'async' or 'async*'.
-// Try marking the function body with either 'async' or 'async*', or removing the 'await' before the for loop.
-//   <String, int>{await for (int i in stream) "bar": i};
-//                                  ^^
-//
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-import "dart:async" as asy;
-import "dart:_internal" as _in;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  get foo() → core::int*
-    return 42;
-}
-static method oracle<T extends core::Object* = dynamic>([self::oracle::T* t = #C1]) → dynamic
-  return true;
-static method testIfElement(dynamic dynVar, core::List<core::int*>* listInt, core::List<core::double*>* listDouble, core::Map<core::String*, core::int*>* mapToInt, core::Map<core::String*, core::double*>* mapToDouble) → dynamic {
-  core::List<core::int*>* list10 = block {
-    final core::List<core::int*>* #t1 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t1.{core::List::add}{Invariant}(42);
-  } =>#t1;
-  core::Set<core::int*>* set10 = block {
-    final core::Set<core::int*>* #t2 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t2.{core::Set::add}{Invariant}(42);
-    #t2.{core::Set::add}{Invariant}(null);
-  } =>#t2;
-  core::Map<core::String*, core::int*>* map10 = block {
-    final core::Map<core::String*, core::int*>* #t3 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t3.{core::Map::[]=}{Invariant}("bar", 42);
-    #t3.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t3;
-  core::List<dynamic>* list11 = block {
-    final core::List<dynamic>* #t4 = core::_GrowableList::•<dynamic>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t4.{core::List::add}{Invariant}(dynVar);
-  } =>#t4;
-  core::Set<dynamic>* set11 = block {
-    final core::Set<dynamic>* #t5 = new col::_CompactLinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t5.{core::Set::add}{Invariant}(dynVar);
-    #t5.{core::Set::add}{Invariant}(null);
-  } =>#t5;
-  core::Map<core::String*, dynamic>* map11 = block {
-    final core::Map<core::String*, dynamic>* #t6 = <core::String*, dynamic>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t6.{core::Map::[]=}{Invariant}("bar", dynVar);
-    #t6.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t6;
-  core::List<core::List<core::int*>*>* list12 = block {
-    final core::List<core::List<core::int*>*>* #t7 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t7.{core::List::add}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-  } =>#t7;
-  core::Set<core::List<core::int*>*>* set12 = block {
-    final core::Set<core::List<core::int*>*>* #t8 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t8.{core::Set::add}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-    #t8.{core::Set::add}{Invariant}(null);
-  } =>#t8;
-  core::Map<core::String*, core::List<core::int*>*>* map12 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t9 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t9.{core::Map::[]=}{Invariant}("bar", core::_GrowableList::_literal1<core::int*>(42));
-    #t9.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t9;
-  core::List<core::int*>* list20 = block {
-    final core::List<core::int*>* #t10 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t10.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-  } =>#t10;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t11 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t11.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-    #t11.{core::Set::add}{Invariant}(null);
-  } =>#t11;
-  core::Map<core::String*, core::int*>* map20 = block {
-    final core::Map<core::String*, core::int*>* #t12 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{"bar": 42}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t13 = :sync-for-iterator.{core::Iterator::current};
-        #t12.{core::Map::[]=}{Invariant}(#t13.{core::MapEntry::key}, #t13.{core::MapEntry::value});
-      }
-    }
-    #t12.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t12;
-  core::List<dynamic>* list21 = block {
-    final core::List<dynamic>* #t14 = core::_GrowableList::•<dynamic>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t14.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-  } =>#t14;
-  core::Set<dynamic>* set21 = block {
-    final core::Set<dynamic>* #t15 = new col::_CompactLinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t15.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-    #t15.{core::Set::add}{Invariant}(null);
-  } =>#t15;
-  core::Map<core::String*, dynamic>* map21 = block {
-    final core::Map<core::String*, dynamic>* #t16 = <core::String*, dynamic>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, dynamic>>* :sync-for-iterator = <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, dynamic>* #t17 = :sync-for-iterator.{core::Iterator::current};
-        #t16.{core::Map::[]=}{Invariant}(#t17.{core::MapEntry::key}, #t17.{core::MapEntry::value});
-      }
-    }
-    #t16.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t16;
-  core::List<core::List<core::int*>*>* list22 = block {
-    final core::List<core::List<core::int*>*>* #t18 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t18.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-  } =>#t18;
-  core::Set<core::List<core::int*>*>* set22 = block {
-    final core::Set<core::List<core::int*>*>* #t19 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t19.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-    #t19.{core::Set::add}{Invariant}(null);
-  } =>#t19;
-  core::Map<core::String*, core::List<core::int*>*>* map22 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t20 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::_literal1<core::int*>(42)}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::List<core::int*>*>* #t21 = :sync-for-iterator.{core::Iterator::current};
-        #t20.{core::Map::[]=}{Invariant}(#t21.{core::MapEntry::key}, #t21.{core::MapEntry::value});
-      }
-    }
-    #t20.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t20;
-  core::List<core::int*>* list30 = block {
-    final core::List<core::int*>* #t22 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t22.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-  } =>#t22;
-  core::Set<core::int*>* set30 = block {
-    final core::Set<core::int*>* #t23 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t23.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-    #t23.{core::Set::add}{Invariant}(null);
-  } =>#t23;
-  core::Map<core::String*, core::int*>* map30 = block {
-    final core::Map<core::String*, core::int*>* #t24 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{"bar": 42}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::int*>* #t25 = :sync-for-iterator.{core::Iterator::current};
-          #t24.{core::Map::[]=}{Invariant}(#t25.{core::MapEntry::key}, #t25.{core::MapEntry::value});
-        }
-      }
-    #t24.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t24;
-  core::List<dynamic>* list31 = block {
-    final core::List<dynamic>* #t26 = core::_GrowableList::•<dynamic>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t26.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-  } =>#t26;
-  core::Set<dynamic>* set31 = block {
-    final core::Set<dynamic>* #t27 = new col::_CompactLinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t27.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-    #t27.{core::Set::add}{Invariant}(null);
-  } =>#t27;
-  core::Map<core::String*, dynamic>* map31 = block {
-    final core::Map<core::String*, dynamic>* #t28 = <core::String*, dynamic>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, dynamic>>* :sync-for-iterator = <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, dynamic>* #t29 = :sync-for-iterator.{core::Iterator::current};
-          #t28.{core::Map::[]=}{Invariant}(#t29.{core::MapEntry::key}, #t29.{core::MapEntry::value});
-        }
-      }
-    #t28.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t28;
-  core::List<core::List<core::int*>*>* list33 = block {
-    final core::List<core::List<core::int*>*>* #t30 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t30.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-  } =>#t30;
-  core::Set<core::List<core::int*>*>* set33 = block {
-    final core::Set<core::List<core::int*>*>* #t31 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t31.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-    #t31.{core::Set::add}{Invariant}(null);
-  } =>#t31;
-  core::Map<core::String*, core::List<core::int*>*>* map33 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t32 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::_literal1<core::int*>(42)}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::List<core::int*>*>* #t33 = :sync-for-iterator.{core::Iterator::current};
-          #t32.{core::Map::[]=}{Invariant}(#t33.{core::MapEntry::key}, #t33.{core::MapEntry::value});
-        }
-      }
-    #t32.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t32;
-  core::List<core::List<core::int*>*>* list40 = block {
-    final core::List<core::List<core::int*>*>* #t34 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t34.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t34;
-  core::Set<core::List<core::int*>*>* set40 = block {
-    final core::Set<core::List<core::int*>*>* #t35 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t35.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t35.{core::Set::add}{Invariant}(null);
-  } =>#t35;
-  core::Map<core::String*, core::List<core::int*>*>* map40 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:41:34: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  Map<String, List<int>> map40 = {if (oracle(\"foo\")) ...{\"bar\", []}, \"baz\": null};
-                                 ^";
-  core::List<core::List<core::int*>*>* list41 = block {
-    final core::List<core::List<core::int*>*>* #t36 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t36.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t37 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-        #t37.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-      } =>#t37);
-  } =>#t36;
-  core::Set<core::List<core::int*>*>* set41 = block {
-    final core::Set<core::List<core::int*>*>* #t38 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t38.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t39 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-        #t39.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-      } =>#t39);
-    #t38.{core::Set::add}{Invariant}(null);
-  } =>#t38;
-  core::List<core::List<core::int*>*>* list42 = block {
-    final core::List<core::List<core::int*>*>* #t40 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t40.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t40;
-  core::Set<core::List<core::int*>*>* set42 = block {
-    final core::Set<core::List<core::int*>*>* #t41 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t41.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t41.{core::Set::add}{Invariant}(null);
-  } =>#t41;
-  core::Map<core::String*, core::List<core::int*>*>* map42 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t42 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::List<core::int*>*>* #t43 = :sync-for-iterator.{core::Iterator::current};
-          #t42.{core::Map::[]=}{Invariant}(#t43.{core::MapEntry::key}, #t43.{core::MapEntry::value});
-        }
-      }
-    #t42.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t42;
-  core::List<core::int*>* list50 = block {
-    final core::List<core::int*>* #t44 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t44.{core::List::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t44;
-  core::Set<core::int*>* set50 = block {
-    final core::Set<core::int*>* #t45 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t45.{core::Set::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t45.{core::Set::add}{Invariant}(null);
-  } =>#t45;
-  core::Map<core::String*, core::int*>* map50 = block {
-    final core::Map<core::String*, core::int*>* #t46 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t47 = :sync-for-iterator.{core::Iterator::current};
-        #t46.{core::Map::[]=}{Invariant}(#t47.{core::MapEntry::key}, #t47.{core::MapEntry::value});
-      }
-    }
-    #t46.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t46;
-  core::List<core::int*>* list51 = block {
-    final core::List<core::int*>* #t48 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t48.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t49 = new col::_CompactLinkedHashSet::•<core::int*>();
-      } =>#t49);
-  } =>#t48;
-  core::Set<core::int*>* set51 = block {
-    final core::Set<core::int*>* #t50 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t50.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t51 = new col::_CompactLinkedHashSet::•<core::int*>();
-      } =>#t51);
-    #t50.{core::Set::add}{Invariant}(null);
-  } =>#t50;
-  core::List<core::int*>* list52 = block {
-    final core::List<core::int*>* #t52 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t52.{core::List::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t52;
-  core::Set<core::int*>* set52 = block {
-    final core::Set<core::int*>* #t53 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t53.{core::Set::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t53.{core::Set::add}{Invariant}(null);
-  } =>#t53;
-  core::Map<core::String*, core::int*>* map52 = block {
-    final core::Map<core::String*, core::int*>* #t54 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::int*>* #t55 = :sync-for-iterator.{core::Iterator::current};
-          #t54.{core::Map::[]=}{Invariant}(#t55.{core::MapEntry::key}, #t55.{core::MapEntry::value});
-        }
-      }
-    #t54.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t54;
-  core::List<core::List<core::int*>*>* list60 = block {
-    final core::List<core::List<core::int*>*>* #t56 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t56.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t56;
-  core::Set<core::List<core::int*>*>* set60 = block {
-    final core::Set<core::List<core::int*>*>* #t57 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t57.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t57.{core::Set::add}{Invariant}(null);
-  } =>#t57;
-  core::Map<core::String*, core::List<core::int*>*>* map60 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t58 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::List<core::int*>*>* #t59 = :sync-for-iterator.{core::Iterator::current};
-        #t58.{core::Map::[]=}{Invariant}(#t59.{core::MapEntry::key}, #t59.{core::MapEntry::value});
-      }
-    }
-    #t58.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t58;
-  core::List<core::List<core::int*>*>* list61 = block {
-    final core::List<core::List<core::int*>*>* #t60 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t60.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t60;
-  core::Set<core::List<core::int*>*>* set61 = block {
-    final core::Set<core::List<core::int*>*>* #t61 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t61.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t61.{core::Set::add}{Invariant}(null);
-  } =>#t61;
-  core::Map<core::String*, core::List<core::int*>*>* map61 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t62 = <core::String*, core::List<core::int*>*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::List<core::int*>*>* #t63 = :sync-for-iterator.{core::Iterator::current};
-          #t62.{core::Map::[]=}{Invariant}(#t63.{core::MapEntry::key}, #t63.{core::MapEntry::value});
-        }
-      }
-    #t62.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t62;
-  core::List<core::List<core::int*>*>* list70 = block {
-    final core::List<core::List<core::int*>*>* #t64 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t64.{core::List::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t64;
-  core::Set<core::List<core::int*>*>* set70 = block {
-    final core::Set<core::List<core::int*>*>* #t65 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t65.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t65.{core::Set::add}{Invariant}(null);
-  } =>#t65;
-  core::List<core::List<core::int*>*>* list71 = block {
-    final core::List<core::List<core::int*>*>* #t66 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t66.{core::List::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t66;
-  core::Set<core::List<core::int*>*>* set71 = block {
-    final core::Set<core::List<core::int*>*>* #t67 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t67.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t67.{core::Set::add}{Invariant}(null);
-  } =>#t67;
-  core::List<core::num*>* list80 = block {
-    final core::List<core::num*>* #t68 = core::_GrowableList::•<core::num*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t68.{core::List::add}{Invariant}(42);
-    else
-      #t68.{core::List::add}{Invariant}(3.14);
-  } =>#t68;
-  core::Set<core::num*>* set80 = block {
-    final core::Set<core::num*>* #t69 = new col::_CompactLinkedHashSet::•<core::num*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t69.{core::Set::add}{Invariant}(42);
-    else
-      #t69.{core::Set::add}{Invariant}(3.14);
-    #t69.{core::Set::add}{Invariant}(null);
-  } =>#t69;
-  core::Map<core::String*, core::num*>* map80 = block {
-    final core::Map<core::String*, core::num*>* #t70 = <core::String*, core::num*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t70.{core::Map::[]=}{Invariant}("bar", 42);
-    else
-      #t70.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t70.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t70;
-  core::List<core::num*>* list81 = block {
-    final core::List<core::num*>* #t71 = core::_GrowableList::•<core::num*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t71.{core::List::addAll}{Invariant}(listInt);
-    else
-      #t71.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t71;
-  core::Set<core::num*>* set81 = block {
-    final core::Set<core::num*>* #t72 = new col::_CompactLinkedHashSet::•<core::num*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t72.{core::Set::addAll}{Invariant}(listInt);
-    else
-      #t72.{core::Set::addAll}{Invariant}(listDouble);
-    #t72.{core::Set::add}{Invariant}(null);
-  } =>#t72;
-  core::Map<core::String*, core::num*>* map81 = block {
-    final core::Map<core::String*, core::num*>* #t73 = <core::String*, core::num*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapToInt.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::num*>* #t74 = :sync-for-iterator.{core::Iterator::current};
-        #t73.{core::Map::[]=}{Invariant}(#t74.{core::MapEntry::key}, #t74.{core::MapEntry::value});
-      }
-    }
-    else {
-      core::Iterator<core::MapEntry<core::String*, core::double*>>* :sync-for-iterator = mapToDouble.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::num*>* #t75 = :sync-for-iterator.{core::Iterator::current};
-        #t73.{core::Map::[]=}{Invariant}(#t75.{core::MapEntry::key}, #t75.{core::MapEntry::value});
-      }
-    }
-    #t73.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t73;
-  core::List<dynamic>* list82 = block {
-    final core::List<dynamic>* #t76 = core::_GrowableList::•<dynamic>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t76.{core::List::addAll}{Invariant}(listInt);
-    else
-      #t76.{core::List::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-  } =>#t76;
-  core::Set<dynamic>* set82 = block {
-    final core::Set<dynamic>* #t77 = new col::_CompactLinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t77.{core::Set::addAll}{Invariant}(listInt);
-    else
-      #t77.{core::Set::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t77.{core::Set::add}{Invariant}(null);
-  } =>#t77;
-  core::Set<dynamic>* map82 = block {
-    final core::Set<dynamic>* #t78 = new col::_CompactLinkedHashSet::•<dynamic>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t78.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:73:38: Error: Unexpected type 'Map<String, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  var map82 = {if (oracle(\"foo\")) ...mapToInt else ...dynVar, null};
-                                     ^");
-    else
-      #t78.{core::Set::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t78.{core::Set::add}{Invariant}(null);
-  } =>#t78;
-  core::List<core::num*>* list83 = block {
-    final core::List<core::num*>* #t79 = core::_GrowableList::•<core::num*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t79.{core::List::add}{Invariant}(42);
-    else
-      #t79.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t79;
-  core::Set<core::num*>* set83 = block {
-    final core::Set<core::num*>* #t80 = new col::_CompactLinkedHashSet::•<core::num*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t80.{core::Set::addAll}{Invariant}(listInt);
-    else
-      #t80.{core::Set::add}{Invariant}(3.14);
-    #t80.{core::Set::add}{Invariant}(null);
-  } =>#t80;
-  core::Map<core::String*, core::num*>* map83 = block {
-    final core::Map<core::String*, core::num*>* #t81 = <core::String*, core::num*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapToInt.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::num*>* #t82 = :sync-for-iterator.{core::Iterator::current};
-        #t81.{core::Map::[]=}{Invariant}(#t82.{core::MapEntry::key}, #t82.{core::MapEntry::value});
-      }
-    }
-    else
-      #t81.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t81.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t81;
-  core::List<core::int*>* list90 = block {
-    final core::List<core::int*>* #t83 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t83.{core::List::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-  } =>#t83;
-  core::Set<core::int*>* set90 = block {
-    final core::Set<core::int*>* #t84 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t84.{core::Set::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-    #t84.{core::Set::add}{Invariant}(null);
-  } =>#t84;
-  core::Map<core::String*, core::int*>* map90 = block {
-    final core::Map<core::String*, core::int*>* #t85 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t85.{core::Map::[]=}{Invariant}("bar", dynVar as{TypeError,ForDynamic} core::int*);
-    #t85.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t85;
-  core::List<core::int*>* list91 = block {
-    final core::List<core::int*>* #t86 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t87 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t88 = #t87 as{TypeError} core::int*;
-          #t86.{core::List::add}{Invariant}(#t88);
-        }
-      }
-    }
-  } =>#t86;
-  core::Set<core::int*>* set91 = block {
-    final core::Set<core::int*>* #t89 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t90 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t91 = #t90 as{TypeError} core::int*;
-          #t89.{core::Set::add}{Invariant}(#t91);
-        }
-      }
-    }
-    #t89.{core::Set::add}{Invariant}(null);
-  } =>#t89;
-  core::Map<core::String*, core::int*>* map91 = block {
-    final core::Map<core::String*, core::int*>* #t92 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<dynamic, dynamic>>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<dynamic, dynamic>* #t93 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::String* #t94 = #t93.{core::MapEntry::key} as{TypeError} core::String*;
-          final core::int* #t95 = #t93.{core::MapEntry::value} as{TypeError} core::int*;
-          #t92.{core::Map::[]=}{Invariant}(#t94, #t95);
-        }
-      }
-    }
-    #t92.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t92;
-  core::List<core::int*>* list100 = block {
-    final core::List<core::int*>* #t96 = core::_GrowableList::•<core::int*>(0);
-    if(dynVar as{TypeError,ForDynamic} core::bool*)
-      #t96.{core::List::add}{Invariant}(42);
-  } =>#t96;
-  core::Set<core::int*>* set100 = block {
-    final core::Set<core::int*>* #t97 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(dynVar as{TypeError,ForDynamic} core::bool*)
-      #t97.{core::Set::add}{Invariant}(42);
-  } =>#t97;
-  core::Map<core::int*, core::int*>* map100 = block {
-    final core::Map<core::int*, core::int*>* #t98 = <core::int*, core::int*>{};
-    if(dynVar as{TypeError,ForDynamic} core::bool*)
-      #t98.{core::Map::[]=}{Invariant}(42, 42);
-  } =>#t98;
-}
-static method testIfElementErrors(core::Map<core::int*, core::int*>* map) → dynamic {
-  block {
-    final core::List<core::int*>* #t99 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t99.{core::List::add}{Invariant}(let final<BottomType> #t100 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:89:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[if (oracle(\"foo\")) \"bar\"];
-                           ^" in "bar" as{TypeError} core::int*);
-  } =>#t99;
-  block {
-    final core::Set<core::int*>* #t101 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t101.{core::Set::add}{Invariant}(let final<BottomType> #t102 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:90:28: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{if (oracle(\"foo\")) \"bar\", null};
-                           ^" in "bar" as{TypeError} core::int*);
-    #t101.{core::Set::add}{Invariant}(null);
-  } =>#t101;
-  block {
-    final core::Map<core::String*, core::int*>* #t103 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t103.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t104 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:91:43: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <String, int>{if (oracle(\"foo\")) \"bar\": \"bar\", \"baz\": null};
-                                          ^" in "bar" as{TypeError} core::int*);
-    #t103.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t103;
-  block {
-    final core::List<core::int*>* #t105 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t105.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(let final<BottomType> #t106 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:92:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[if (oracle(\"foo\")) ...[\"bar\"]];
-                               ^" in "bar" as{TypeError} core::int*));
-  } =>#t105;
-  block {
-    final core::Set<core::int*>* #t107 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t107.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(let final<BottomType> #t108 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:93:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{if (oracle(\"foo\")) ...[\"bar\"], null};
-                               ^" in "bar" as{TypeError} core::int*));
-    #t107.{core::Set::add}{Invariant}(null);
-  } =>#t107;
-  block {
-    final core::Map<core::String*, core::int*>* #t109 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{"bar": let final<BottomType> #t110 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:94:47: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <String, int>{if (oracle(\"foo\")) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                              ^" in "bar" as{TypeError} core::int*}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t111 = :sync-for-iterator.{core::Iterator::current};
-        #t109.{core::Map::[]=}{Invariant}(#t111.{core::MapEntry::key}, #t111.{core::MapEntry::value});
-      }
-    }
-    #t109.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t109;
-  block {
-    final core::List<core::int*>* #t112 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t112.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:95:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[if (oracle(\"foo\")) ...map];
-                              ^");
-  } =>#t112;
-  block {
-    final core::Set<core::int*>* #t113 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t113.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:96:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{if (oracle(\"foo\")) ...map, null};
-                              ^");
-    #t113.{core::Set::add}{Invariant}(null);
-  } =>#t113;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:97:39: Error: Unexpected type 'List<String>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[\"bar\"], \"baz\": null};
-                                      ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:97:39: Error: Unexpected type 'List<String>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[\"bar\"], \"baz\": null};
-                                      ^": null};
-  block {
-    final core::List<core::String*>* #t114 = core::_GrowableList::•<core::String*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t114.{core::List::add}{Invariant}(let final<BottomType> #t115 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>[if (oracle(\"foo\")) 42 else 3.14];
-                              ^" in 42 as{TypeError} core::String*);
-    else
-      #t114.{core::List::add}{Invariant}(let final<BottomType> #t116 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:98:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>[if (oracle(\"foo\")) 42 else 3.14];
-                                      ^" in 3.14 as{TypeError} core::String*);
-  } =>#t114;
-  block {
-    final core::Set<core::String*>* #t117 = new col::_CompactLinkedHashSet::•<core::String*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t117.{core::Set::add}{Invariant}(let final<BottomType> #t118 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:31: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>{if (oracle(\"foo\")) 42 else 3.14, null};
-                              ^" in 42 as{TypeError} core::String*);
-    else
-      #t117.{core::Set::add}{Invariant}(let final<BottomType> #t119 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:99:39: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>{if (oracle(\"foo\")) 42 else 3.14, null};
-                                      ^" in 3.14 as{TypeError} core::String*);
-    #t117.{core::Set::add}{Invariant}(null);
-  } =>#t117;
-  block {
-    final core::Map<core::String*, core::String*>* #t120 = <core::String*, core::String*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t120.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t121 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:46: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String, String>{if (oracle(\"foo\")) \"bar\": 42 else \"baz\": 3.14, \"baz\": null};
-                                             ^" in 42 as{TypeError} core::String*);
-    else
-      #t120.{core::Map::[]=}{Invariant}("baz", let final<BottomType> #t122 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:100:61: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String, String>{if (oracle(\"foo\")) \"bar\": 42 else \"baz\": 3.14, \"baz\": null};
-                                                            ^" in 3.14 as{TypeError} core::String*);
-    #t120.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t120;
-  block {
-    final core::List<core::int*>* #t123 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t123.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:101:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[if (oracle(\"foo\")) ...map else 42];
-                              ^");
-    else
-      #t123.{core::List::add}{Invariant}(42);
-  } =>#t123;
-  block {
-    final core::Set<core::int*>* #t124 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t124.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:102:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{if (oracle(\"foo\")) ...map else 42, null};
-                              ^");
-    else
-      #t124.{core::Set::add}{Invariant}(42);
-    #t124.{core::Set::add}{Invariant}(null);
-  } =>#t124;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:103:39: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[42] else \"bar\": 42, \"baz\": null};
-                                      ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:103:39: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) ...[42] else \"bar\": 42, \"baz\": null};
-                                      ^": null};
-  block {
-    final core::List<core::int*>* #t125 = core::_GrowableList::•<core::int*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t125.{core::List::add}{Invariant}(42);
-    else
-      #t125.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:104:39: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[if (oracle(\"foo\")) 42 else ...map];
-                                      ^");
-  } =>#t125;
-  block {
-    final core::Set<core::int*>* #t126 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t126.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:105:31: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{if (oracle(\"foo\")) ...map else 42, null};
-                              ^");
-    else
-      #t126.{core::Set::add}{Invariant}(42);
-    #t126.{core::Set::add}{Invariant}(null);
-  } =>#t126;
-  <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:106:54: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) \"bar\": 42 else ...[42], \"baz\": null};
-                                                     ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:106:54: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{if (oracle(\"foo\")) \"bar\": 42 else ...[42], \"baz\": null};
-                                                     ^": null};
-  core::Set<dynamic>* set10 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:108:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  Set<dynamic> set10 = {if (oracle(\"foo\")) 42 else \"bar\": 3.14};
-                       ^";
-  core::Map<dynamic, dynamic>* map10 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:109:53: Error: Expected ':' after this.
-  Map<dynamic, dynamic> map10 = {if (oracle(\"foo\")) 42 else \"bar\": 3.14};
-                                                    ^": null};
-  core::Set<dynamic>* set11 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:110:24: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  Set<dynamic> set11 = {if (oracle(\"foo\")) \"bar\": 3.14 else 42};
-                       ^";
-  core::Map<dynamic, dynamic>* map11 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:111:70: Error: Expected ':' after this.
-  Map<dynamic, dynamic> map11 = {if (oracle(\"foo\")) \"bar\": 3.14 else 42};
-                                                                     ^": null};
-  core::Map<dynamic, Null>* map12 = <dynamic, Null>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:112:35: Error: Expected ':' after this.
-  var map12 = {if (oracle(\"foo\")) 42 else \"bar\": 3.14};
-                                  ^": null};
-  core::Map<dynamic, Null>* map13 = <dynamic, Null>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:113:52: Error: Expected ':' after this.
-  var map13 = {if (oracle(\"foo\")) \"bar\": 3.14 else 42};
-                                                   ^": null};
-  core::List<core::int*>* list20 = block {
-    final core::List<core::int*>* #t127 = core::_GrowableList::•<core::int*>(0);
-    if(let final<BottomType> #t128 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:114:27: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-  List<int> list20 = [if (42) 42];
-                          ^" in 42 as{TypeError} core::bool*)
-      #t127.{core::List::add}{Invariant}(42);
-  } =>#t127;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t129 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(let final<BottomType> #t130 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:115:25: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-  Set<int> set20 = {if (42) 42};
-                        ^" in 42 as{TypeError} core::bool*)
-      #t129.{core::Set::add}{Invariant}(42);
-  } =>#t129;
-  core::Map<core::int*, core::int*>* map30 = block {
-    final core::Map<core::int*, core::int*>* #t131 = <core::int*, core::int*>{};
-    if(let final<BottomType> #t132 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:116:30: Error: A value of type 'int' can't be assigned to a variable of type 'bool'.
-  Map<int, int> map30 = {if (42) 42: 42};
-                             ^" in 42 as{TypeError} core::bool*)
-      #t131.{core::Map::[]=}{Invariant}(42, 42);
-  } =>#t131;
-  core::List<core::String*>* list40 = block {
-    final core::List<core::String*>* #t133 = core::_GrowableList::•<core::String*>(0);
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t133.{core::List::add}{Invariant}(let final<BottomType> #t134 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:53: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  List<String> list40 = <String>[if (oracle(\"foo\")) true else 42];
-                                                    ^" in true as{TypeError} core::String*);
-    else
-      #t133.{core::List::add}{Invariant}(let final<BottomType> #t135 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:117:63: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  List<String> list40 = <String>[if (oracle(\"foo\")) true else 42];
-                                                              ^" in 42 as{TypeError} core::String*);
-  } =>#t133;
-  core::Set<core::String*>* set40 = block {
-    final core::Set<core::String*>* #t136 = new col::_CompactLinkedHashSet::•<core::String*>();
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t136.{core::Set::add}{Invariant}(let final<BottomType> #t137 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:51: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  Set<String> set40 = <String>{if (oracle(\"foo\")) true else 42};
-                                                  ^" in true as{TypeError} core::String*);
-    else
-      #t136.{core::Set::add}{Invariant}(let final<BottomType> #t138 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:118:61: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  Set<String> set40 = <String>{if (oracle(\"foo\")) true else 42};
-                                                            ^" in 42 as{TypeError} core::String*);
-  } =>#t136;
-  core::Map<core::String*, core::int*>* map40 = block {
-    final core::Map<core::String*, core::int*>* #t139 = <core::String*, core::int*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t139.{core::Map::[]=}{Invariant}(let final<BottomType> #t140 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:61: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  Map<String, int> map40 = <String, int>{if (oracle(\"foo\")) true: 42 else 42: 42};
-                                                            ^" in true as{TypeError} core::String*, 42);
-    else
-      #t139.{core::Map::[]=}{Invariant}(let final<BottomType> #t141 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:119:75: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  Map<String, int> map40 = <String, int>{if (oracle(\"foo\")) true: 42 else 42: 42};
-                                                                          ^" in 42 as{TypeError} core::String*, 42);
-  } =>#t139;
-  core::Map<core::int*, core::String*>* map41 = block {
-    final core::Map<core::int*, core::String*>* #t142 = <core::int*, core::String*>{};
-    if(self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*)
-      #t142.{core::Map::[]=}{Invariant}(42, let final<BottomType> #t143 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:65: Error: A value of type 'bool' can't be assigned to a variable of type 'String'.
-  Map<int, String> map41 = <int, String>{if (oracle(\"foo\")) 42: true else 42: 42};
-                                                                ^" in true as{TypeError} core::String*);
-    else
-      #t142.{core::Map::[]=}{Invariant}(42, let final<BottomType> #t144 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:120:79: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  Map<int, String> map41 = <int, String>{if (oracle(\"foo\")) 42: true else 42: 42};
-                                                                              ^" in 42 as{TypeError} core::String*);
-  } =>#t142;
-}
-static method testForElement(dynamic dynVar, core::List<core::int*>* listInt, core::List<core::double*>* listDouble, core::int* index, core::Map<core::String*, core::int*>* mapStringInt, core::Map<core::String*, core::double*>* mapStringDouble) → dynamic {
-  core::List<core::int*>* list10 = block {
-    final core::List<core::int*>* #t145 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t145.{core::List::add}{Invariant}(42);
-  } =>#t145;
-  core::Set<core::int*>* set10 = block {
-    final core::Set<core::int*>* #t146 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t146.{core::Set::add}{Invariant}(42);
-    #t146.{core::Set::add}{Invariant}(null);
-  } =>#t146;
-  core::Map<core::String*, core::int*>* map10 = block {
-    final core::Map<core::String*, core::int*>* #t147 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t147.{core::Map::[]=}{Invariant}("bar", 42);
-    #t147.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t147;
-  core::List<dynamic>* list11 = block {
-    final core::List<dynamic>* #t148 = core::_GrowableList::•<dynamic>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t148.{core::List::add}{Invariant}(dynVar);
-  } =>#t148;
-  core::Set<dynamic>* set11 = block {
-    final core::Set<dynamic>* #t149 = new col::_CompactLinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t149.{core::Set::add}{Invariant}(dynVar);
-    #t149.{core::Set::add}{Invariant}(null);
-  } =>#t149;
-  core::Map<core::String*, dynamic>* map11 = block {
-    final core::Map<core::String*, dynamic>* #t150 = <core::String*, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t150.{core::Map::[]=}{Invariant}("bar", dynVar);
-    #t150.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t150;
-  core::List<core::List<core::int*>*>* list12 = block {
-    final core::List<core::List<core::int*>*>* #t151 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t151.{core::List::add}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-  } =>#t151;
-  core::Set<core::List<core::int*>*>* set12 = block {
-    final core::Set<core::List<core::int*>*>* #t152 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t152.{core::Set::add}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-    #t152.{core::Set::add}{Invariant}(null);
-  } =>#t152;
-  core::Map<core::String*, core::List<core::int*>*>* map12 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t153 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t153.{core::Map::[]=}{Invariant}("bar", core::_GrowableList::_literal1<core::int*>(42));
-    #t153.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t153;
-  core::List<core::int*>* list20 = block {
-    final core::List<core::int*>* #t154 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t154.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-  } =>#t154;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t155 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t155.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-    #t155.{core::Set::add}{Invariant}(null);
-  } =>#t155;
-  core::Map<core::String*, core::int*>* map20 = block {
-    final core::Map<core::String*, core::int*>* #t156 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{"bar": 42}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t157 = :sync-for-iterator.{core::Iterator::current};
-        #t156.{core::Map::[]=}{Invariant}(#t157.{core::MapEntry::key}, #t157.{core::MapEntry::value});
-      }
-    }
-    #t156.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t156;
-  core::List<dynamic>* list21 = block {
-    final core::List<dynamic>* #t158 = core::_GrowableList::•<dynamic>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t158.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-  } =>#t158;
-  core::Set<dynamic>* set21 = block {
-    final core::Set<dynamic>* #t159 = new col::_CompactLinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t159.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-    #t159.{core::Set::add}{Invariant}(null);
-  } =>#t159;
-  core::Map<core::String*, dynamic>* map21 = block {
-    final core::Map<core::String*, dynamic>* #t160 = <core::String*, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<core::MapEntry<core::String*, dynamic>>* :sync-for-iterator = <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, dynamic>* #t161 = :sync-for-iterator.{core::Iterator::current};
-        #t160.{core::Map::[]=}{Invariant}(#t161.{core::MapEntry::key}, #t161.{core::MapEntry::value});
-      }
-    }
-    #t160.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t160;
-  core::List<core::List<core::int*>*>* list22 = block {
-    final core::List<core::List<core::int*>*>* #t162 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t162.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-  } =>#t162;
-  core::Set<core::List<core::int*>*>* set22 = block {
-    final core::Set<core::List<core::int*>*>* #t163 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t163.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-    #t163.{core::Set::add}{Invariant}(null);
-  } =>#t163;
-  core::Map<core::String*, core::List<core::int*>*>* map22 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t164 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::_literal1<core::int*>(42)}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::List<core::int*>*>* #t165 = :sync-for-iterator.{core::Iterator::current};
-        #t164.{core::Map::[]=}{Invariant}(#t165.{core::MapEntry::key}, #t165.{core::MapEntry::value});
-      }
-    }
-    #t164.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t164;
-  core::List<core::int*>* list30 = block {
-    final core::List<core::int*>* #t166 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t166.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-  } =>#t166;
-  core::Set<core::int*>* set30 = block {
-    final core::Set<core::int*>* #t167 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t167.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-    #t167.{core::Set::add}{Invariant}(null);
-  } =>#t167;
-  core::Map<core::String*, core::int*>* map30 = block {
-    final core::Map<core::String*, core::int*>* #t168 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{"bar": 42}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::int*>* #t169 = :sync-for-iterator.{core::Iterator::current};
-          #t168.{core::Map::[]=}{Invariant}(#t169.{core::MapEntry::key}, #t169.{core::MapEntry::value});
-        }
-      }
-    #t168.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t168;
-  core::List<dynamic>* list31 = block {
-    final core::List<dynamic>* #t170 = core::_GrowableList::•<dynamic>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t170.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-  } =>#t170;
-  core::Set<dynamic>* set31 = block {
-    final core::Set<dynamic>* #t171 = new col::_CompactLinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t171.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<dynamic>(dynVar));
-    #t171.{core::Set::add}{Invariant}(null);
-  } =>#t171;
-  core::Map<core::String*, dynamic>* map31 = block {
-    final core::Map<core::String*, dynamic>* #t172 = <core::String*, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, dynamic>>* :sync-for-iterator = <core::String*, dynamic>{"bar": dynVar}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, dynamic>* #t173 = :sync-for-iterator.{core::Iterator::current};
-          #t172.{core::Map::[]=}{Invariant}(#t173.{core::MapEntry::key}, #t173.{core::MapEntry::value});
-        }
-      }
-    #t172.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t172;
-  core::List<core::List<core::int*>*>* list33 = block {
-    final core::List<core::List<core::int*>*>* #t174 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t174.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-  } =>#t174;
-  core::Set<core::List<core::int*>*>* set33 = block {
-    final core::Set<core::List<core::int*>*>* #t175 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t175.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::_literal1<core::int*>(42)));
-    #t175.{core::Set::add}{Invariant}(null);
-  } =>#t175;
-  core::Map<core::String*, core::List<core::int*>*>* map33 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t176 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::_literal1<core::int*>(42)}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::List<core::int*>*>* #t177 = :sync-for-iterator.{core::Iterator::current};
-          #t176.{core::Map::[]=}{Invariant}(#t177.{core::MapEntry::key}, #t177.{core::MapEntry::value});
-        }
-      }
-    #t176.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t176;
-  core::List<core::List<core::int*>*>* list40 = block {
-    final core::List<core::List<core::int*>*>* #t178 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t178.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t178;
-  core::Set<core::List<core::int*>*>* set40 = block {
-    final core::Set<core::List<core::int*>*>* #t179 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t179.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t179.{core::Set::add}{Invariant}(null);
-  } =>#t179;
-  core::Map<core::String*, core::List<core::int*>*>* map40 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t180 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::List<core::int*>*>* #t181 = :sync-for-iterator.{core::Iterator::current};
-        #t180.{core::Map::[]=}{Invariant}(#t181.{core::MapEntry::key}, #t181.{core::MapEntry::value});
-      }
-    }
-    #t180.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t180;
-  core::List<core::List<core::int*>*>* list41 = block {
-    final core::List<core::List<core::int*>*>* #t182 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t182.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t183 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-        #t183.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-      } =>#t183);
-  } =>#t182;
-  core::Set<core::List<core::int*>*>* set41 = block {
-    final core::Set<core::List<core::int*>*>* #t184 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t184.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::List<core::int*>*>* #t185 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-        #t185.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-      } =>#t185);
-    #t184.{core::Set::add}{Invariant}(null);
-  } =>#t184;
-  core::List<core::List<core::int*>*>* list42 = block {
-    final core::List<core::List<core::int*>*>* #t186 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t186.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t186;
-  core::Set<core::List<core::int*>*>* set42 = block {
-    final core::Set<core::List<core::int*>*>* #t187 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t187.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t187.{core::Set::add}{Invariant}(null);
-  } =>#t187;
-  core::Map<core::String*, core::List<core::int*>*>* map42 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t188 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::List<core::int*>*>* #t189 = :sync-for-iterator.{core::Iterator::current};
-          #t188.{core::Map::[]=}{Invariant}(#t189.{core::MapEntry::key}, #t189.{core::MapEntry::value});
-        }
-      }
-    #t188.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t188;
-  core::List<core::int*>* list50 = block {
-    final core::List<core::int*>* #t190 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t190.{core::List::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t190;
-  core::Set<core::int*>* set50 = block {
-    final core::Set<core::int*>* #t191 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t191.{core::Set::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t191.{core::Set::add}{Invariant}(null);
-  } =>#t191;
-  core::Map<core::String*, core::int*>* map50 = block {
-    final core::Map<core::String*, core::int*>* #t192 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t193 = :sync-for-iterator.{core::Iterator::current};
-        #t192.{core::Map::[]=}{Invariant}(#t193.{core::MapEntry::key}, #t193.{core::MapEntry::value});
-      }
-    }
-    #t192.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t192;
-  core::List<core::int*>* list51 = block {
-    final core::List<core::int*>* #t194 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t194.{core::List::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t195 = new col::_CompactLinkedHashSet::•<core::int*>();
-      } =>#t195);
-  } =>#t194;
-  core::Set<core::int*>* set51 = block {
-    final core::Set<core::int*>* #t196 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t196.{core::Set::addAll}{Invariant}( block {
-        final core::Set<core::int*>* #t197 = new col::_CompactLinkedHashSet::•<core::int*>();
-      } =>#t197);
-    #t196.{core::Set::add}{Invariant}(null);
-  } =>#t196;
-  core::List<core::int*>* list52 = block {
-    final core::List<core::int*>* #t198 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t198.{core::List::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t198;
-  core::Set<core::int*>* set52 = block {
-    final core::Set<core::int*>* #t199 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t199.{core::Set::addAll}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t199.{core::Set::add}{Invariant}(null);
-  } =>#t199;
-  core::List<core::List<core::int*>*>* list60 = block {
-    final core::List<core::List<core::int*>*>* #t200 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t200.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t200;
-  core::Set<core::List<core::int*>*>* set60 = block {
-    final core::Set<core::List<core::int*>*>* #t201 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t201.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t201.{core::Set::add}{Invariant}(null);
-  } =>#t201;
-  core::Map<core::String*, core::List<core::int*>*>* map60 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t202 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::List<core::int*>*>* #t203 = :sync-for-iterator.{core::Iterator::current};
-        #t202.{core::Map::[]=}{Invariant}(#t203.{core::MapEntry::key}, #t203.{core::MapEntry::value});
-      }
-    }
-    #t202.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t202;
-  core::List<core::List<core::int*>*>* list61 = block {
-    final core::List<core::List<core::int*>*>* #t204 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t204.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t204;
-  core::Set<core::List<core::int*>*>* set61 = block {
-    final core::Set<core::List<core::int*>*>* #t205 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t205.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t205.{core::Set::add}{Invariant}(null);
-  } =>#t205;
-  core::Map<core::String*, core::List<core::int*>*>* map61 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t206 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"bar": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::List<core::int*>*>* #t207 = :sync-for-iterator.{core::Iterator::current};
-          #t206.{core::Map::[]=}{Invariant}(#t207.{core::MapEntry::key}, #t207.{core::MapEntry::value});
-        }
-      }
-    #t206.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t206;
-  core::List<core::List<core::int*>*>* list70 = block {
-    final core::List<core::List<core::int*>*>* #t208 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t208.{core::List::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t208;
-  core::Set<core::List<core::int*>*>* set70 = block {
-    final core::Set<core::List<core::int*>*>* #t209 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t209.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t209.{core::Set::add}{Invariant}(null);
-  } =>#t209;
-  core::Map<core::String*, core::List<core::int*>*>* map70 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t210 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t210.{core::Map::[]=}{Invariant}("bar", core::_GrowableList::•<core::int*>(0));
-    #t210.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t210;
-  core::List<core::List<core::int*>*>* list71 = block {
-    final core::List<core::List<core::int*>*>* #t211 = core::_GrowableList::•<core::List<core::int*>*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t211.{core::List::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-  } =>#t211;
-  core::Set<core::List<core::int*>*>* set71 = block {
-    final core::Set<core::List<core::int*>*>* #t212 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t212.{core::Set::add}{Invariant}(core::_GrowableList::•<core::int*>(0));
-    #t212.{core::Set::add}{Invariant}(null);
-  } =>#t212;
-  core::Map<core::String*, core::List<core::int*>*>* map71 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t213 = <core::String*, core::List<core::int*>*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t213.{core::Map::[]=}{Invariant}("bar", core::_GrowableList::•<core::int*>(0));
-    #t213.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t213;
-  core::List<core::num*>* list80 = block {
-    final core::List<core::num*>* #t214 = core::_GrowableList::•<core::num*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t214.{core::List::add}{Invariant}(42);
-      else
-        #t214.{core::List::add}{Invariant}(3.14);
-  } =>#t214;
-  core::Set<core::num*>* set80 = block {
-    final core::Set<core::num*>* #t215 = new col::_CompactLinkedHashSet::•<core::num*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t215.{core::Set::add}{Invariant}(42);
-      else
-        #t215.{core::Set::add}{Invariant}(3.14);
-    #t215.{core::Set::add}{Invariant}(null);
-  } =>#t215;
-  core::Map<core::String*, core::num*>* map80 = block {
-    final core::Map<core::String*, core::num*>* #t216 = <core::String*, core::num*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t216.{core::Map::[]=}{Invariant}("bar", 42);
-      else
-        #t216.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t216.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t216;
-  core::List<core::num*>* list81 = block {
-    final core::List<core::num*>* #t217 = core::_GrowableList::•<core::num*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t217.{core::List::addAll}{Invariant}(listInt);
-      else
-        #t217.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t217;
-  core::Set<core::num*>* set81 = block {
-    final core::Set<core::num*>* #t218 = new col::_CompactLinkedHashSet::•<core::num*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t218.{core::Set::addAll}{Invariant}(listInt);
-      else
-        #t218.{core::Set::addAll}{Invariant}(listDouble);
-    #t218.{core::Set::add}{Invariant}(null);
-  } =>#t218;
-  core::Map<core::String*, core::num*>* map81 = block {
-    final core::Map<core::String*, core::num*>* #t219 = <core::String*, core::num*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapStringInt.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::num*>* #t220 = :sync-for-iterator.{core::Iterator::current};
-          #t219.{core::Map::[]=}{Invariant}(#t220.{core::MapEntry::key}, #t220.{core::MapEntry::value});
-        }
-      }
-      else {
-        core::Iterator<core::MapEntry<core::String*, core::double*>>* :sync-for-iterator = mapStringDouble.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::num*>* #t221 = :sync-for-iterator.{core::Iterator::current};
-          #t219.{core::Map::[]=}{Invariant}(#t221.{core::MapEntry::key}, #t221.{core::MapEntry::value});
-        }
-      }
-    #t219.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t219;
-  core::List<dynamic>* list82 = block {
-    final core::List<dynamic>* #t222 = core::_GrowableList::•<dynamic>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t222.{core::List::addAll}{Invariant}(listInt);
-      else
-        #t222.{core::List::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-  } =>#t222;
-  core::Set<dynamic>* set82 = block {
-    final core::Set<dynamic>* #t223 = new col::_CompactLinkedHashSet::•<dynamic>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t223.{core::Set::addAll}{Invariant}(listInt);
-      else
-        #t223.{core::Set::addAll}{Invariant}(dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t223.{core::Set::add}{Invariant}(null);
-  } =>#t223;
-  core::Map<dynamic, dynamic>* map82 = block {
-    final core::Map<dynamic, dynamic>* #t224 = <dynamic, dynamic>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapStringInt.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<dynamic, dynamic>* #t225 = :sync-for-iterator.{core::Iterator::current};
-          #t224.{core::Map::[]=}{Invariant}(#t225.{core::MapEntry::key}, #t225.{core::MapEntry::value});
-        }
-      }
-      else {
-        core::Iterator<core::MapEntry<dynamic, dynamic>>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<dynamic, dynamic>* #t226 = :sync-for-iterator.{core::Iterator::current};
-          #t224.{core::Map::[]=}{Invariant}(#t226.{core::MapEntry::key}, #t226.{core::MapEntry::value});
-        }
-      }
-    #t224.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t224;
-  core::List<core::num*>* list83 = block {
-    final core::List<core::num*>* #t227 = core::_GrowableList::•<core::num*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t227.{core::List::add}{Invariant}(42);
-      else
-        #t227.{core::List::addAll}{Invariant}(listDouble);
-  } =>#t227;
-  core::Set<core::num*>* set83 = block {
-    final core::Set<core::num*>* #t228 = new col::_CompactLinkedHashSet::•<core::num*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-        #t228.{core::Set::addAll}{Invariant}(listInt);
-      else
-        #t228.{core::Set::add}{Invariant}(3.14);
-    #t228.{core::Set::add}{Invariant}(null);
-  } =>#t228;
-  core::Map<core::String*, core::num*>* map83 = block {
-    final core::Map<core::String*, core::num*>* #t229 = <core::String*, core::num*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*) {
-        core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapStringInt.{core::Map::entries}.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::MapEntry<core::String*, core::num*>* #t230 = :sync-for-iterator.{core::Iterator::current};
-          #t229.{core::Map::[]=}{Invariant}(#t230.{core::MapEntry::key}, #t230.{core::MapEntry::value});
-        }
-      }
-      else
-        #t229.{core::Map::[]=}{Invariant}("bar", 3.14);
-    #t229.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t229;
-  core::List<core::int*>* list90 = block {
-    final core::List<core::int*>* #t231 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t231.{core::List::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-  } =>#t231;
-  core::Set<core::int*>* set90 = block {
-    final core::Set<core::int*>* #t232 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t232.{core::Set::add}{Invariant}(dynVar as{TypeError,ForDynamic} core::int*);
-    #t232.{core::Set::add}{Invariant}(null);
-  } =>#t232;
-  core::Map<core::String*, core::int*>* map90 = block {
-    final core::Map<core::String*, core::int*>* #t233 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-      #t233.{core::Map::[]=}{Invariant}("bar", dynVar as{TypeError,ForDynamic} core::int*);
-    #t233.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t233;
-  core::List<core::int*>* list91 = block {
-    final core::List<core::int*>* #t234 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t235 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t236 = #t235 as{TypeError} core::int*;
-          #t234.{core::List::add}{Invariant}(#t236);
-        }
-      }
-    }
-  } =>#t234;
-  core::Set<core::int*>* set91 = block {
-    final core::Set<core::int*>* #t237 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t238 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t239 = #t238 as{TypeError} core::int*;
-          #t237.{core::Set::add}{Invariant}(#t239);
-        }
-      }
-    }
-    #t237.{core::Set::add}{Invariant}(null);
-  } =>#t237;
-  core::Map<core::String*, core::int*>* map91 = block {
-    final core::Map<core::String*, core::int*>* #t240 = <core::String*, core::int*>{};
-    for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-      core::Iterator<core::MapEntry<dynamic, dynamic>>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<dynamic, dynamic>* #t241 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::String* #t242 = #t241.{core::MapEntry::key} as{TypeError} core::String*;
-          final core::int* #t243 = #t241.{core::MapEntry::value} as{TypeError} core::int*;
-          #t240.{core::Map::[]=}{Invariant}(#t242, #t243);
-        }
-      }
-    }
-    #t240.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t240;
-  core::List<core::int*>* list100 = block {
-    final core::List<core::int*>* #t244 = core::_GrowableList::•<core::int*>(0);
-    for (final core::int* #t245 = index = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; index = index.{core::num::+}(1))
-      #t244.{core::List::add}{Invariant}(42);
-  } =>#t244;
-  core::Set<core::int*>* set100 = block {
-    final core::Set<core::int*>* #t246 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (final core::int* #t247 = index = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; index = index.{core::num::+}(1))
-      #t246.{core::Set::add}{Invariant}(42);
-  } =>#t246;
-  core::Map<core::String*, core::int*>* map100 = block {
-    final core::Map<core::String*, core::int*>* #t248 = <core::String*, core::int*>{};
-    for (final core::int* #t249 = index = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; index = index.{core::num::+}(1))
-      #t248.{core::Map::[]=}{Invariant}("bar", 42);
-  } =>#t248;
-  core::List<core::int*>* list110 = block {
-    final core::List<core::int*>* #t250 = core::_GrowableList::•<core::int*>(0);
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(1, 2, 3).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        #t250.{core::List::add}{Invariant}(i);
-      }
-    }
-  } =>#t250;
-  core::Set<core::int*>* set110 = block {
-    final core::Set<core::int*>* #t251 = new col::_CompactLinkedHashSet::•<core::int*>();
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(1, 2, 3).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        #t251.{core::Set::add}{Invariant}(i);
-      }
-    }
-    #t251.{core::Set::add}{Invariant}(null);
-  } =>#t251;
-  core::Map<core::String*, core::int*>* map110 = block {
-    final core::Map<core::String*, core::int*>* #t252 = <core::String*, core::int*>{};
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal3<core::int*>(1, 2, 3).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        core::int* i = :sync-for-iterator.{core::Iterator::current};
-        #t252.{core::Map::[]=}{Invariant}("bar", i);
-      }
-    }
-    #t252.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t252;
-  core::List<core::int*>* list120 = block {
-    final core::List<core::int*>* #t253 = core::_GrowableList::•<core::int*>(0);
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        dynamic i = :sync-for-iterator.{core::Iterator::current};
-        #t253.{core::List::add}{Invariant}(i as{TypeError,ForDynamic} core::int*);
-      }
-    }
-  } =>#t253;
-  core::Set<core::int*>* set120 = block {
-    final core::Set<core::int*>* #t254 = new col::_CompactLinkedHashSet::•<core::int*>();
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        dynamic i = :sync-for-iterator.{core::Iterator::current};
-        #t254.{core::Set::add}{Invariant}(i as{TypeError,ForDynamic} core::int*);
-      }
-    }
-    #t254.{core::Set::add}{Invariant}(null);
-  } =>#t254;
-  core::Map<core::String*, core::int*>* map120 = block {
-    final core::Map<core::String*, core::int*>* #t255 = <core::String*, core::int*>{};
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        dynamic i = :sync-for-iterator.{core::Iterator::current};
-        #t255.{core::Map::[]=}{Invariant}("bar", i as{TypeError,ForDynamic} core::int*);
-      }
-    }
-    #t255.{core::Map::[]=}{Invariant}("baz", null);
-  } =>#t255;
-  core::List<core::int*>* list130 = block {
-    final core::List<core::int*>* #t256 = core::_GrowableList::•<core::int*>(0);
-    for (core::int* i = 1; i.{core::num::<}(2); i = i.{core::num::+}(1))
-      #t256.{core::List::add}{Invariant}(i);
-  } =>#t256;
-  core::Set<core::int*>* set130 = block {
-    final core::Set<core::int*>* #t257 = new col::_CompactLinkedHashSet::•<core::int*>();
-    for (core::int* i = 1; i.{core::num::<}(2); i = i.{core::num::+}(1))
-      #t257.{core::Set::add}{Invariant}(i);
-  } =>#t257;
-  core::Map<core::int*, core::int*>* map130 = block {
-    final core::Map<core::int*, core::int*>* #t258 = <core::int*, core::int*>{};
-    for (core::int* i = 1; i.{core::num::<}(2); i = i.{core::num::+}(1))
-      #t258.{core::Map::[]=}{Invariant}(i, i);
-  } =>#t258;
-}
-static method testForElementErrors(core::Map<core::int*, core::int*>* map, core::List<core::int*>* list) → dynamic /* originally async */ {
-  final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-  core::bool* :is_sync = false;
-  FutureOr<dynamic>* :return_value;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  dynamic :exception0;
-  dynamic :stack_trace0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try {
-      #L1:
-      {
-        block {
-          final core::List<core::int*>* #t259 = core::_GrowableList::•<core::int*>(0);
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            #t259.{core::List::add}{Invariant}(let final<BottomType> #t260 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:212:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) \"bar\"];
-                                            ^" in "bar" as{TypeError} core::int*);
-        } =>#t259;
-        block {
-          final core::Set<core::int*>* #t261 = new col::_CompactLinkedHashSet::•<core::int*>();
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            #t261.{core::Set::add}{Invariant}(let final<BottomType> #t262 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:213:45: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\", null};
-                                            ^" in "bar" as{TypeError} core::int*);
-          #t261.{core::Set::add}{Invariant}(null);
-        } =>#t261;
-        block {
-          final core::Map<core::int*, core::int*>* #t263 = <core::int*, core::int*>{};
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            #t263.{core::Map::[]=}{Invariant}(let final<BottomType> #t264 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:50: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\": \"bar\", \"baz\": null};
-                                                 ^" in "bar" as{TypeError} core::int*, let final<BottomType> #t265 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\": \"bar\", \"baz\": null};
-                                                        ^" in "bar" as{TypeError} core::int*);
-          #t263.{core::Map::[]=}{Invariant}(let final<BottomType> #t266 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:214:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) \"bar\": \"bar\", \"baz\": null};
-                                                               ^" in "baz" as{TypeError} core::int*, null);
-        } =>#t263;
-        block {
-          final core::List<core::int*>* #t267 = core::_GrowableList::•<core::int*>(0);
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            #t267.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(let final<BottomType> #t268 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:215:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) ...[\"bar\"]];
-                                                ^" in "bar" as{TypeError} core::int*));
-        } =>#t267;
-        block {
-          final core::Set<core::int*>* #t269 = new col::_CompactLinkedHashSet::•<core::int*>();
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            #t269.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(let final<BottomType> #t270 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:216:49: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) ...[\"bar\"], null};
-                                                ^" in "bar" as{TypeError} core::int*));
-          #t269.{core::Set::add}{Invariant}(null);
-        } =>#t269;
-        block {
-          final core::Map<core::int*, core::int*>* #t271 = <core::int*, core::int*>{};
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1)) {
-            core::Iterator<core::MapEntry<core::int*, core::int*>>* :sync-for-iterator = <core::int*, core::int*>{let final<BottomType> #t272 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:54: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                                     ^" in "bar" as{TypeError} core::int*: let final<BottomType> #t273 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:61: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                                            ^" in "bar" as{TypeError} core::int*}.{core::Map::entries}.{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              final core::MapEntry<core::int*, core::int*>* #t274 = :sync-for-iterator.{core::Iterator::current};
-              #t271.{core::Map::[]=}{Invariant}(#t274.{core::MapEntry::key}, #t274.{core::MapEntry::value});
-            }
-          }
-          #t271.{core::Map::[]=}{Invariant}(let final<BottomType> #t275 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:217:69: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...{\"bar\": \"bar\"}, \"baz\": null};
-                                                                    ^" in "baz" as{TypeError} core::int*, null);
-        } =>#t271;
-        block {
-          final core::List<core::int*>* #t276 = core::_GrowableList::•<core::int*>(0);
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            #t276.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:218:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) ...map];
-                                               ^");
-        } =>#t276;
-        block {
-          final core::Set<core::int*>* #t277 = new col::_CompactLinkedHashSet::•<core::int*>();
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            #t277.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:219:48: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) ...map, null};
-                                               ^");
-          #t277.{core::Set::add}{Invariant}(null);
-        } =>#t277;
-        <core::int*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:220:53: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...list, 42: null};
-                                                    ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:220:53: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <int, int>{for (int i = 0; oracle(\"foo\"); i++) ...list, 42: null};
-                                                    ^": null};
-        block {
-          final core::List<core::String*>* #t278 = core::_GrowableList::•<core::String*>(0);
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-              #t278.{core::List::add}{Invariant}(let final<BottomType> #t279 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14];
-                                                             ^" in 42 as{TypeError} core::String*);
-            else
-              #t278.{core::List::add}{Invariant}(let final<BottomType> #t280 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:221:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14];
-                                                                     ^" in 3.14 as{TypeError} core::String*);
-        } =>#t278;
-        block {
-          final core::Set<core::String*>* #t281 = new col::_CompactLinkedHashSet::•<core::String*>();
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-              #t281.{core::Set::add}{Invariant}(let final<BottomType> #t282 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:62: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14, null};
-                                                             ^" in 42 as{TypeError} core::String*);
-            else
-              #t281.{core::Set::add}{Invariant}(let final<BottomType> #t283 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:222:70: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else 3.14, null};
-                                                                     ^" in 3.14 as{TypeError} core::String*);
-          #t281.{core::Set::add}{Invariant}(null);
-        } =>#t281;
-        block {
-          final core::Map<core::String*, core::String*>* #t284 = <core::String*, core::String*>{};
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-              #t284.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t285 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:77: Error: A value of type 'int' can't be assigned to a variable of type 'String'.
-  <String, String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else \"bar\": 3.14, \"baz\": null};
-                                                                            ^" in 42 as{TypeError} core::String*);
-            else
-              #t284.{core::Map::[]=}{Invariant}("bar", let final<BottomType> #t286 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:223:92: Error: A value of type 'double' can't be assigned to a variable of type 'String'.
-  <String, String>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else \"bar\": 3.14, \"baz\": null};
-                                                                                           ^" in 3.14 as{TypeError} core::String*);
-          #t284.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t284;
-        block {
-          final core::List<core::int*>* #t287 = core::_GrowableList::•<core::int*>(0);
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-              #t287.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:224:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...map else 42];
-                                                             ^");
-            else
-              #t287.{core::List::add}{Invariant}(42);
-        } =>#t287;
-        block {
-          final core::Set<core::int*>* #t288 = new col::_CompactLinkedHashSet::•<core::int*>();
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-              #t288.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:225:62: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...map else 42, null};
-                                                             ^");
-            else
-              #t288.{core::Set::add}{Invariant}(42);
-          #t288.{core::Set::add}{Invariant}(null);
-        } =>#t288;
-        <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:226:70: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...list else \"bar\": 42, \"baz\": null};
-                                                                     ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:226:70: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) ...list else \"bar\": 42, \"baz\": null};
-                                                                     ^": null};
-        block {
-          final core::List<core::int*>* #t289 = core::_GrowableList::•<core::int*>(0);
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-              #t289.{core::List::add}{Invariant}(42);
-            else
-              #t289.{core::List::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:227:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>[for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else ...map];
-                                                                     ^");
-        } =>#t289;
-        block {
-          final core::Set<core::int*>* #t290 = new col::_CompactLinkedHashSet::•<core::int*>();
-          for (core::int* i = 0; self::oracle<core::String*>("foo") as{TypeError,ForDynamic} core::bool*; i = i.{core::num::+}(1))
-            if(self::oracle<dynamic>() as{TypeError,ForDynamic} core::bool*)
-              #t290.{core::Set::add}{Invariant}(42);
-            else
-              #t290.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:228:70: Error: Unexpected type 'Map<int, int>' of a spread.  Expected 'dynamic' or an Iterable.
- - 'Map' is from 'dart:core'.
-  <int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) 42 else ...map, null};
-                                                                     ^");
-          #t290.{core::Set::add}{Invariant}(null);
-        } =>#t290;
-        <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:229:85: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else ...list, \"baz\": null};
-                                                                                    ^": null, invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:229:85: Error: Unexpected type 'List<int>' of a map spread entry.  Expected 'dynamic' or a Map.
- - 'List' is from 'dart:core'.
-  <String, int>{for (int i = 0; oracle(\"foo\"); i++) if (oracle()) \"bar\": 42 else ...list, \"baz\": null};
-                                                                                    ^": null};
-        final core::int* i = 0;
-        block {
-          final core::List<core::int*>* #t291 = core::_GrowableList::•<core::int*>(0);
-          {
-            core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal1<core::int*>(1).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              final core::int* #t292 = :sync-for-iterator.{core::Iterator::current};
-              {
-                invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:232:14: Error: Can't assign to the final variable 'i'.
-  <int>[for (i in <int>[1]) i];
-             ^";
-                #t291.{core::List::add}{Invariant}(i);
-              }
-            }
-          }
-        } =>#t291;
-        block {
-          final core::Set<core::int*>* #t293 = new col::_CompactLinkedHashSet::•<core::int*>();
-          {
-            core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal1<core::int*>(1).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              final core::int* #t294 = :sync-for-iterator.{core::Iterator::current};
-              {
-                invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:233:14: Error: Can't assign to the final variable 'i'.
-  <int>{for (i in <int>[1]) i, null};
-             ^";
-                #t293.{core::Set::add}{Invariant}(i);
-              }
-            }
-          }
-          #t293.{core::Set::add}{Invariant}(null);
-        } =>#t293;
-        block {
-          final core::Map<core::String*, core::int*>* #t295 = <core::String*, core::int*>{};
-          {
-            core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal1<core::int*>(1).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              final core::int* #t296 = :sync-for-iterator.{core::Iterator::current};
-              {
-                invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:234:21: Error: Can't assign to the final variable 'i'.
-\t<String, int>{for (i in <int>[1]) \"bar\": i, \"baz\": null};
-\t                   ^";
-                #t295.{core::Map::[]=}{Invariant}("bar", i);
-              }
-            }
-          }
-          #t295.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t295;
-        core::List<dynamic>* list10 = block {
-          final core::List<dynamic>* #t297 = core::_GrowableList::•<dynamic>(0);
-          {
-            core::Iterator<dynamic>* :sync-for-iterator = (let final<BottomType> #t298 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:236:31: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
- - 'Iterable' is from 'dart:core'.
-  var list10 = [for (var i in \"not iterable\") i];
-                              ^" in "not iterable" as{TypeError} core::Iterable<dynamic>*).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              dynamic i = :sync-for-iterator.{core::Iterator::current};
-              #t297.{core::List::add}{Invariant}(i);
-            }
-          }
-        } =>#t297;
-        core::Set<dynamic>* set10 = block {
-          final core::Set<dynamic>* #t299 = new col::_CompactLinkedHashSet::•<dynamic>();
-          {
-            core::Iterator<dynamic>* :sync-for-iterator = (let final<BottomType> #t300 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:237:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
- - 'Iterable' is from 'dart:core'.
-  var set10 = {for (var i in \"not iterable\") i, null};
-                             ^" in "not iterable" as{TypeError} core::Iterable<dynamic>*).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              dynamic i = :sync-for-iterator.{core::Iterator::current};
-              #t299.{core::Set::add}{Invariant}(i);
-            }
-          }
-          #t299.{core::Set::add}{Invariant}(null);
-        } =>#t299;
-        core::Map<core::String*, dynamic>* map10 = block {
-          final core::Map<core::String*, dynamic>* #t301 = <core::String*, dynamic>{};
-          {
-            core::Iterator<dynamic>* :sync-for-iterator = (let final<BottomType> #t302 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:238:30: Error: The type 'String' used in the 'for' loop must implement 'Iterable<dynamic>'.
- - 'Iterable' is from 'dart:core'.
-  var map10 = {for (var i in \"not iterable\") \"bar\": i, \"baz\": null};
-                             ^" in "not iterable" as{TypeError} core::Iterable<dynamic>*).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              dynamic i = :sync-for-iterator.{core::Iterator::current};
-              #t301.{core::Map::[]=}{Invariant}("bar", i);
-            }
-          }
-          #t301.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t301;
-        core::List<core::int*>* list20 = block {
-          final core::List<core::int*>* #t303 = core::_GrowableList::•<core::int*>(0);
-          {
-            core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal2<core::int*>(let final<BottomType> #t304 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:32: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list20 = [for (int i in [\"not\", \"int\"]) i];
-                               ^" in "not" as{TypeError} core::int*, let final<BottomType> #t305 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:239:39: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list20 = [for (int i in [\"not\", \"int\"]) i];
-                                      ^" in "int" as{TypeError} core::int*).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              core::int* i = :sync-for-iterator.{core::Iterator::current};
-              #t303.{core::List::add}{Invariant}(i);
-            }
-          }
-        } =>#t303;
-        core::Set<core::int*>* set20 = block {
-          final core::Set<core::int*>* #t306 = new col::_CompactLinkedHashSet::•<core::int*>();
-          {
-            core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal2<core::int*>(let final<BottomType> #t307 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set20 = {for (int i in [\"not\", \"int\"]) i, null};
-                              ^" in "not" as{TypeError} core::int*, let final<BottomType> #t308 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:240:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set20 = {for (int i in [\"not\", \"int\"]) i, null};
-                                     ^" in "int" as{TypeError} core::int*).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              core::int* i = :sync-for-iterator.{core::Iterator::current};
-              #t306.{core::Set::add}{Invariant}(i);
-            }
-          }
-          #t306.{core::Set::add}{Invariant}(null);
-        } =>#t306;
-        core::Map<core::String*, core::int*>* map20 = block {
-          final core::Map<core::String*, core::int*>* #t309 = <core::String*, core::int*>{};
-          {
-            core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::_literal2<core::int*>(let final<BottomType> #t310 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:31: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map20 = {for (int i in [\"not\", \"int\"]) \"bar\": i, \"baz\": null};
-                              ^" in "not" as{TypeError} core::int*, let final<BottomType> #t311 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:241:38: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map20 = {for (int i in [\"not\", \"int\"]) \"bar\": i, \"baz\": null};
-                                     ^" in "int" as{TypeError} core::int*).{core::Iterable::iterator};
-            for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-              core::int* i = :sync-for-iterator.{core::Iterator::current};
-              #t309.{core::Map::[]=}{Invariant}("bar", i);
-            }
-          }
-          #t309.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t309;
-        final core::List<dynamic>* #t312 = core::_GrowableList::•<dynamic>(0);
-        {
-          asy::Stream<dynamic>* :stream = let final<BottomType> #t313 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:242:37: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
- - 'Stream' is from 'dart:async'.
-  var list30 = [await for (var i in \"not stream\") i];
-                                    ^" in "not stream" as{TypeError} asy::Stream<dynamic>*;
-          asy::_StreamIterator<dynamic>* :for-iterator = new asy::_StreamIterator::•<dynamic>(:stream);
-          try
-            #L2:
-            while (true) {
-              dynamic #t314 = asy::_asyncStarMoveNextHelper(:stream);
-              [yield] let dynamic #t315 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::moveNext}(), :async_op_then, :async_op_error, :async_op) in null;
-              if(_in::unsafeCast<core::bool>(:result)) {
-                dynamic i = :for-iterator.{asy::_StreamIterator::current};
-                #t312.{core::List::add}{Invariant}(i);
-              }
-              else
-                break #L2;
-            }
-          finally
-            if(!:for-iterator.{asy::_StreamIterator::_subscription}.{core::Object::==}(null)) {
-              [yield] let dynamic #t316 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::cancel}(), :async_op_then, :async_op_error, :async_op) in null;
-              :result;
-            }
-        }
-        core::List<dynamic>* list30 = block {} =>#t312;
-        final core::Set<dynamic>* #t317 = new col::_CompactLinkedHashSet::•<dynamic>();
-        {
-          asy::Stream<dynamic>* :stream = let final<BottomType> #t318 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:243:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
- - 'Stream' is from 'dart:async'.
-  var set30 = {await for (var i in \"not stream\") i, null};
-                                   ^" in "not stream" as{TypeError} asy::Stream<dynamic>*;
-          asy::_StreamIterator<dynamic>* :for-iterator = new asy::_StreamIterator::•<dynamic>(:stream);
-          try
-            #L3:
-            while (true) {
-              dynamic #t319 = asy::_asyncStarMoveNextHelper(:stream);
-              [yield] let dynamic #t320 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::moveNext}(), :async_op_then, :async_op_error, :async_op) in null;
-              if(_in::unsafeCast<core::bool>(:result)) {
-                dynamic i = :for-iterator.{asy::_StreamIterator::current};
-                #t317.{core::Set::add}{Invariant}(i);
-              }
-              else
-                break #L3;
-            }
-          finally
-            if(!:for-iterator.{asy::_StreamIterator::_subscription}.{core::Object::==}(null)) {
-              [yield] let dynamic #t321 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::cancel}(), :async_op_then, :async_op_error, :async_op) in null;
-              :result;
-            }
-        }
-        core::Set<dynamic>* set30 = block {
-          #t317.{core::Set::add}{Invariant}(null);
-        } =>#t317;
-        final core::Map<core::String*, dynamic>* #t322 = <core::String*, dynamic>{};
-        {
-          asy::Stream<dynamic>* :stream = let final<BottomType> #t323 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:244:36: Error: The type 'String' used in the 'for' loop must implement 'Stream<dynamic>'.
- - 'Stream' is from 'dart:async'.
-  var map30 = {await for (var i in \"not stream\") \"bar\": i, \"baz\": null};
-                                   ^" in "not stream" as{TypeError} asy::Stream<dynamic>*;
-          asy::_StreamIterator<dynamic>* :for-iterator = new asy::_StreamIterator::•<dynamic>(:stream);
-          try
-            #L4:
-            while (true) {
-              dynamic #t324 = asy::_asyncStarMoveNextHelper(:stream);
-              [yield] let dynamic #t325 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::moveNext}(), :async_op_then, :async_op_error, :async_op) in null;
-              if(_in::unsafeCast<core::bool>(:result)) {
-                dynamic i = :for-iterator.{asy::_StreamIterator::current};
-                #t322.{core::Map::[]=}{Invariant}("bar", i);
-              }
-              else
-                break #L4;
-            }
-          finally
-            if(!:for-iterator.{asy::_StreamIterator::_subscription}.{core::Object::==}(null)) {
-              [yield] let dynamic #t326 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::cancel}(), :async_op_then, :async_op_error, :async_op) in null;
-              :result;
-            }
-        }
-        core::Map<core::String*, dynamic>* map30 = block {
-          #t322.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t322;
-        final core::List<core::int*>* #t327 = core::_GrowableList::•<core::int*>(0);
-        {
-          asy::Stream<core::int*> :stream = asy::Stream::fromIterable<core::int*>(core::_GrowableList::_literal2<core::int*>(let final<BottomType> #t328 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:58: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list40 = [await for (int i in Stream.fromIterable([\"not\", \"int\"])) i];
-                                                         ^" in "not" as{TypeError} core::int*, let final<BottomType> #t329 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:245:65: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var list40 = [await for (int i in Stream.fromIterable([\"not\", \"int\"])) i];
-                                                                ^" in "int" as{TypeError} core::int*));
-          asy::_StreamIterator<core::int*>* :for-iterator = new asy::_StreamIterator::•<core::int*>(:stream);
-          try
-            #L5:
-            while (true) {
-              dynamic #t330 = asy::_asyncStarMoveNextHelper(:stream);
-              [yield] let dynamic #t331 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::moveNext}(), :async_op_then, :async_op_error, :async_op) in null;
-              if(_in::unsafeCast<core::bool>(:result)) {
-                core::int* i = :for-iterator.{asy::_StreamIterator::current};
-                #t327.{core::List::add}{Invariant}(i);
-              }
-              else
-                break #L5;
-            }
-          finally
-            if(!:for-iterator.{asy::_StreamIterator::_subscription}.{core::Object::==}(null)) {
-              [yield] let dynamic #t332 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::cancel}(), :async_op_then, :async_op_error, :async_op) in null;
-              :result;
-            }
-        }
-        core::List<core::int*>* list40 = block {} =>#t327;
-        final core::Set<core::int*>* #t333 = new col::_CompactLinkedHashSet::•<core::int*>();
-        {
-          asy::Stream<core::int*> :stream = asy::Stream::fromIterable<core::int*>(core::_GrowableList::_literal2<core::int*>(let final<BottomType> #t334 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) i, null};
-                                                        ^" in "not" as{TypeError} core::int*, let final<BottomType> #t335 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:246:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var set40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) i, null};
-                                                               ^" in "int" as{TypeError} core::int*));
-          asy::_StreamIterator<core::int*>* :for-iterator = new asy::_StreamIterator::•<core::int*>(:stream);
-          try
-            #L6:
-            while (true) {
-              dynamic #t336 = asy::_asyncStarMoveNextHelper(:stream);
-              [yield] let dynamic #t337 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::moveNext}(), :async_op_then, :async_op_error, :async_op) in null;
-              if(_in::unsafeCast<core::bool>(:result)) {
-                core::int* i = :for-iterator.{asy::_StreamIterator::current};
-                #t333.{core::Set::add}{Invariant}(i);
-              }
-              else
-                break #L6;
-            }
-          finally
-            if(!:for-iterator.{asy::_StreamIterator::_subscription}.{core::Object::==}(null)) {
-              [yield] let dynamic #t338 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::cancel}(), :async_op_then, :async_op_error, :async_op) in null;
-              :result;
-            }
-        }
-        core::Set<core::int*>* set40 = block {
-          #t333.{core::Set::add}{Invariant}(null);
-        } =>#t333;
-        final core::Map<core::String*, core::int*>* #t339 = <core::String*, core::int*>{};
-        {
-          asy::Stream<core::int*> :stream = asy::Stream::fromIterable<core::int*>(core::_GrowableList::_literal2<core::int*>(let final<BottomType> #t340 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:57: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) \"bar\": i, \"baz\": null};
-                                                        ^" in "not" as{TypeError} core::int*, let final<BottomType> #t341 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:247:64: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  var map40 = {await for (int i in Stream.fromIterable([\"not\", \"int\"])) \"bar\": i, \"baz\": null};
-                                                               ^" in "int" as{TypeError} core::int*));
-          asy::_StreamIterator<core::int*>* :for-iterator = new asy::_StreamIterator::•<core::int*>(:stream);
-          try
-            #L7:
-            while (true) {
-              dynamic #t342 = asy::_asyncStarMoveNextHelper(:stream);
-              [yield] let dynamic #t343 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::moveNext}(), :async_op_then, :async_op_error, :async_op) in null;
-              if(_in::unsafeCast<core::bool>(:result)) {
-                core::int* i = :for-iterator.{asy::_StreamIterator::current};
-                #t339.{core::Map::[]=}{Invariant}("bar", i);
-              }
-              else
-                break #L7;
-            }
-          finally
-            if(!:for-iterator.{asy::_StreamIterator::_subscription}.{core::Object::==}(null)) {
-              [yield] let dynamic #t344 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::cancel}(), :async_op_then, :async_op_error, :async_op) in null;
-              :result;
-            }
-        }
-        core::Map<core::String*, core::int*>* map40 = block {
-          #t339.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t339;
-        core::List<core::int*>* list50 = block {
-          final core::List<core::int*>* #t345 = core::_GrowableList::•<core::int*>(0);
-          for (; ; )
-            #t345.{core::List::add}{Invariant}(42);
-        } =>#t345;
-        core::Set<core::int*>* set50 = block {
-          final core::Set<core::int*>* #t346 = new col::_CompactLinkedHashSet::•<core::int*>();
-          for (; ; )
-            #t346.{core::Set::add}{Invariant}(42);
-          #t346.{core::Set::add}{Invariant}(null);
-        } =>#t346;
-        core::Map<core::String*, core::int*>* map50 = block {
-          final core::Map<core::String*, core::int*>* #t347 = <core::String*, core::int*>{};
-          for (; ; )
-            #t347.{core::Map::[]=}{Invariant}("bar", 42);
-          #t347.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t347;
-        core::List<core::int*>* list60 = block {
-          final core::List<core::int*>* #t348 = core::_GrowableList::•<core::int*>(0);
-          for (; let final<BottomType> #t349 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:251:24: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-  var list60 = [for (; \"not bool\";) 42];
-                       ^" in "not bool" as{TypeError} core::bool*; )
-            #t348.{core::List::add}{Invariant}(42);
-        } =>#t348;
-        core::Set<core::int*>* set60 = block {
-          final core::Set<core::int*>* #t350 = new col::_CompactLinkedHashSet::•<core::int*>();
-          for (; let final<BottomType> #t351 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:252:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-  var set60 = {for (; \"not bool\";) 42, null};
-                      ^" in "not bool" as{TypeError} core::bool*; )
-            #t350.{core::Set::add}{Invariant}(42);
-          #t350.{core::Set::add}{Invariant}(null);
-        } =>#t350;
-        core::Map<core::String*, core::int*>* map60 = block {
-          final core::Map<core::String*, core::int*>* #t352 = <core::String*, core::int*>{};
-          for (; let final<BottomType> #t353 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/control_flow_collection_inference.dart:253:23: Error: A value of type 'String' can't be assigned to a variable of type 'bool'.
-  var map60 = {for (; \"not bool\";) \"bar\": 42, \"baz\": null};
-                      ^" in "not bool" as{TypeError} core::bool*; )
-            #t352.{core::Map::[]=}{Invariant}("bar", 42);
-          #t352.{core::Map::[]=}{Invariant}("baz", null);
-        } =>#t352;
-      }
-      asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-      return;
-    }
-    on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-      asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :async_op.call();
-  :is_sync = true;
-  return :async_future;
-}
-static method testForElementErrorsNotAsync(asy::Stream<core::int*>* stream) → dynamic {
-  block {
-    final core::List<core::int*>* #t354 = core::_GrowableList::•<core::int*>(0);
-    await for (core::int* i in stream)
-      #t354.{core::List::add}{Invariant}(i);
-  } =>#t354;
-  block {
-    final core::Set<core::int*>* #t355 = new col::_CompactLinkedHashSet::•<core::int*>();
-    await for (core::int* i in stream)
-      #t355.{core::Set::add}{Invariant}(i);
-  } =>#t355;
-  block {
-    final core::Map<core::String*, core::int*>* #t356 = <core::String*, core::int*>{};
-    await for (core::int* i in stream)
-      #t356.{core::Map::[]=}{Invariant}("bar", i);
-  } =>#t356;
-}
-static method testPromotion(self::A* a) → dynamic {
-  core::List<core::int*>* list10 = block {
-    final core::List<core::int*>* #t357 = core::_GrowableList::•<core::int*>(0);
-    if(a is self::B*)
-      #t357.{core::List::add}{Invariant}(a{self::B*}.{self::B::foo});
-  } =>#t357;
-  core::Set<core::int*>* set10 = block {
-    final core::Set<core::int*>* #t358 = new col::_CompactLinkedHashSet::•<core::int*>();
-    if(a is self::B*)
-      #t358.{core::Set::add}{Invariant}(a{self::B*}.{self::B::foo});
-  } =>#t358;
-  core::Map<core::int*, core::int*>* map10 = block {
-    final core::Map<core::int*, core::int*>* #t359 = <core::int*, core::int*>{};
-    if(a is self::B*)
-      #t359.{core::Map::[]=}{Invariant}(a{self::B*}.{self::B::foo}, a{self::B*}.{self::B::foo});
-  } =>#t359;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart
deleted file mode 100644
index 4ac4d16..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// 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.
-
-// @dart=2.6
-
-class A {
-  bool operator ==(covariant A other) => true;
-}
-
-class B extends A {
-  bool operator ==(other) => true;
-}
-
-class C<T> {
-  bool operator ==(covariant C<T> other) => true;
-}
-
-class D extends C<int> {}
-
-main() {}
-
-test(A a, B b, C c_dynamic, C<int> c_int, C<String> c_string, D d) {
-  a == a; // ok
-  a == b; // ok
-  a == c_dynamic; // error
-  a == c_int; // error
-  a == c_string; // error
-  a == d; // error
-
-  b == a; // ok
-  b == b; // ok
-  b == c_dynamic; // error
-  b == c_int; // error
-  b == c_string; // error
-  b == d; // error
-
-  c_dynamic == a; // error
-  c_dynamic == b; // error
-  c_dynamic == c_dynamic; // ok
-  c_dynamic == c_int; // ok
-  c_dynamic == c_string; // ok
-  c_dynamic == d; // ok
-
-  c_int == a; // error
-  c_int == b; // error
-  c_int == c_dynamic; // ok
-  c_int == c_int; // ok
-  c_int == c_string; // error
-  c_int == d; // ok}
-
-  c_string == a; // error
-  c_string == b; // error
-  c_string == c_dynamic; // ok
-  c_string == c_int; // error
-  c_string == c_string; // ok
-  c_string == d; // error
-
-  d == a; // error
-  d == b; // error
-  d == c_dynamic; // ok
-  d == c_int; // ok
-  d == c_string; // error
-  d == d; // ok
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.textual_outline.expect
deleted file mode 100644
index e4fba1e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.textual_outline.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-class A {
-  bool operator ==(covariant A other) => true;
-}
-
-class B extends A {
-  bool operator ==(other) => true;
-}
-
-class C<T> {
-  bool operator ==(covariant C<T> other) => true;
-}
-
-class D extends C<int> {}
-
-main() {}
-test(A a, B b, C c_dynamic, C<int> c_int, C<String> c_string, D d) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.textual_outline_modelled.expect
deleted file mode 100644
index e4fba1e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-class A {
-  bool operator ==(covariant A other) => true;
-}
-
-class B extends A {
-  bool operator ==(other) => true;
-}
-
-class C<T> {
-  bool operator ==(covariant C<T> other) => true;
-}
-
-class D extends C<int> {}
-
-main() {}
-test(A a, B b, C c_dynamic, C<int> c_int, C<String> c_string, D d) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.expect
deleted file mode 100644
index a4313bb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.expect
+++ /dev/null
@@ -1,284 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:26:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == c_dynamic; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:27:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == c_int; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:28:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == c_string; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:29:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == d; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:33:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == c_dynamic; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:34:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == c_int; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:35:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == c_string; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:36:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == d; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:38:16: Error: The argument type 'A' can't be assigned to the parameter type 'C<dynamic>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_dynamic == a; // error
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:39:16: Error: The argument type 'B' can't be assigned to the parameter type 'C<dynamic>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_dynamic == b; // error
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:45:12: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_int == a; // error
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:46:12: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_int == b; // error
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:49:12: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_int == c_string; // error
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:52:15: Error: The argument type 'A' can't be assigned to the parameter type 'C<String>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == a; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:53:15: Error: The argument type 'B' can't be assigned to the parameter type 'C<String>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == b; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:55:15: Error: The argument type 'C<int>' can't be assigned to the parameter type 'C<String>'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == c_int; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:57:15: Error: The argument type 'D' can't be assigned to the parameter type 'C<String>'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == d; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:59:8: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   d == a; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:60:8: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   d == b; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:63:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   d == c_string; // error
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator ==(covariant self::A* other) → core::bool*
-    return true;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  operator ==(covariant self::A* other) → core::bool*
-    return true;
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  operator ==(covariant generic-covariant-impl self::C<self::C::T*>* other) → core::bool*
-    return true;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C<core::int*> {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-static method main() → dynamic {}
-static method test(self::A* a, self::B* b, self::C<dynamic>* c_dynamic, self::C<core::int*>* c_int, self::C<core::String*>* c_string, self::D* d) → dynamic {
-  a.{self::A::==}(a);
-  a.{self::A::==}(b);
-  a.{self::A::==}(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:26:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == c_dynamic; // error
-       ^" in c_dynamic as{TypeError} self::A*);
-  a.{self::A::==}(let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:27:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == c_int; // error
-       ^" in c_int as{TypeError} self::A*);
-  a.{self::A::==}(let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:28:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == c_string; // error
-       ^" in c_string as{TypeError} self::A*);
-  a.{self::A::==}(let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:29:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == d; // error
-       ^" in d as{TypeError} self::A*);
-  b.{self::B::==}(a);
-  b.{self::B::==}(b);
-  b.{self::B::==}(let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:33:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == c_dynamic; // error
-       ^" in c_dynamic as{TypeError} self::A*);
-  b.{self::B::==}(let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:34:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == c_int; // error
-       ^" in c_int as{TypeError} self::A*);
-  b.{self::B::==}(let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:35:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == c_string; // error
-       ^" in c_string as{TypeError} self::A*);
-  b.{self::B::==}(let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:36:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == d; // error
-       ^" in d as{TypeError} self::A*);
-  c_dynamic.{self::C::==}(let final<BottomType> #t9 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:38:16: Error: The argument type 'A' can't be assigned to the parameter type 'C<dynamic>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_dynamic == a; // error
-               ^" in a as{TypeError} self::C<dynamic>*);
-  c_dynamic.{self::C::==}(let final<BottomType> #t10 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:39:16: Error: The argument type 'B' can't be assigned to the parameter type 'C<dynamic>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_dynamic == b; // error
-               ^" in b as{TypeError} self::C<dynamic>*);
-  c_dynamic.{self::C::==}(c_dynamic);
-  c_dynamic.{self::C::==}(c_int);
-  c_dynamic.{self::C::==}(c_string);
-  c_dynamic.{self::C::==}(d);
-  c_int.{self::C::==}(let final<BottomType> #t11 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:45:12: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_int == a; // error
-           ^" in a as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(let final<BottomType> #t12 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:46:12: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_int == b; // error
-           ^" in b as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(c_dynamic as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(c_int);
-  c_int.{self::C::==}(let final<BottomType> #t13 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:49:12: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_int == c_string; // error
-           ^" in c_string as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(d);
-  c_string.{self::C::==}(let final<BottomType> #t14 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:52:15: Error: The argument type 'A' can't be assigned to the parameter type 'C<String>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == a; // error
-              ^" in a as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(let final<BottomType> #t15 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:53:15: Error: The argument type 'B' can't be assigned to the parameter type 'C<String>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == b; // error
-              ^" in b as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(c_dynamic as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(let final<BottomType> #t16 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:55:15: Error: The argument type 'C<int>' can't be assigned to the parameter type 'C<String>'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == c_int; // error
-              ^" in c_int as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(c_string);
-  c_string.{self::C::==}(let final<BottomType> #t17 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:57:15: Error: The argument type 'D' can't be assigned to the parameter type 'C<String>'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == d; // error
-              ^" in d as{TypeError} self::C<core::String*>*);
-  d.{self::C::==}(let final<BottomType> #t18 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:59:8: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  d == a; // error
-       ^" in a as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(let final<BottomType> #t19 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:60:8: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  d == b; // error
-       ^" in b as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(c_dynamic as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(c_int);
-  d.{self::C::==}(let final<BottomType> #t20 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:63:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  d == c_string; // error
-       ^" in c_string as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(d);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.outline.expect
deleted file mode 100644
index 87e562f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.outline.expect
+++ /dev/null
@@ -1,48 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  operator ==(covariant self::A* other) → core::bool*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-  operator ==(covariant self::A* other) → core::bool*
-    ;
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  operator ==(covariant generic-covariant-impl self::C<self::C::T*>* other) → core::bool*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C<core::int*> {
-  synthetic constructor •() → self::D*
-    ;
-}
-static method main() → dynamic
-  ;
-static method test(self::A* a, self::B* b, self::C<dynamic>* c_dynamic, self::C<core::int*>* c_int, self::C<core::String*>* c_string, self::D* d) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.transformed.expect
deleted file mode 100644
index a4313bb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart.weak.transformed.expect
+++ /dev/null
@@ -1,284 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:26:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == c_dynamic; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:27:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == c_int; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:28:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == c_string; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:29:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   a == d; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:33:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == c_dynamic; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:34:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == c_int; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:35:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == c_string; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:36:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   b == d; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:38:16: Error: The argument type 'A' can't be assigned to the parameter type 'C<dynamic>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_dynamic == a; // error
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:39:16: Error: The argument type 'B' can't be assigned to the parameter type 'C<dynamic>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_dynamic == b; // error
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:45:12: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_int == a; // error
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:46:12: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_int == b; // error
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:49:12: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_int == c_string; // error
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:52:15: Error: The argument type 'A' can't be assigned to the parameter type 'C<String>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == a; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:53:15: Error: The argument type 'B' can't be assigned to the parameter type 'C<String>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == b; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:55:15: Error: The argument type 'C<int>' can't be assigned to the parameter type 'C<String>'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == c_int; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:57:15: Error: The argument type 'D' can't be assigned to the parameter type 'C<String>'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   c_string == d; // error
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:59:8: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   d == a; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:60:8: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   d == b; // error
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:63:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-//   d == c_string; // error
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator ==(covariant self::A* other) → core::bool*
-    return true;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  operator ==(covariant self::A* other) → core::bool*
-    return true;
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  operator ==(covariant generic-covariant-impl self::C<self::C::T*>* other) → core::bool*
-    return true;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C<core::int*> {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-static method main() → dynamic {}
-static method test(self::A* a, self::B* b, self::C<dynamic>* c_dynamic, self::C<core::int*>* c_int, self::C<core::String*>* c_string, self::D* d) → dynamic {
-  a.{self::A::==}(a);
-  a.{self::A::==}(b);
-  a.{self::A::==}(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:26:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == c_dynamic; // error
-       ^" in c_dynamic as{TypeError} self::A*);
-  a.{self::A::==}(let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:27:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == c_int; // error
-       ^" in c_int as{TypeError} self::A*);
-  a.{self::A::==}(let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:28:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == c_string; // error
-       ^" in c_string as{TypeError} self::A*);
-  a.{self::A::==}(let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:29:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  a == d; // error
-       ^" in d as{TypeError} self::A*);
-  b.{self::B::==}(a);
-  b.{self::B::==}(b);
-  b.{self::B::==}(let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:33:8: Error: The argument type 'C<dynamic>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == c_dynamic; // error
-       ^" in c_dynamic as{TypeError} self::A*);
-  b.{self::B::==}(let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:34:8: Error: The argument type 'C<int>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == c_int; // error
-       ^" in c_int as{TypeError} self::A*);
-  b.{self::B::==}(let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:35:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'A'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == c_string; // error
-       ^" in c_string as{TypeError} self::A*);
-  b.{self::B::==}(let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:36:8: Error: The argument type 'D' can't be assigned to the parameter type 'A'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  b == d; // error
-       ^" in d as{TypeError} self::A*);
-  c_dynamic.{self::C::==}(let final<BottomType> #t9 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:38:16: Error: The argument type 'A' can't be assigned to the parameter type 'C<dynamic>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_dynamic == a; // error
-               ^" in a as{TypeError} self::C<dynamic>*);
-  c_dynamic.{self::C::==}(let final<BottomType> #t10 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:39:16: Error: The argument type 'B' can't be assigned to the parameter type 'C<dynamic>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_dynamic == b; // error
-               ^" in b as{TypeError} self::C<dynamic>*);
-  c_dynamic.{self::C::==}(c_dynamic);
-  c_dynamic.{self::C::==}(c_int);
-  c_dynamic.{self::C::==}(c_string);
-  c_dynamic.{self::C::==}(d);
-  c_int.{self::C::==}(let final<BottomType> #t11 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:45:12: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_int == a; // error
-           ^" in a as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(let final<BottomType> #t12 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:46:12: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_int == b; // error
-           ^" in b as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(c_dynamic as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(c_int);
-  c_int.{self::C::==}(let final<BottomType> #t13 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:49:12: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_int == c_string; // error
-           ^" in c_string as{TypeError} self::C<core::int*>*);
-  c_int.{self::C::==}(d);
-  c_string.{self::C::==}(let final<BottomType> #t14 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:52:15: Error: The argument type 'A' can't be assigned to the parameter type 'C<String>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == a; // error
-              ^" in a as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(let final<BottomType> #t15 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:53:15: Error: The argument type 'B' can't be assigned to the parameter type 'C<String>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == b; // error
-              ^" in b as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(c_dynamic as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(let final<BottomType> #t16 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:55:15: Error: The argument type 'C<int>' can't be assigned to the parameter type 'C<String>'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == c_int; // error
-              ^" in c_int as{TypeError} self::C<core::String*>*);
-  c_string.{self::C::==}(c_string);
-  c_string.{self::C::==}(let final<BottomType> #t17 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:57:15: Error: The argument type 'D' can't be assigned to the parameter type 'C<String>'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  c_string == d; // error
-              ^" in d as{TypeError} self::C<core::String*>*);
-  d.{self::C::==}(let final<BottomType> #t18 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:59:8: Error: The argument type 'A' can't be assigned to the parameter type 'C<int>'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  d == a; // error
-       ^" in a as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(let final<BottomType> #t19 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:60:8: Error: The argument type 'B' can't be assigned to the parameter type 'C<int>'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  d == b; // error
-       ^" in b as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(c_dynamic as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(c_int);
-  d.{self::C::==}(let final<BottomType> #t20 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart:63:8: Error: The argument type 'C<String>' can't be assigned to the parameter type 'C<int>'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/covariant_equals.dart'.
-  d == c_string; // error
-       ^" in c_string as{TypeError} self::C<core::int*>*);
-  d.{self::C::==}(d);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart
deleted file mode 100644
index 91f55b8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-typedef void Callback<T>(T x);
-
-class Foo<T> {
-  final T finalField;
-  final Callback<T> callbackField;
-
-  T mutableField;
-  Callback<T> mutableCallbackField;
-
-  Foo(this.finalField, this.callbackField);
-
-  void method(T x) {}
-
-  set setter(T x) {}
-
-  void withCallback(Callback<T> callback) {
-    callback(finalField);
-  }
-}
-
-main() {
-  Foo<int> fooInt = new Foo<int>(1, (int x) {});
-
-  fooInt.method(3);
-  fooInt.setter = 3;
-  fooInt.withCallback((int x) {});
-  fooInt.withCallback((num x) {});
-  fooInt.mutableField = 3;
-  fooInt.mutableCallbackField = (int x) {};
-
-  Foo<num> fooNum = fooInt;
-  fooNum.method(3);
-  fooNum.method(2.5);
-  fooNum.setter = 3;
-  fooNum.setter = 2.5;
-  fooNum.withCallback((num x) {});
-  fooNum.mutableField = 3;
-  fooNum.mutableField = 2.5;
-  fooNum.mutableCallbackField(3);
-  fooNum.mutableCallbackField(2.5);
-  fooNum.mutableCallbackField = (num x) {};
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.textual_outline.expect
deleted file mode 100644
index 72ea40f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.textual_outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-typedef void Callback<T>(T x);
-
-class Foo<T> {
-  final T finalField;
-  final Callback<T> callbackField;
-  T mutableField;
-  Callback<T> mutableCallbackField;
-  Foo(this.finalField, this.callbackField);
-  void method(T x) {}
-  set setter(T x) {}
-  void withCallback(Callback<T> callback) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.textual_outline_modelled.expect
deleted file mode 100644
index 31c6cd5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class Foo<T> {
-  Callback<T> mutableCallbackField;
-  Foo(this.finalField, this.callbackField);
-  T mutableField;
-  final Callback<T> callbackField;
-  final T finalField;
-  set setter(T x) {}
-  void method(T x) {}
-  void withCallback(Callback<T> callback) {}
-}
-
-main() {}
-typedef void Callback<T>(T x);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.expect
deleted file mode 100644
index 48b1bf5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef Callback<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  final field self::Foo::T* finalField;
-  final field (self::Foo::T*) →* void callbackField;
-  generic-covariant-impl field self::Foo::T* mutableField = null;
-  field (self::Foo::T*) →* void mutableCallbackField = null;
-  constructor •(self::Foo::T* finalField, (self::Foo::T*) →* void callbackField) → self::Foo<self::Foo::T*>*
-    : self::Foo::finalField = finalField, self::Foo::callbackField = callbackField, super core::Object::•()
-    ;
-  method method(generic-covariant-impl self::Foo::T* x) → void {}
-  set setter(generic-covariant-impl self::Foo::T* x) → void {}
-  method withCallback((self::Foo::T*) →* void callback) → void {
-    callback.call(this.{self::Foo::finalField});
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo<core::int*>* fooInt = new self::Foo::•<core::int*>(1, (core::int* x) → Null {});
-  fooInt.{self::Foo::method}(3);
-  fooInt.{self::Foo::setter} = 3;
-  fooInt.{self::Foo::withCallback}((core::int* x) → Null {});
-  fooInt.{self::Foo::withCallback}((core::num* x) → Null {});
-  fooInt.{self::Foo::mutableField} = 3;
-  fooInt.{self::Foo::mutableCallbackField} = (core::int* x) → Null {};
-  self::Foo<core::num*>* fooNum = fooInt;
-  fooNum.{self::Foo::method}(3);
-  fooNum.{self::Foo::method}(2.5);
-  fooNum.{self::Foo::setter} = 3;
-  fooNum.{self::Foo::setter} = 2.5;
-  fooNum.{self::Foo::withCallback}((core::num* x) → Null {});
-  fooNum.{self::Foo::mutableField} = 3;
-  fooNum.{self::Foo::mutableField} = 2.5;
-  let final self::Foo<core::num*>* #t1 = fooNum in let final core::int* #t2 = 3 in (#t1.{self::Foo::mutableCallbackField} as{TypeError,CovarianceCheck} (core::num*) →* void).call(#t2);
-  let final self::Foo<core::num*>* #t3 = fooNum in let final core::double* #t4 = 2.5 in (#t3.{self::Foo::mutableCallbackField} as{TypeError,CovarianceCheck} (core::num*) →* void).call(#t4);
-  fooNum.{self::Foo::mutableCallbackField} = (core::num* x) → Null {};
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.outline.expect
deleted file mode 100644
index e37f335..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.outline.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef Callback<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  final field self::Foo::T* finalField;
-  final field (self::Foo::T*) →* void callbackField;
-  generic-covariant-impl field self::Foo::T* mutableField;
-  field (self::Foo::T*) →* void mutableCallbackField;
-  constructor •(self::Foo::T* finalField, (self::Foo::T*) →* void callbackField) → self::Foo<self::Foo::T*>*
-    ;
-  method method(generic-covariant-impl self::Foo::T* x) → void
-    ;
-  set setter(generic-covariant-impl self::Foo::T* x) → void
-    ;
-  method withCallback((self::Foo::T*) →* void callback) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.transformed.expect
deleted file mode 100644
index bcccf29..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_generic.dart.weak.transformed.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef Callback<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  final field self::Foo::T* finalField;
-  final field (self::Foo::T*) →* void callbackField;
-  generic-covariant-impl field self::Foo::T* mutableField = null;
-  field (self::Foo::T*) →* void mutableCallbackField = null;
-  constructor •(self::Foo::T* finalField, (self::Foo::T*) →* void callbackField) → self::Foo<self::Foo::T*>*
-    : self::Foo::finalField = finalField, self::Foo::callbackField = callbackField, super core::Object::•()
-    ;
-  method method(generic-covariant-impl self::Foo::T* x) → void {}
-  set setter(generic-covariant-impl self::Foo::T* x) → void {}
-  method withCallback((self::Foo::T*) →* void callback) → void {
-    callback.call(this.{self::Foo::finalField});
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo<core::int*>* fooInt = new self::Foo::•<core::int*>(1, (core::int* x) → Null {});
-  fooInt.{self::Foo::method}(3);
-  fooInt.{self::Foo::setter} = 3;
-  fooInt.{self::Foo::withCallback}((core::int* x) → Null {});
-  fooInt.{self::Foo::withCallback}((core::num* x) → Null {});
-  fooInt.{self::Foo::mutableField} = 3;
-  fooInt.{self::Foo::mutableCallbackField} = (core::int* x) → Null {};
-  self::Foo<core::num*>* fooNum = fooInt;
-  fooNum.{self::Foo::method}(3);
-  fooNum.{self::Foo::method}(2.5);
-  fooNum.{self::Foo::setter} = 3;
-  fooNum.{self::Foo::setter} = 2.5;
-  fooNum.{self::Foo::withCallback}((core::num* x) → Null {});
-  fooNum.{self::Foo::mutableField} = 3;
-  fooNum.{self::Foo::mutableField} = 2.5;
-  let final self::Foo<core::num*>* #t1 = fooNum in let final core::int* #t2 = 3 in (#t1.{self::Foo::mutableCallbackField} as{TypeError,CovarianceCheck} (core::num*) →* void).call(#t2);
-  let final self::Foo<core::num*>* #t3 = fooNum in let final core::double* #t4 = 2.5 in (#t3.{self::Foo::mutableCallbackField} as{TypeError,CovarianceCheck} (core::num*) →* void).call(#t4);
-  fooNum.{self::Foo::mutableCallbackField} = (core::num* x) → Null {};
-}
-
-
-Extra constant evaluation status:
-Evaluated: VariableGet @ org-dartlang-testcase:///covariant_generic.dart:45:31 -> IntConstant(3)
-Evaluated: VariableGet @ org-dartlang-testcase:///covariant_generic.dart:46:31 -> DoubleConstant(2.5)
-Extra constant evaluation: evaluated: 58, effectively constant: 2
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart
deleted file mode 100644
index dd8c22f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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.6
-
-// The test checks that 'covariant' bit is propagated from the superclass of the
-// mixin application to the mixin application and its subclasses.
-
-class A {
-  void foo(covariant num x) {}
-}
-
-class B {
-  void foo(num x) {}
-}
-
-class C {
-  void foo(num x) {}
-}
-
-class D extends A with B implements C {
-  // This member declaration shouldn't result in a compile-time error.
-  void foo(int x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.textual_outline.expect
deleted file mode 100644
index 9bbf948..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.textual_outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-class A {
-  void foo(covariant num x) {}
-}
-
-class B {
-  void foo(num x) {}
-}
-
-class C {
-  void foo(num x) {}
-}
-
-class D extends A with B implements C {
-  void foo(int x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9bbf948..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-class A {
-  void foo(covariant num x) {}
-}
-
-class B {
-  void foo(num x) {}
-}
-
-class C {
-  void foo(num x) {}
-}
-
-class D extends A with B implements C {
-  void foo(int x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.expect
deleted file mode 100644
index 60fc7d3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.expect
+++ /dev/null
@@ -1,66 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo(covariant core::num* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  method foo(core::num* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method foo(core::num* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _D&A&B = self::A with self::B /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_D&A&B*
-    : super self::A::•()
-    ;
-  forwarding-stub method foo(covariant core::num* x) → void
-    return super.{self::B::foo}(x);
-}
-class D extends self::_D&A&B implements self::C {
-  synthetic constructor •() → self::D*
-    : super self::_D&A&B::•()
-    ;
-  method foo(covariant core::int* x) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.outline.expect
deleted file mode 100644
index 2ca3173..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.outline.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  method foo(covariant core::num* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  method foo(core::num* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method foo(core::num* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _D&A&B = self::A with self::B /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_D&A&B*
-    : super self::A::•()
-    ;
-  forwarding-stub method foo(covariant core::num* x) → void
-    return super.{self::B::foo}(x);
-}
-class D extends self::_D&A&B implements self::C {
-  synthetic constructor •() → self::D*
-    ;
-  method foo(covariant core::int* x) → void
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.transformed.expect
deleted file mode 100644
index 5342e14..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/covariant_parameter_in_superclass_of_mixin_application.dart.weak.transformed.expect
+++ /dev/null
@@ -1,75 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo(covariant core::num* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  method foo(core::num* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method foo(core::num* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _D&A&B extends self::A implements self::B /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_D&A&B*
-    : super self::A::•()
-    ;
-  method foo(covariant core::num* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::_D&A&B implements self::C {
-  synthetic constructor •() → self::D*
-    : super self::_D&A&B::•()
-    ;
-  method foo(covariant core::int* x) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart b/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart
deleted file mode 100644
index 9be67c1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class A implements C {}
-
-class B extends A {}
-
-class C extends B implements D {}
-
-class D {}
-
-main() {
-  print(new A());
-  print(new B());
-  print(new C());
-  print(new D());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.textual_outline.expect
deleted file mode 100644
index 63a5f33..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A implements C {}
-
-class B extends A {}
-
-class C extends B implements D {}
-
-class D {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.textual_outline_modelled.expect
deleted file mode 100644
index 63a5f33..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A implements C {}
-
-class B extends A {}
-
-class C extends B implements D {}
-
-class D {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.expect
deleted file mode 100644
index d49711e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.expect
+++ /dev/null
@@ -1,85 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:7:7: Error: 'A' is a supertype of itself.
-// class A implements C {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:9:7: Error: 'B' is a supertype of itself.
-// class B extends A {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:11:7: Error: 'C' is a supertype of itself.
-// class C extends B implements D {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::print(new self::A::•());
-  core::print(new self::B::•());
-  core::print(new self::C::•());
-  core::print(new self::D::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.outline.expect
deleted file mode 100644
index 5e28180..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.outline.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:7:7: Error: 'A' is a supertype of itself.
-// class A implements C {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:9:7: Error: 'B' is a supertype of itself.
-// class B extends A {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:11:7: Error: 'C' is a supertype of itself.
-// class C extends B implements D {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.transformed.expect
deleted file mode 100644
index d49711e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart.weak.transformed.expect
+++ /dev/null
@@ -1,85 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:7:7: Error: 'A' is a supertype of itself.
-// class A implements C {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:9:7: Error: 'B' is a supertype of itself.
-// class B extends A {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/cycles.dart:11:7: Error: 'C' is a supertype of itself.
-// class C extends B implements D {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::print(new self::A::•());
-  core::print(new self::B::•());
-  core::print(new self::C::•());
-  core::print(new self::D::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart b/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart
deleted file mode 100644
index 4e6280d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-topLevel([a = 42]) => a;
-
-main() {
-  print(topLevel());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.textual_outline.expect
deleted file mode 100644
index d390870..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-topLevel([a = 42]) => a;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.textual_outline_modelled.expect
deleted file mode 100644
index ddce93f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-topLevel([a = 42]) => a;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.expect
deleted file mode 100644
index 7b8886e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method topLevel([dynamic a = #C1]) → dynamic
-  return a;
-static method main() → dynamic {
-  core::print(self::topLevel());
-}
-
-constants  {
-  #C1 = 42
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.outline.expect
deleted file mode 100644
index 88ff556..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method topLevel([dynamic a]) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.transformed.expect
deleted file mode 100644
index 7b8886e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/default_values.dart.weak.transformed.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method topLevel([dynamic a = #C1]) → dynamic
-  return a;
-static method main() → dynamic {
-  core::print(self::topLevel());
-}
-
-constants  {
-  #C1 = 42
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart
deleted file mode 100644
index f845eb4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-dynamic m(x) => null;
-
-var x = 0;
-
-class C {
-  static int y = 1;
-  static int m() => 2;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart b/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart
deleted file mode 100644
index f7d1e67..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import 'deferred_lib.dart' deferred as d;
-
-bad(d.C x) {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.textual_outline.expect
deleted file mode 100644
index 5b64564..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as d;
-
-bad(d.C x) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5b64564..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'deferred_lib.dart' deferred as d;
-
-bad(d.C x) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.expect
deleted file mode 100644
index edbac7e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart:9:5: Error: The type 'C' is deferred loaded via prefix 'd' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'd' or use a supertype of 'C' that isn't deferred.
-// bad(d.C x) {}
-//     ^^^
-//
-import self as self;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as d;
-
-static method bad(def::C* x) → dynamic {}
-static method main() → dynamic {}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.outline.expect
deleted file mode 100644
index 440a121..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.outline.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-import self as self;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as d;
-
-static method bad(def::C* x) → dynamic
-  ;
-static method main() → dynamic
-  ;
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y;
-  synthetic constructor •() → def::C*
-    ;
-  static method m() → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x;
-static method m(dynamic x) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.transformed.expect
deleted file mode 100644
index edbac7e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart.weak.transformed.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/deferred_type_annotation.dart:9:5: Error: The type 'C' is deferred loaded via prefix 'd' and can't be used as a type annotation.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/deferred_lib.dart'.
-// Try removing 'deferred' from the import of 'd' or use a supertype of 'C' that isn't deferred.
-// bad(d.C x) {}
-//     ^^^
-//
-import self as self;
-import "deferred_lib.dart" as def;
-
-import "org-dartlang-testcase:///deferred_lib.dart" deferred as d;
-
-static method bad(def::C* x) → dynamic {}
-static method main() → dynamic {}
-
-library;
-import self as def;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static field core::int* y = 1;
-  synthetic constructor •() → def::C*
-    : super core::Object::•()
-    ;
-  static method m() → core::int*
-    return 2;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* x = 0;
-static method m(dynamic x) → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart
deleted file mode 100644
index 5a868e1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import 'duplicated_bad_prefix_lib1.dart' as dupe;
-import 'duplicated_bad_prefix_lib2.dart' as dupe;
-
-class Dupe {}
-
-class Dupe {}
-
-class C {
-  Dupe.a b;
-  dupe.C d;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.textual_outline.expect
deleted file mode 100644
index 2c4038e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-import 'duplicated_bad_prefix_lib1.dart' as dupe;
-import 'duplicated_bad_prefix_lib2.dart' as dupe;
-
-class Dupe {}
-
-class Dupe {}
-
-class C {
-  Dupe.a b;
-  dupe.C d;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.textual_outline_modelled.expect
deleted file mode 100644
index f7b1746..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-import 'duplicated_bad_prefix_lib1.dart' as dupe;
-import 'duplicated_bad_prefix_lib2.dart' as dupe;
-
-class C {
-  Dupe.a b;
-  dupe.C d;
-}
-
-class Dupe {}
-
-class Dupe {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.expect
deleted file mode 100644
index 461eca7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.expect
+++ /dev/null
@@ -1,117 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:12:7: Error: 'Dupe' is already declared in this scope.
-// class Dupe {}
-//       ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:10:7: Context: Previous declaration of 'Dupe'.
-// class Dupe {}
-//       ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:15:3: Error: Type 'Dupe.a' not found.
-//   Dupe.a b;
-//   ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:8:45: Error: 'C' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib2.dart'.
-// import 'duplicated_bad_prefix_lib2.dart' as dupe;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:15:3: Error: 'Dupe.a' isn't a type.
-//   Dupe.a b;
-//   ^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///duplicated_bad_prefix_lib1.dart" as dupe;
-import "org-dartlang-testcase:///duplicated_bad_prefix_lib2.dart" as dupe;
-
-class Dupe#1 extends core::Object {
-  synthetic constructor •() → self::Dupe#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dupe extends core::Object {
-  synthetic constructor •() → self::Dupe*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field invalid-type b = null;
-  field invalid-type d = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self3::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.outline.expect
deleted file mode 100644
index 227e68e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.outline.expect
+++ /dev/null
@@ -1,109 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:12:7: Error: 'Dupe' is already declared in this scope.
-// class Dupe {}
-//       ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:10:7: Context: Previous declaration of 'Dupe'.
-// class Dupe {}
-//       ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:15:3: Error: Type 'Dupe.a' not found.
-//   Dupe.a b;
-//   ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:8:45: Error: 'C' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib2.dart'.
-// import 'duplicated_bad_prefix_lib2.dart' as dupe;
-//                                             ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///duplicated_bad_prefix_lib1.dart" as dupe;
-import "org-dartlang-testcase:///duplicated_bad_prefix_lib2.dart" as dupe;
-
-class Dupe#1 extends core::Object {
-  synthetic constructor •() → self::Dupe#1*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dupe extends core::Object {
-  synthetic constructor •() → self::Dupe*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field invalid-type b;
-  field invalid-type d;
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self2::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self3::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.transformed.expect
deleted file mode 100644
index 461eca7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart.weak.transformed.expect
+++ /dev/null
@@ -1,117 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:12:7: Error: 'Dupe' is already declared in this scope.
-// class Dupe {}
-//       ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:10:7: Context: Previous declaration of 'Dupe'.
-// class Dupe {}
-//       ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:15:3: Error: Type 'Dupe.a' not found.
-//   Dupe.a b;
-//   ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:8:45: Error: 'C' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib2.dart'.
-// import 'duplicated_bad_prefix_lib2.dart' as dupe;
-//                                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix.dart:15:3: Error: 'Dupe.a' isn't a type.
-//   Dupe.a b;
-//   ^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///duplicated_bad_prefix_lib1.dart" as dupe;
-import "org-dartlang-testcase:///duplicated_bad_prefix_lib2.dart" as dupe;
-
-class Dupe#1 extends core::Object {
-  synthetic constructor •() → self::Dupe#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Dupe extends core::Object {
-  synthetic constructor •() → self::Dupe*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field invalid-type b = null;
-  field invalid-type d = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self2::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self3::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib1.dart
deleted file mode 100644
index b9ae01f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib1.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class C {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib2.dart
deleted file mode 100644
index b9ae01f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_bad_prefix_lib2.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class C {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart
deleted file mode 100644
index 6193b28..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-part "duplicated_declarations_part.dart";
-
-import 'duplicated_declarations_lib.dart' as Typedef;
-
-import 'duplicated_declarations_lib.dart' as Typedef;
-
-typedef Typedef = void Function();
-
-typedef Typedef = Object Function();
-
-import 'duplicated_declarations_lib.dart' as Typedef;
-
-typedef void OldTypedef();
-
-typedef Object OldTypedef();
-
-var field = "1st";
-
-var field = "2nd";
-
-main() {
-  "1st";
-}
-
-main() {
-  "2nd";
-}
-
-foo() {
-  main();
-  print(field);
-  C.s();
-}
-
-class C {
-  C(a);
-  C(a, b);
-  var field = "1st";
-
-  var field = "2nd";
-
-  m() {
-    "1st";
-  }
-
-  m() {
-    "2nd";
-  }
-
-  static s() {
-    "1st";
-  }
-
-  static s() {
-    "2nd";
-  }
-
-  static f() => s;
-}
-
-class Sub extends C {
-  Sub() : super(null);
-  m() => super.m();
-}
-
-class C {
-  C._();
-}
-
-enum Enum {
-  Enum,
-  a,
-  a,
-  b,
-}
-
-enum Enum {
-  a,
-  b,
-  c,
-}
-
-enum AnotherEnum {
-  a,
-  b,
-  c,
-  _name,
-  index,
-  toString,
-  values,
-}
-
-useAnotherEnum() {
-  <String, Object>{
-    "AnotherEnum.a": AnotherEnum.a,
-    "AnotherEnum.b": AnotherEnum.b,
-    "AnotherEnum.c": AnotherEnum.c,
-    "AnotherEnum._name": AnotherEnum._name,
-    "AnotherEnum.index": AnotherEnum.index,
-    "AnotherEnum.toString": AnotherEnum.toString,
-    "AnotherEnum.values": AnotherEnum.values,
-  };
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.textual_outline.expect
deleted file mode 100644
index b8145d9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.textual_outline.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-// @dart = 2.6
-part "duplicated_declarations_part.dart";
-import 'duplicated_declarations_lib.dart' as Typedef;
-import 'duplicated_declarations_lib.dart' as Typedef;
-typedef Typedef = void Function();
-typedef Typedef = Object Function();
-import 'duplicated_declarations_lib.dart' as Typedef;
-typedef void OldTypedef();
-typedef Object OldTypedef();
-var field = "1st";
-var field = "2nd";
-main() {}
-main() {}
-foo() {}
-class C {
-  C(a);
-  C(a, b);
-  var field = "1st";
-  var field = "2nd";
-  m() {}
-  m() {}
-  static s() {}
-  static s() {}
-  static f() => s;
-}
-class Sub extends C {
-  Sub() : super(null);
-  m() => super.m();
-}
-class C {
-  C._();
-}
-enum Enum { Enum, a, a, b, }
-enum Enum { a, b, c, }
-enum AnotherEnum { a, b, c, _name, index, toString, values, }
-useAnotherEnum() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.weak.expect
deleted file mode 100644
index 43846a2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.weak.expect
+++ /dev/null
@@ -1,686 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:9:1: Error: Import directives must precede part directives.
-// Try moving the import directives before the part directives.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:11:1: Error: Import directives must precede part directives.
-// Try moving the import directives before the part directives.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:15:9: Error: 'Typedef' is already declared in this scope.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:13:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = void Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:17:1: Error: Directives must appear before any declarations.
-// Try moving the directive before any declarations.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:21:16: Error: 'OldTypedef' is already declared in this scope.
-// typedef Object OldTypedef();
-//                ^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:19:14: Context: Previous declaration of 'OldTypedef'.
-// typedef void OldTypedef();
-//              ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:25:5: Error: 'field' is already declared in this scope.
-// var field = "2nd";
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:23:5: Context: Previous declaration of 'field'.
-// var field = "1st";
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:31:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:27:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:43:3: Error: 'C' is already declared in this scope.
-//   C(a, b);
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:42:3: Context: Previous declaration of 'C'.
-//   C(a);
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:46:7: Error: 'field' is already declared in this scope.
-//   var field = "2nd";
-//       ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:44:7: Context: Previous declaration of 'field'.
-//   var field = "1st";
-//       ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:52:3: Error: 'm' is already declared in this scope.
-//   m() {
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:48:3: Context: Previous declaration of 'm'.
-//   m() {
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:60:10: Error: 's' is already declared in this scope.
-//   static s() {
-//          ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:56:10: Context: Previous declaration of 's'.
-//   static s() {
-//          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:72:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:41:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:77:3: Error: Name of enum constant 'Enum' can't be the same as the enum's own name.
-//   Enum,
-//   ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:79:3: Error: 'a' is already declared in this scope.
-//   a,
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:78:3: Context: Previous declaration of 'a'.
-//   a,
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:83:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:76:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:93:3: Error: '_name' is already declared in this scope.
-//   _name,
-//   ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of '_name' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:94:3: Error: 'index' is already declared in this scope.
-//   index,
-//   ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of 'index' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:95:3: Error: 'toString' is already declared in this scope.
-//   toString,
-//   ^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of 'toString' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:96:3: Error: 'values' is already declared in this scope.
-//   values,
-//   ^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of 'values' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:13:9: Error: 'Typedef' is already declared in this scope.
-// typedef Typedef = void Function();
-//         ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:15:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:19:14: Error: 'OldTypedef' is already declared in this scope.
-// typedef void OldTypedef();
-//              ^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:21:16: Context: Previous declaration of 'OldTypedef'.
-// typedef Object OldTypedef();
-//                ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:23:5: Error: 'field' is already declared in this scope.
-// var field = "3rd";
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:25:5: Context: Previous declaration of 'field'.
-// var field = "2nd";
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:29:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:31:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:41:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:72:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:75:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:83:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:9:1: Error: The part-of directive must be the only directive in a part.
-// Try removing the other directives, or moving them to the library for which this is a part.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:11:1: Error: The part-of directive must be the only directive in a part.
-// Try removing the other directives, or moving them to the library for which this is a part.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:15:9: Error: 'Typedef' is already declared in this scope.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:13:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = void Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:17:1: Error: The part-of directive must be the only directive in a part.
-// Try removing the other directives, or moving them to the library for which this is a part.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:21:16: Error: 'OldTypedef' is already declared in this scope.
-// typedef Object OldTypedef();
-//                ^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:19:14: Context: Previous declaration of 'OldTypedef'.
-// typedef void OldTypedef();
-//              ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:25:5: Error: 'field' is already declared in this scope.
-// var field = 4;
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:23:5: Context: Previous declaration of 'field'.
-// var field = "3rd";
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:27:5: Error: 'field' is already declared in this scope.
-// var field = 5.0;
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:25:5: Context: Previous declaration of 'field'.
-// var field = 4;
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:33:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:29:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:37:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:33:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:43:3: Error: 'C' is already declared in this scope.
-//   C(a, b);
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:42:3: Context: Previous declaration of 'C'.
-//   C(a);
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:46:7: Error: 'field' is already declared in this scope.
-//   var field = "2nd";
-//       ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:44:7: Context: Previous declaration of 'field'.
-//   var field = "1st";
-//       ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:52:3: Error: 'm' is already declared in this scope.
-//   m() {
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:48:3: Context: Previous declaration of 'm'.
-//   m() {
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:60:10: Error: 's' is already declared in this scope.
-//   static s() {
-//          ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:56:10: Context: Previous declaration of 's'.
-//   static s() {
-//          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:67:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:41:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:71:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:67:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:76:3: Error: Name of enum constant 'Enum' can't be the same as the enum's own name.
-//   Enum,
-//   ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:78:3: Error: 'a' is already declared in this scope.
-//   a,
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:77:3: Context: Previous declaration of 'a'.
-//   a,
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:82:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:75:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:88:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:82:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:9:46: Error: 'Typedef' is already declared in this scope.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-//                                              ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:15:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:67:19: Error: 'C' isn't a type.
-// class Sub extends C {
-//                   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:67:19: Context: This isn't a type.
-// class Sub extends C {
-//                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:36:3: Error: Can't use 'main' because it is declared more than once.
-//   main();
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:37:9: Error: Can't use 'field' because it is declared more than once.
-//   print(field);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:38:3: Error: Can't use 'C' because it is declared more than once.
-//   C.s();
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:64:17: Error: Can't use 's' because it is declared more than once.
-//   static f() => s;
-//                 ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:68:16: Error: Too many positional arguments: 0 allowed, but 1 found.
-// Try removing the extra positional arguments.
-//   Sub() : super(null);
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:69:16: Error: Superclass has no method named 'm'.
-//   m() => super.m();
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:104:38: Error: Can't use '_name' because it is declared more than once.
-//     "AnotherEnum._name": AnotherEnum._name,
-//                                      ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:105:38: Error: Can't use 'index' because it is declared more than once.
-//     "AnotherEnum.index": AnotherEnum.index,
-//                                      ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:106:41: Error: Can't use 'toString' because it is declared more than once.
-//     "AnotherEnum.toString": AnotherEnum.toString,
-//                                         ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:107:39: Error: Can't use 'values' because it is declared more than once.
-//     "AnotherEnum.values": AnotherEnum.values,
-//                                       ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:64:17: Error: Can't use 's' because it is declared more than once.
-//   static f() => s;
-//                 ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-
-part duplicated_declarations_part.dart;
-typedef Typedef = () →* void;
-typedef OldTypedef = () →* void;
-class C#4 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  constructor _() → self::C#4*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C#3 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  constructor _() → self::C#3*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C#2 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  field core::String* field = null;
-  constructor •(dynamic a) → self::C#2*
-    : super core::Object::•()
-    ;
-  method m() → dynamic {
-    "1st";
-  }
-  static method s() → dynamic {
-    "1st";
-  }
-  static method f() → dynamic
-    return invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:64:17: Error: Can't use 's' because it is declared more than once.
-  static f() => s;
-                ^";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C#1 extends core::Object {
-  constructor _() → self::C#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field core::String* field = null;
-  constructor •(dynamic a) → self::C*
-    : super core::Object::•()
-    ;
-  method m() → dynamic {
-    "1st";
-  }
-  static method s() → dynamic {
-    "1st";
-  }
-  static method f() → dynamic
-    return invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:64:17: Error: Can't use 's' because it is declared more than once.
-  static f() => s;
-                ^";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends core::Object {
-  constructor •() → self::Sub*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:68:16: Error: Too many positional arguments: 0 allowed, but 1 found.
-Try removing the extra positional arguments.
-  Sub() : super(null);
-               ^"
-    ;
-  method m() → dynamic
-    return super.m();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#4 extends core::Object /*isEnum*/  { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#4*>* values = #C4;
-  static const field self::Enum#4* a = #C3;
-  const constructor •(core::int* index, core::String* _name) → self::Enum#4*
-    : self::Enum#4::index = index, self::Enum#4::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#4::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#3 extends core::Object /*isEnum*/  { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#3*>* values = #C12;
-  static const field self::Enum#3* a = #C5;
-  static const field self::Enum#3* b = #C8;
-  static const field self::Enum#3* c = #C11;
-  const constructor •(core::int* index, core::String* _name) → self::Enum#3*
-    : self::Enum#3::index = index, self::Enum#3::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#3::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#2 extends core::Object /*isEnum*/  { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#2*>* values = #C17;
-  static const field self::Enum#2* Enum = #C14;
-  static const field self::Enum#2* a = #C15;
-  static const field self::Enum#2* b = #C16;
-  const constructor •(core::int* index, core::String* _name) → self::Enum#2*
-    : self::Enum#2::index = index, self::Enum#2::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#2::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#1 extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#1*>* values = #C21;
-  static const field self::Enum#1* a = #C18;
-  static const field self::Enum#1* b = #C19;
-  static const field self::Enum#1* c = #C20;
-  const constructor •(core::int* index, core::String* _name) → self::Enum#1*
-    : self::Enum#1::index = index, self::Enum#1::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#1::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum*>* values = #C25;
-  static const field self::Enum* Enum = #C22;
-  static const field self::Enum* a = #C23;
-  static const field self::Enum* b = #C24;
-  const constructor •(core::int* index, core::String* _name) → self::Enum*
-    : self::Enum::index = index, self::Enum::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AnotherEnum extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::AnotherEnum*>* values = #C32;
-  static const field self::AnotherEnum* a = #C27;
-  static const field self::AnotherEnum* b = #C29;
-  static const field self::AnotherEnum* c = #C31;
-  const constructor •(core::int* index, core::String* _name) → self::AnotherEnum*
-    : self::AnotherEnum::index = index, self::AnotherEnum::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::AnotherEnum::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::String* field;
-static method main() → dynamic {
-  "1st";
-}
-static method foo() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:36:3: Error: Can't use 'main' because it is declared more than once.
-  main();
-  ^".call();
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:37:9: Error: Can't use 'field' because it is declared more than once.
-  print(field);
-        ^");
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:38:3: Error: Can't use 'C' because it is declared more than once.
-  C.s();
-  ^".s();
-}
-static method useAnotherEnum() → dynamic {
-  <core::String*, core::Object*>{"AnotherEnum.a": #C27, "AnotherEnum.b": #C29, "AnotherEnum.c": #C31, "AnotherEnum._name": invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:104:38: Error: Can't use '_name' because it is declared more than once.
-    \"AnotherEnum._name\": AnotherEnum._name,
-                                     ^^^^^", "AnotherEnum.index": invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:105:38: Error: Can't use 'index' because it is declared more than once.
-    \"AnotherEnum.index\": AnotherEnum.index,
-                                     ^^^^^", "AnotherEnum.toString": invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:106:41: Error: Can't use 'toString' because it is declared more than once.
-    \"AnotherEnum.toString\": AnotherEnum.toString,
-                                        ^^^^^^^^", "AnotherEnum.values": invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:107:39: Error: Can't use 'values' because it is declared more than once.
-    \"AnotherEnum.values\": AnotherEnum.values,
-                                      ^^^^^^"};
-}
-
-library /*isNonNullableByDefault*/;
-import self as self2;
-
-
-constants  {
-  #C1 = 0
-  #C2 = "Enum.a"
-  #C3 = self::Enum#4 {index:#C1, _name:#C2}
-  #C4 = <self::Enum#4*>[#C3]
-  #C5 = self::Enum#3 {index:#C1, _name:#C2}
-  #C6 = 1
-  #C7 = "Enum.b"
-  #C8 = self::Enum#3 {index:#C6, _name:#C7}
-  #C9 = 2
-  #C10 = "Enum.c"
-  #C11 = self::Enum#3 {index:#C9, _name:#C10}
-  #C12 = <self::Enum#3*>[#C5, #C8, #C11]
-  #C13 = "Enum.Enum"
-  #C14 = self::Enum#2 {index:#C1, _name:#C13}
-  #C15 = self::Enum#2 {index:#C6, _name:#C2}
-  #C16 = self::Enum#2 {index:#C9, _name:#C7}
-  #C17 = <self::Enum#2*>[#C14, #C15, #C16]
-  #C18 = self::Enum#1 {index:#C1, _name:#C2}
-  #C19 = self::Enum#1 {index:#C6, _name:#C7}
-  #C20 = self::Enum#1 {index:#C9, _name:#C10}
-  #C21 = <self::Enum#1*>[#C18, #C19, #C20]
-  #C22 = self::Enum {index:#C1, _name:#C13}
-  #C23 = self::Enum {index:#C6, _name:#C2}
-  #C24 = self::Enum {index:#C9, _name:#C7}
-  #C25 = <self::Enum*>[#C22, #C23, #C24]
-  #C26 = "AnotherEnum.a"
-  #C27 = self::AnotherEnum {index:#C1, _name:#C26}
-  #C28 = "AnotherEnum.b"
-  #C29 = self::AnotherEnum {index:#C6, _name:#C28}
-  #C30 = "AnotherEnum.c"
-  #C31 = self::AnotherEnum {index:#C9, _name:#C30}
-  #C32 = <self::AnotherEnum*>[#C27, #C29, #C31]
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///duplicated_declarations.dart:
-- Enum#1. (from org-dartlang-testcase:///duplicated_declarations.dart:83:6)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
-- Enum. (from org-dartlang-testcase:///duplicated_declarations.dart:76:6)
-- AnotherEnum. (from org-dartlang-testcase:///duplicated_declarations.dart:89:6)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.weak.outline.expect
deleted file mode 100644
index 4e5874f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart.weak.outline.expect
+++ /dev/null
@@ -1,588 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:9:1: Error: Import directives must precede part directives.
-// Try moving the import directives before the part directives.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:11:1: Error: Import directives must precede part directives.
-// Try moving the import directives before the part directives.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:15:9: Error: 'Typedef' is already declared in this scope.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:13:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = void Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:17:1: Error: Directives must appear before any declarations.
-// Try moving the directive before any declarations.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:21:16: Error: 'OldTypedef' is already declared in this scope.
-// typedef Object OldTypedef();
-//                ^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:19:14: Context: Previous declaration of 'OldTypedef'.
-// typedef void OldTypedef();
-//              ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:25:5: Error: 'field' is already declared in this scope.
-// var field = "2nd";
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:23:5: Context: Previous declaration of 'field'.
-// var field = "1st";
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:31:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:27:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:43:3: Error: 'C' is already declared in this scope.
-//   C(a, b);
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:42:3: Context: Previous declaration of 'C'.
-//   C(a);
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:46:7: Error: 'field' is already declared in this scope.
-//   var field = "2nd";
-//       ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:44:7: Context: Previous declaration of 'field'.
-//   var field = "1st";
-//       ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:52:3: Error: 'm' is already declared in this scope.
-//   m() {
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:48:3: Context: Previous declaration of 'm'.
-//   m() {
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:60:10: Error: 's' is already declared in this scope.
-//   static s() {
-//          ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:56:10: Context: Previous declaration of 's'.
-//   static s() {
-//          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:72:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:41:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:77:3: Error: Name of enum constant 'Enum' can't be the same as the enum's own name.
-//   Enum,
-//   ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:79:3: Error: 'a' is already declared in this scope.
-//   a,
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:78:3: Context: Previous declaration of 'a'.
-//   a,
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:83:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:76:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:93:3: Error: '_name' is already declared in this scope.
-//   _name,
-//   ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of '_name' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:94:3: Error: 'index' is already declared in this scope.
-//   index,
-//   ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of 'index' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:95:3: Error: 'toString' is already declared in this scope.
-//   toString,
-//   ^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of 'toString' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:96:3: Error: 'values' is already declared in this scope.
-//   values,
-//   ^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:89:6: Context: Previous declaration of 'values' is implied by this definition.
-// enum AnotherEnum {
-//      ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:13:9: Error: 'Typedef' is already declared in this scope.
-// typedef Typedef = void Function();
-//         ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:15:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:19:14: Error: 'OldTypedef' is already declared in this scope.
-// typedef void OldTypedef();
-//              ^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:21:16: Context: Previous declaration of 'OldTypedef'.
-// typedef Object OldTypedef();
-//                ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:23:5: Error: 'field' is already declared in this scope.
-// var field = "3rd";
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:25:5: Context: Previous declaration of 'field'.
-// var field = "2nd";
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:29:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:31:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:41:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:72:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:75:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:83:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:9:1: Error: The part-of directive must be the only directive in a part.
-// Try removing the other directives, or moving them to the library for which this is a part.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:11:1: Error: The part-of directive must be the only directive in a part.
-// Try removing the other directives, or moving them to the library for which this is a part.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:15:9: Error: 'Typedef' is already declared in this scope.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:13:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = void Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:17:1: Error: The part-of directive must be the only directive in a part.
-// Try removing the other directives, or moving them to the library for which this is a part.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-// ^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:21:16: Error: 'OldTypedef' is already declared in this scope.
-// typedef Object OldTypedef();
-//                ^^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:19:14: Context: Previous declaration of 'OldTypedef'.
-// typedef void OldTypedef();
-//              ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:25:5: Error: 'field' is already declared in this scope.
-// var field = 4;
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:23:5: Context: Previous declaration of 'field'.
-// var field = "3rd";
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:27:5: Error: 'field' is already declared in this scope.
-// var field = 5.0;
-//     ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:25:5: Context: Previous declaration of 'field'.
-// var field = 4;
-//     ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:33:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:29:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:37:1: Error: 'main' is already declared in this scope.
-// main() {
-// ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:33:1: Context: Previous declaration of 'main'.
-// main() {
-// ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:43:3: Error: 'C' is already declared in this scope.
-//   C(a, b);
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:42:3: Context: Previous declaration of 'C'.
-//   C(a);
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:46:7: Error: 'field' is already declared in this scope.
-//   var field = "2nd";
-//       ^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:44:7: Context: Previous declaration of 'field'.
-//   var field = "1st";
-//       ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:52:3: Error: 'm' is already declared in this scope.
-//   m() {
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:48:3: Context: Previous declaration of 'm'.
-//   m() {
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:60:10: Error: 's' is already declared in this scope.
-//   static s() {
-//          ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:56:10: Context: Previous declaration of 's'.
-//   static s() {
-//          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:67:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:41:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:71:7: Error: 'C' is already declared in this scope.
-// class C {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:67:7: Context: Previous declaration of 'C'.
-// class C {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:76:3: Error: Name of enum constant 'Enum' can't be the same as the enum's own name.
-//   Enum,
-//   ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:78:3: Error: 'a' is already declared in this scope.
-//   a,
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:77:3: Context: Previous declaration of 'a'.
-//   a,
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:82:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:75:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:88:6: Error: 'Enum' is already declared in this scope.
-// enum Enum {
-//      ^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:82:6: Context: Previous declaration of 'Enum'.
-// enum Enum {
-//      ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:9:46: Error: 'Typedef' is already declared in this scope.
-// import 'duplicated_declarations_lib.dart' as Typedef;
-//                                              ^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart:15:9: Context: Previous declaration of 'Typedef'.
-// typedef Typedef = Object Function();
-//         ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:67:19: Error: 'C' isn't a type.
-// class Sub extends C {
-//                   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations.dart:67:19: Context: This isn't a type.
-// class Sub extends C {
-//                   ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-import "org-dartlang-testcase:///duplicated_declarations_lib.dart" as Typedef;
-
-part duplicated_declarations_part.dart;
-typedef Typedef = () →* void;
-typedef OldTypedef = () →* void;
-class C#4 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  constructor _() → self::C#4*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C#3 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  constructor _() → self::C#3*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C#2 extends core::Object { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  field core::String* field;
-  constructor •(dynamic a) → self::C#2*
-    ;
-  method m() → dynamic
-    ;
-  static method s() → dynamic
-    ;
-  static method f() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C#1 extends core::Object {
-  constructor _() → self::C#1*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field core::String* field;
-  constructor •(dynamic a) → self::C*
-    ;
-  method m() → dynamic
-    ;
-  static method s() → dynamic
-    ;
-  static method f() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends core::Object {
-  constructor •() → self::Sub*
-    ;
-  method m() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#4 extends core::Object /*isEnum*/  { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#4*>* values = const <self::Enum#4*>[self::Enum#4::a];
-  static const field self::Enum#4* a = const self::Enum#4::•(0, "Enum.a");
-  const constructor •(core::int* index, core::String* _name) → self::Enum#4*
-    : self::Enum#4::index = index, self::Enum#4::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#4::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#3 extends core::Object /*isEnum*/  { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#3*>* values = const <self::Enum#3*>[self::Enum#3::a, self::Enum#3::b, self::Enum#3::c];
-  static const field self::Enum#3* a = const self::Enum#3::•(0, "Enum.a");
-  static const field self::Enum#3* b = const self::Enum#3::•(1, "Enum.b");
-  static const field self::Enum#3* c = const self::Enum#3::•(2, "Enum.c");
-  const constructor •(core::int* index, core::String* _name) → self::Enum#3*
-    : self::Enum#3::index = index, self::Enum#3::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#3::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#2 extends core::Object /*isEnum*/  { // from org-dartlang-testcase:///duplicated_declarations_part.dart
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#2*>* values = const <self::Enum#2*>[self::Enum#2::Enum, self::Enum#2::a, self::Enum#2::b];
-  static const field self::Enum#2* Enum = const self::Enum#2::•(0, "Enum.Enum");
-  static const field self::Enum#2* a = const self::Enum#2::•(1, "Enum.a");
-  static const field self::Enum#2* b = const self::Enum#2::•(2, "Enum.b");
-  const constructor •(core::int* index, core::String* _name) → self::Enum#2*
-    : self::Enum#2::index = index, self::Enum#2::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#2::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum#1 extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum#1*>* values = const <self::Enum#1*>[self::Enum#1::a, self::Enum#1::b, self::Enum#1::c];
-  static const field self::Enum#1* a = const self::Enum#1::•(0, "Enum.a");
-  static const field self::Enum#1* b = const self::Enum#1::•(1, "Enum.b");
-  static const field self::Enum#1* c = const self::Enum#1::•(2, "Enum.c");
-  const constructor •(core::int* index, core::String* _name) → self::Enum#1*
-    : self::Enum#1::index = index, self::Enum#1::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum#1::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Enum extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::Enum*>* values = const <self::Enum*>[self::Enum::Enum, self::Enum::a, self::Enum::b];
-  static const field self::Enum* Enum = const self::Enum::•(0, "Enum.Enum");
-  static const field self::Enum* a = const self::Enum::•(1, "Enum.a");
-  static const field self::Enum* b = const self::Enum::•(2, "Enum.b");
-  const constructor •(core::int* index, core::String* _name) → self::Enum*
-    : self::Enum::index = index, self::Enum::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::Enum::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AnotherEnum extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::AnotherEnum*>* values = const <self::AnotherEnum*>[self::AnotherEnum::a, self::AnotherEnum::b, self::AnotherEnum::c];
-  static const field self::AnotherEnum* a = const self::AnotherEnum::•(0, "AnotherEnum.a");
-  static const field self::AnotherEnum* b = const self::AnotherEnum::•(1, "AnotherEnum.b");
-  static const field self::AnotherEnum* c = const self::AnotherEnum::•(2, "AnotherEnum.c");
-  const constructor •(core::int* index, core::String* _name) → self::AnotherEnum*
-    : self::AnotherEnum::index = index, self::AnotherEnum::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::AnotherEnum::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::String* field;
-static method main() → dynamic
-  ;
-static method foo() → dynamic
-  ;
-static method useAnotherEnum() → dynamic
-  ;
-
-library /*isNonNullableByDefault*/;
-import self as self2;
-
-
-
-Extra constant evaluation status:
-Evaluated: ListLiteral @ org-dartlang-testcase:///duplicated_declarations_part.dart:88:6 -> ListConstant(const <Enum#4*>[const Enum#4{Enum#4.index: 0, Enum#4._name: "Enum.a"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations_part.dart:89:3 -> InstanceConstant(const Enum#4{Enum#4.index: 0, Enum#4._name: "Enum.a"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///duplicated_declarations_part.dart:82:6 -> ListConstant(const <Enum#3*>[const Enum#3{Enum#3.index: 0, Enum#3._name: "Enum.a"}, const Enum#3{Enum#3.index: 1, Enum#3._name: "Enum.b"}, const Enum#3{Enum#3.index: 2, Enum#3._name: "Enum.c"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations_part.dart:83:3 -> InstanceConstant(const Enum#3{Enum#3.index: 0, Enum#3._name: "Enum.a"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations_part.dart:84:3 -> InstanceConstant(const Enum#3{Enum#3.index: 1, Enum#3._name: "Enum.b"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations_part.dart:85:3 -> InstanceConstant(const Enum#3{Enum#3.index: 2, Enum#3._name: "Enum.c"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///duplicated_declarations_part.dart:75:6 -> ListConstant(const <Enum#2*>[const Enum#2{Enum#2.index: 0, Enum#2._name: "Enum.Enum"}, const Enum#2{Enum#2.index: 1, Enum#2._name: "Enum.a"}, const Enum#2{Enum#2.index: 2, Enum#2._name: "Enum.b"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations_part.dart:76:3 -> InstanceConstant(const Enum#2{Enum#2.index: 0, Enum#2._name: "Enum.Enum"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations_part.dart:77:3 -> InstanceConstant(const Enum#2{Enum#2.index: 1, Enum#2._name: "Enum.a"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations_part.dart:79:3 -> InstanceConstant(const Enum#2{Enum#2.index: 2, Enum#2._name: "Enum.b"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///duplicated_declarations.dart:83:6 -> ListConstant(const <Enum#1*>[const Enum#1{Enum#1.index: 0, Enum#1._name: "Enum.a"}, const Enum#1{Enum#1.index: 1, Enum#1._name: "Enum.b"}, const Enum#1{Enum#1.index: 2, Enum#1._name: "Enum.c"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:84:3 -> InstanceConstant(const Enum#1{Enum#1.index: 0, Enum#1._name: "Enum.a"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:85:3 -> InstanceConstant(const Enum#1{Enum#1.index: 1, Enum#1._name: "Enum.b"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:86:3 -> InstanceConstant(const Enum#1{Enum#1.index: 2, Enum#1._name: "Enum.c"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///duplicated_declarations.dart:76:6 -> ListConstant(const <Enum*>[const Enum{Enum.index: 0, Enum._name: "Enum.Enum"}, const Enum{Enum.index: 1, Enum._name: "Enum.a"}, const Enum{Enum.index: 2, Enum._name: "Enum.b"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:77:3 -> InstanceConstant(const Enum{Enum.index: 0, Enum._name: "Enum.Enum"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:78:3 -> InstanceConstant(const Enum{Enum.index: 1, Enum._name: "Enum.a"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:80:3 -> InstanceConstant(const Enum{Enum.index: 2, Enum._name: "Enum.b"})
-Evaluated: ListLiteral @ org-dartlang-testcase:///duplicated_declarations.dart:89:6 -> ListConstant(const <AnotherEnum*>[const AnotherEnum{AnotherEnum.index: 0, AnotherEnum._name: "AnotherEnum.a"}, const AnotherEnum{AnotherEnum.index: 1, AnotherEnum._name: "AnotherEnum.b"}, const AnotherEnum{AnotherEnum.index: 2, AnotherEnum._name: "AnotherEnum.c"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:90:3 -> InstanceConstant(const AnotherEnum{AnotherEnum.index: 0, AnotherEnum._name: "AnotherEnum.a"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:91:3 -> InstanceConstant(const AnotherEnum{AnotherEnum.index: 1, AnotherEnum._name: "AnotherEnum.b"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///duplicated_declarations.dart:92:3 -> InstanceConstant(const AnotherEnum{AnotherEnum.index: 2, AnotherEnum._name: "AnotherEnum.c"})
-Extra constant evaluation: evaluated: 46, effectively constant: 22
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_lib.dart
deleted file mode 100644
index 87869b0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_lib.dart
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright (c) 2018, 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.
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart
deleted file mode 100644
index 8ed9612..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_declarations_part.dart
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-part of "duplicated_declarations.dart";
-
-import 'duplicated_declarations_lib.dart' as Typedef;
-
-import 'duplicated_declarations_lib.dart' as Typedef;
-
-typedef Typedef = void Function();
-
-typedef Typedef = Object Function();
-
-import 'duplicated_declarations_lib.dart' as Typedef;
-
-typedef void OldTypedef();
-
-typedef Object OldTypedef();
-
-var field = "3rd";
-
-var field = 4;
-
-var field = 5.0;
-
-main() {
-  "3rd";
-}
-
-main() {
-  "4th";
-}
-
-main() {
-  "5th";
-}
-
-class C {
-  C(a);
-  C(a, b);
-  var field = "1st";
-
-  var field = "2nd";
-
-  m() {
-    "1st";
-  }
-
-  m() {
-    "2nd";
-  }
-
-  static s() {
-    "1st";
-  }
-
-  static s() {
-    "2nd";
-  }
-
-  static f() => s;
-}
-
-class C {
-  C._();
-}
-
-class C {
-  C._();
-}
-
-enum Enum {
-  Enum,
-  a,
-  a,
-  b,
-}
-
-enum Enum {
-  a,
-  b,
-  c,
-}
-
-enum Enum {
-  a,
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart
deleted file mode 100644
index 9237749..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class A {
-  int a;
-  int a;
-  A(this.a);
-}
-
-void main() {
-  A(1);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.textual_outline.expect
deleted file mode 100644
index 9d71884..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class A {
-  int a;
-  int a;
-  A(this.a);
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.textual_outline_modelled.expect
deleted file mode 100644
index 82dc367..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class A {
-  A(this.a);
-  int a;
-  int a;
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.expect
deleted file mode 100644
index 64e0ad7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:9:7: Error: 'a' is already declared in this scope.
-//   int a;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:8:7: Context: Previous declaration of 'a'.
-//   int a;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:10:10: Error: Can't use 'a' because it is declared more than once.
-//   A(this.a);
-//          ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* a = null;
-  constructor •(core::int* a) → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:10:10: Error: Can't use 'a' because it is declared more than once.
-  A(this.a);
-         ^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {
-  new self::A::•(1);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.outline.expect
deleted file mode 100644
index 5c29c8c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.outline.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:9:7: Error: 'a' is already declared in this scope.
-//   int a;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:8:7: Context: Previous declaration of 'a'.
-//   int a;
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* a;
-  constructor •(core::int* a) → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.transformed.expect
deleted file mode 100644
index 64e0ad7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart.weak.transformed.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:9:7: Error: 'a' is already declared in this scope.
-//   int a;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:8:7: Context: Previous declaration of 'a'.
-//   int a;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:10:10: Error: Can't use 'a' because it is declared more than once.
-//   A(this.a);
-//          ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* a = null;
-  constructor •(core::int* a) → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_field_initializer.dart:10:10: Error: Can't use 'a' because it is declared more than once.
-  A(this.a);
-         ^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {
-  new self::A::•(1);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart
deleted file mode 100644
index 6665128..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-/*@testedFeatures=checks*/
-library test;
-
-class C {
-  static m({int a: 0}) {}
-}
-
-void test() {
-  C.m(a: 1, a: 2, a: 3);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.textual_outline.expect
deleted file mode 100644
index a8791fb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-library test;
-
-class C {
-  static m({int a: 0}) {}
-}
-
-void test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7d76a64..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-library test;
-
-class C {
-  static m({int a: 0}) {}
-}
-
-main() {}
-void test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.expect
deleted file mode 100644
index 62ba41d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart:15:13: Error: Duplicated named argument 'a'.
-//   C.m(a: 1, a: 2, a: 3);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart:15:19: Error: Duplicated named argument 'a'.
-//   C.m(a: 1, a: 2, a: 3);
-//                   ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  static method m({core::int* a = #C1}) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → void {
-  self::C::m(a: invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart:15:19: Error: Duplicated named argument 'a'.
-  C.m(a: 1, a: 2, a: 3);
-                  ^");
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.outline.expect
deleted file mode 100644
index 95272ae..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library test;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  static method m({core::int* a}) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.transformed.expect
deleted file mode 100644
index 62ba41d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart.weak.transformed.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart:15:13: Error: Duplicated named argument 'a'.
-//   C.m(a: 1, a: 2, a: 3);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart:15:19: Error: Duplicated named argument 'a'.
-//   C.m(a: 1, a: 2, a: 3);
-//                   ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  static method m({core::int* a = #C1}) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → void {
-  self::C::m(a: invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/duplicated_named_args_3.dart:15:19: Error: Duplicated named argument 'a'.
-  C.m(a: 1, a: 2, a: 3);
-                  ^");
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart
deleted file mode 100644
index e77f929..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-// dynamic is treated as a name exported by dart:core.  void is not treated as a
-// name exported by dart:core.
-
-import 'dart:core' show int;
-
-dynamic testDynamic() => 0;
-void testVoid() {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.textual_outline.expect
deleted file mode 100644
index 32b4171..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'dart:core' show int;
-
-dynamic testDynamic() => 0;
-void testVoid() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.textual_outline_modelled.expect
deleted file mode 100644
index e08ab2d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'dart:core' show int;
-
-dynamic testDynamic() => 0;
-main() {}
-void testVoid() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.expect
deleted file mode 100644
index b52bd15..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
-// dynamic testDynamic() => 0;
-// ^^^^^^^
-//
-import self as self;
-
-import "dart:core" show int;
-
-static method testDynamic() → invalid-type
-  return 0;
-static method testVoid() → void {}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.outline.expect
deleted file mode 100644
index cde6b93..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
-// dynamic testDynamic() => 0;
-// ^^^^^^^
-//
-import self as self;
-
-import "dart:core" show int;
-
-static method testDynamic() → invalid-type
-  ;
-static method testVoid() → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.transformed.expect
deleted file mode 100644
index b52bd15..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart.weak.transformed.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/dynamic_and_void.dart:12:1: Error: Type 'dynamic' not found.
-// dynamic testDynamic() => 0;
-// ^^^^^^^
-//
-import self as self;
-
-import "dart:core" show int;
-
-static method testDynamic() → invalid-type
-  return 0;
-static method testVoid() → void {}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart
deleted file mode 100644
index ac1ec79..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-import 'error_location_01_lib1.dart';
-import 'error_location_01_lib2.dart';
-
-main() {
-  foo();
-  bar();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.textual_outline.expect
deleted file mode 100644
index c7f2b39..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'error_location_01_lib1.dart';
-import 'error_location_01_lib2.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.textual_outline_modelled.expect
deleted file mode 100644
index c7f2b39..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'error_location_01_lib1.dart';
-import 'error_location_01_lib2.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.expect
deleted file mode 100644
index a7b3c36..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "error_location_01_lib1.dart" as err;
-import "error_location_01_lib2.dart" as err2;
-
-import "org-dartlang-testcase:///error_location_01_lib1.dart";
-import "org-dartlang-testcase:///error_location_01_lib2.dart";
-
-static method main() → dynamic {
-  err::foo();
-  err2::bar();
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib2.dart:10:9: Error: Constant evaluation error:
-//   const Foo(0);
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-//
-import self as err2;
-
-import "org-dartlang-testcase:///error_location_01_lib1.dart";
-
-static method bar() → dynamic {
-  invalid-expression "This assertion failed.";
-}
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_01_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_01_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.outline.expect
deleted file mode 100644
index cc57c39..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.outline.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///error_location_01_lib1.dart";
-import "org-dartlang-testcase:///error_location_01_lib2.dart";
-
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → self2::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic
-  ;
-
-library;
-import self as self3;
-
-import "org-dartlang-testcase:///error_location_01_lib1.dart";
-
-static method bar() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.transformed.expect
deleted file mode 100644
index a7b3c36..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01.dart.weak.transformed.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "error_location_01_lib1.dart" as err;
-import "error_location_01_lib2.dart" as err2;
-
-import "org-dartlang-testcase:///error_location_01_lib1.dart";
-import "org-dartlang-testcase:///error_location_01_lib2.dart";
-
-static method main() → dynamic {
-  err::foo();
-  err2::bar();
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib2.dart:10:9: Error: Constant evaluation error:
-//   const Foo(0);
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-//
-import self as err2;
-
-import "org-dartlang-testcase:///error_location_01_lib1.dart";
-
-static method bar() → dynamic {
-  invalid-expression "This assertion failed.";
-}
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_01_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_01_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib1.dart
deleted file mode 100644
index 9a4e143..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib1.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-class Foo {
-  const Foo(int i) : assert(i > 0);
-}
-
-foo() {
-  new Foo(0);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib2.dart
deleted file mode 100644
index 2c5aa5a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_01_lib2.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.6
-
-import 'error_location_01_lib1.dart';
-
-bar() {
-  const Foo(0);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart
deleted file mode 100644
index 3044344..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-import 'error_location_02_lib1.dart';
-import 'error_location_02_lib2.dart';
-import 'error_location_02_lib3.dart';
-
-main() {
-  foo();
-  print(fooField2);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.textual_outline.expect
deleted file mode 100644
index 4a65ff5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'error_location_02_lib1.dart';
-import 'error_location_02_lib2.dart';
-import 'error_location_02_lib3.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.textual_outline_modelled.expect
deleted file mode 100644
index 4a65ff5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'error_location_02_lib1.dart';
-import 'error_location_02_lib2.dart';
-import 'error_location_02_lib3.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.expect
deleted file mode 100644
index 6e25d1b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.expect
+++ /dev/null
@@ -1,84 +0,0 @@
-library;
-import self as self;
-import "error_location_02_lib1.dart" as err;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///error_location_02_lib1.dart";
-import "org-dartlang-testcase:///error_location_02_lib2.dart";
-import "org-dartlang-testcase:///error_location_02_lib3.dart";
-
-static method main() → dynamic {
-  err::foo();
-  core::print(invalid-expression "This assertion failed.");
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib2.dart:9:24: Error: Constant evaluation error:
-// const fooField = const Foo(0);
-//                        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib2.dart:9:7: Context: While analyzing:
-// const fooField = const Foo(0);
-//       ^
-//
-import self as self2;
-import "error_location_02_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_02_lib1.dart";
-
-static const field err::Foo* fooField = invalid-expression "This assertion failed.";
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib3.dart:9:19: Error: Constant evaluation error:
-// const fooField2 = fooField;
-//                   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib3.dart:9:7: Context: While analyzing:
-// const fooField2 = fooField;
-//       ^
-//
-import self as self3;
-import "error_location_02_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_02_lib2.dart";
-
-static const field err::Foo* fooField2 = invalid-expression "This assertion failed.";
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_02_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_02_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.outline.expect
deleted file mode 100644
index 23cb135..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.outline.expect
+++ /dev/null
@@ -1,48 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///error_location_02_lib1.dart";
-import "org-dartlang-testcase:///error_location_02_lib2.dart";
-import "org-dartlang-testcase:///error_location_02_lib3.dart";
-
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → self2::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic
-  ;
-
-library;
-import self as self3;
-import "error_location_02_lib1.dart" as self2;
-
-import "org-dartlang-testcase:///error_location_02_lib1.dart";
-
-static const field self2::Foo* fooField = const self2::Foo::•(0);
-
-library;
-import self as self4;
-import "error_location_02_lib1.dart" as self2;
-import "error_location_02_lib2.dart" as self3;
-
-import "org-dartlang-testcase:///error_location_02_lib2.dart";
-
-static const field self2::Foo* fooField2 = self3::fooField;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.transformed.expect
deleted file mode 100644
index 6e25d1b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02.dart.weak.transformed.expect
+++ /dev/null
@@ -1,84 +0,0 @@
-library;
-import self as self;
-import "error_location_02_lib1.dart" as err;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///error_location_02_lib1.dart";
-import "org-dartlang-testcase:///error_location_02_lib2.dart";
-import "org-dartlang-testcase:///error_location_02_lib3.dart";
-
-static method main() → dynamic {
-  err::foo();
-  core::print(invalid-expression "This assertion failed.");
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib2.dart:9:24: Error: Constant evaluation error:
-// const fooField = const Foo(0);
-//                        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib2.dart:9:7: Context: While analyzing:
-// const fooField = const Foo(0);
-//       ^
-//
-import self as self2;
-import "error_location_02_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_02_lib1.dart";
-
-static const field err::Foo* fooField = invalid-expression "This assertion failed.";
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib3.dart:9:19: Error: Constant evaluation error:
-// const fooField2 = fooField;
-//                   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib3.dart:9:7: Context: While analyzing:
-// const fooField2 = fooField;
-//       ^
-//
-import self as self3;
-import "error_location_02_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_02_lib2.dart";
-
-static const field err::Foo* fooField2 = invalid-expression "This assertion failed.";
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_02_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_02_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib1.dart
deleted file mode 100644
index 9a4e143..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib1.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-class Foo {
-  const Foo(int i) : assert(i > 0);
-}
-
-foo() {
-  new Foo(0);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib2.dart
deleted file mode 100644
index fc93ae1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib2.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-import 'error_location_02_lib1.dart';
-
-const fooField = const Foo(0);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib3.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib3.dart
deleted file mode 100644
index 0b01d00..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_02_lib3.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-import 'error_location_02_lib2.dart';
-
-const fooField2 = fooField;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart
deleted file mode 100644
index 4d29916..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.6
-
-import 'error_location_03_lib1.dart';
-import 'error_location_03_lib2.dart';
-import 'error_location_03_lib3.dart';
-
-main() {
-  foo();
-  print(fooField);
-  print(fooField2);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.textual_outline.expect
deleted file mode 100644
index 028a793..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'error_location_03_lib1.dart';
-import 'error_location_03_lib2.dart';
-import 'error_location_03_lib3.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.textual_outline_modelled.expect
deleted file mode 100644
index 028a793..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'error_location_03_lib1.dart';
-import 'error_location_03_lib2.dart';
-import 'error_location_03_lib3.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.expect
deleted file mode 100644
index a391e0e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.expect
+++ /dev/null
@@ -1,88 +0,0 @@
-library;
-import self as self;
-import "error_location_03_lib1.dart" as err;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-import "org-dartlang-testcase:///error_location_03_lib2.dart";
-import "org-dartlang-testcase:///error_location_03_lib3.dart";
-
-static method main() → dynamic {
-  err::foo();
-  core::print(invalid-expression "This assertion failed.");
-  core::print(invalid-expression "This assertion failed.");
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib2.dart:9:24: Error: Constant evaluation error:
-// const fooField = const Foo(0);
-//                        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib2.dart:9:7: Context: While analyzing:
-// const fooField = const Foo(0);
-//       ^
-//
-import self as self2;
-import "error_location_03_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-
-static const field err::Foo* fooField = invalid-expression "This assertion failed.";
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib3.dart:9:25: Error: Constant evaluation error:
-// const fooField2 = const Foo(0);
-//                         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib3.dart:9:7: Context: While analyzing:
-// const fooField2 = const Foo(0);
-//       ^
-//
-import self as self3;
-import "error_location_03_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-
-static const field err::Foo* fooField2 = invalid-expression "This assertion failed.";
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_03_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_03_lib1.dart:8:9)
-
-org-dartlang-testcase:///error_location_03_lib3.dart:
-- Foo. (from org-dartlang-testcase:///error_location_03_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.outline.expect
deleted file mode 100644
index 93c5c0c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.outline.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-import "org-dartlang-testcase:///error_location_03_lib2.dart";
-import "org-dartlang-testcase:///error_location_03_lib3.dart";
-
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → self2::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic
-  ;
-
-library;
-import self as self3;
-import "error_location_03_lib1.dart" as self2;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-
-static const field self2::Foo* fooField = const self2::Foo::•(0);
-
-library;
-import self as self4;
-import "error_location_03_lib1.dart" as self2;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-
-static const field self2::Foo* fooField2 = const self2::Foo::•(0);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.transformed.expect
deleted file mode 100644
index a391e0e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03.dart.weak.transformed.expect
+++ /dev/null
@@ -1,88 +0,0 @@
-library;
-import self as self;
-import "error_location_03_lib1.dart" as err;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-import "org-dartlang-testcase:///error_location_03_lib2.dart";
-import "org-dartlang-testcase:///error_location_03_lib3.dart";
-
-static method main() → dynamic {
-  err::foo();
-  core::print(invalid-expression "This assertion failed.");
-  core::print(invalid-expression "This assertion failed.");
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib2.dart:9:24: Error: Constant evaluation error:
-// const fooField = const Foo(0);
-//                        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib2.dart:9:7: Context: While analyzing:
-// const fooField = const Foo(0);
-//       ^
-//
-import self as self2;
-import "error_location_03_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-
-static const field err::Foo* fooField = invalid-expression "This assertion failed.";
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib3.dart:9:25: Error: Constant evaluation error:
-// const fooField2 = const Foo(0);
-//                         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib3.dart:9:7: Context: While analyzing:
-// const fooField2 = const Foo(0);
-//       ^
-//
-import self as self3;
-import "error_location_03_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_03_lib1.dart";
-
-static const field err::Foo* fooField2 = invalid-expression "This assertion failed.";
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_03_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_03_lib1.dart:8:9)
-
-org-dartlang-testcase:///error_location_03_lib3.dart:
-- Foo. (from org-dartlang-testcase:///error_location_03_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib1.dart
deleted file mode 100644
index 9a4e143..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib1.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-class Foo {
-  const Foo(int i) : assert(i > 0);
-}
-
-foo() {
-  new Foo(0);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib2.dart
deleted file mode 100644
index faa861d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib2.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-import 'error_location_03_lib1.dart';
-
-const fooField = const Foo(0);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib3.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib3.dart
deleted file mode 100644
index 6616a66..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_03_lib3.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-import 'error_location_03_lib1.dart';
-
-const fooField2 = const Foo(0);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart
deleted file mode 100644
index a6dc761..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-import 'error_location_04_lib1.dart';
-import 'error_location_04_lib2.dart';
-
-main() {
-  foo();
-  bar();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.textual_outline.expect
deleted file mode 100644
index 3deded7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'error_location_04_lib1.dart';
-import 'error_location_04_lib2.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.textual_outline_modelled.expect
deleted file mode 100644
index 3deded7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'error_location_04_lib1.dart';
-import 'error_location_04_lib2.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.expect
deleted file mode 100644
index 3da6aa1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "error_location_04_lib1.dart" as err;
-import "error_location_04_lib2.dart" as err2;
-
-import "org-dartlang-testcase:///error_location_04_lib1.dart";
-import "org-dartlang-testcase:///error_location_04_lib2.dart";
-
-static method main() → dynamic {
-  err::foo();
-  err2::bar();
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib2.dart:11:27: Error: Constant evaluation error:
-//   const Bar() : x = const Foo(0);
-//                           ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-//
-import self as err2;
-import "dart:core" as core;
-import "error_location_04_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_04_lib1.dart";
-
-class Bar extends core::Object /*hasConstConstructor*/  {
-  final field err::Foo* x;
-  const constructor •() → err2::Bar*
-    : err2::Bar::x = invalid-expression "This assertion failed.", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method bar() → dynamic {}
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_04_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_04_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.outline.expect
deleted file mode 100644
index cb91977..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.outline.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///error_location_04_lib1.dart";
-import "org-dartlang-testcase:///error_location_04_lib2.dart";
-
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → self2::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic
-  ;
-
-library;
-import self as self3;
-import "dart:core" as core;
-import "error_location_04_lib1.dart" as self2;
-
-import "org-dartlang-testcase:///error_location_04_lib1.dart";
-
-class Bar extends core::Object /*hasConstConstructor*/  {
-  final field self2::Foo* x;
-  const constructor •() → self3::Bar*
-    : self3::Bar::x = const self2::Foo::•(0), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method bar() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.transformed.expect
deleted file mode 100644
index 3da6aa1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04.dart.weak.transformed.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "error_location_04_lib1.dart" as err;
-import "error_location_04_lib2.dart" as err2;
-
-import "org-dartlang-testcase:///error_location_04_lib1.dart";
-import "org-dartlang-testcase:///error_location_04_lib2.dart";
-
-static method main() → dynamic {
-  err::foo();
-  err2::bar();
-}
-
-library;
-import self as err;
-import "dart:core" as core;
-
-class Foo extends core::Object /*hasConstConstructor*/  {
-  const constructor •(core::int* i) → err::Foo*
-    : assert(i.{core::num::>}(0)), super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo() → dynamic {
-  new err::Foo::•(0);
-}
-
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib2.dart:11:27: Error: Constant evaluation error:
-//   const Bar() : x = const Foo(0);
-//                           ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib1.dart:8:31: Context: This assertion failed.
-//   const Foo(int i) : assert(i > 0);
-//                               ^
-//
-import self as err2;
-import "dart:core" as core;
-import "error_location_04_lib1.dart" as err;
-
-import "org-dartlang-testcase:///error_location_04_lib1.dart";
-
-class Bar extends core::Object /*hasConstConstructor*/  {
-  final field err::Foo* x;
-  const constructor •() → err2::Bar*
-    : err2::Bar::x = invalid-expression "This assertion failed.", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method bar() → dynamic {}
-
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///error_location_04_lib2.dart:
-- Foo. (from org-dartlang-testcase:///error_location_04_lib1.dart:8:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib1.dart
deleted file mode 100644
index 9a4e143..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib1.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-class Foo {
-  const Foo(int i) : assert(i > 0);
-}
-
-foo() {
-  new Foo(0);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib2.dart
deleted file mode 100644
index 7d893eb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_04_lib2.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-import 'error_location_04_lib1.dart';
-
-class Bar {
-  final Foo x;
-  const Bar() : x = const Foo(0);
-}
-
-bar() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart
deleted file mode 100644
index 4c0f5e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-library error_location_05;
-
-part 'error_location_05_lib1.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.textual_outline.expect
deleted file mode 100644
index e2be00e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-library error_location_05;
-
-part 'error_location_05_lib1.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.textual_outline_modelled.expect
deleted file mode 100644
index e2be00e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-library error_location_05;
-
-part 'error_location_05_lib1.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.expect
deleted file mode 100644
index 51baa0f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library error_location_05;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:9:8: Error: Duplicated parameter name 'z'.
-// x1(z, {z}) {}
-//        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:9:4: Context: Other parameter named 'z'.
-// x1(z, {z}) {}
-//    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:12:9: Error: 'z' is already declared in this scope.
-//   y(z, {z}) {}
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:12:5: Context: Previous declaration of 'z'.
-//   y(z, {z}) {}
-//     ^
-//
-import self as self;
-
-part error_location_05_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x2() → dynamic {
-  function y(dynamic z, {dynamic z = #C1}) → Null {}
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.outline.expect
deleted file mode 100644
index 24ddda3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library error_location_05;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:9:8: Error: Duplicated parameter name 'z'.
-// x1(z, {z}) {}
-//        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:9:4: Context: Other parameter named 'z'.
-// x1(z, {z}) {}
-//    ^
-//
-import self as self;
-
-part error_location_05_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z, {dynamic z}) → dynamic
-  ;
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x2() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.transformed.expect
deleted file mode 100644
index 51baa0f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05.dart.weak.transformed.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library error_location_05;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:9:8: Error: Duplicated parameter name 'z'.
-// x1(z, {z}) {}
-//        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:9:4: Context: Other parameter named 'z'.
-// x1(z, {z}) {}
-//    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:12:9: Error: 'z' is already declared in this scope.
-//   y(z, {z}) {}
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart:12:5: Context: Previous declaration of 'z'.
-//   y(z, {z}) {}
-//     ^
-//
-import self as self;
-
-part error_location_05_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
-static method /* from org-dartlang-testcase:///error_location_05_lib1.dart */ x2() → dynamic {
-  function y(dynamic z, {dynamic z = #C1}) → Null {}
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart
deleted file mode 100644
index cacaf93..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_05_lib1.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-part of error_location_05;
-
-x1(z, {z}) {}
-
-x2() {
-  y(z, {z}) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart
deleted file mode 100644
index a9f2019..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-library error_location_06;
-
-part 'error_location_06_lib1.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.textual_outline.expect
deleted file mode 100644
index 218450a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-library error_location_06;
-
-part 'error_location_06_lib1.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.textual_outline_modelled.expect
deleted file mode 100644
index 218450a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-library error_location_06;
-
-part 'error_location_06_lib1.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.expect
deleted file mode 100644
index eafc70a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library error_location_06;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:14:8: Error: Duplicated parameter name 'z'.
-// x1(z, {z}) {}
-//        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:14:4: Context: Other parameter named 'z'.
-// x1(z, {z}) {}
-//    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:17:9: Error: 'z' is already declared in this scope.
-//   y(z, {z}) {}
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:17:5: Context: Previous declaration of 'z'.
-//   y(z, {z}) {}
-//     ^
-//
-import self as self;
-
-part error_location_06_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x2() → dynamic {
-  function y(dynamic z, {dynamic z = #C1}) → Null {}
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.outline.expect
deleted file mode 100644
index 7b9646a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library error_location_06;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:14:8: Error: Duplicated parameter name 'z'.
-// x1(z, {z}) {}
-//        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:14:4: Context: Other parameter named 'z'.
-// x1(z, {z}) {}
-//    ^
-//
-import self as self;
-
-part error_location_06_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x1(dynamic z, {dynamic z}) → dynamic
-  ;
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x2() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.transformed.expect
deleted file mode 100644
index eafc70a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06.dart.weak.transformed.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library error_location_06;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:14:8: Error: Duplicated parameter name 'z'.
-// x1(z, {z}) {}
-//        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:14:4: Context: Other parameter named 'z'.
-// x1(z, {z}) {}
-//    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:17:9: Error: 'z' is already declared in this scope.
-//   y(z, {z}) {}
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart:17:5: Context: Previous declaration of 'z'.
-//   y(z, {z}) {}
-//     ^
-//
-import self as self;
-
-part error_location_06_lib1.dart;
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x1(dynamic z, {dynamic z = #C1}) → dynamic {}
-static method /* from org-dartlang-testcase:///error_location_06_lib1.dart */ x2() → dynamic {
-  function y(dynamic z, {dynamic z = #C1}) → Null {}
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart
deleted file mode 100644
index d726a8d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/error_locations/error_location_06_lib1.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// 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.6
-
-// Lots of comment lines that pushes the length of this file beyond that of
-// error_location_06. This in turn causes the (first) 'z' in 'x2' to get an
-// offset that is larger than the largest valid offset in error_location_06.
-// This in turn can cause a crash, if the fileUri for that z is the wrong file.
-
-part of error_location_06;
-
-x1(z, {z}) {}
-
-x2() {
-  y(z, {z}) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart b/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart
deleted file mode 100644
index 3571e49..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {
-  var field;
-}
-
-class B {
-  var field;
-}
-
-class C {
-  operator ==(x) => false;
-}
-
-class X implements A, B {
-  var field;
-}
-
-void useAsA(A object) {
-  var _ = object.field;
-}
-
-void useAsB(B object) {
-  var _ = object.field;
-  escape(object);
-}
-
-void escape(x) {
-  x ??= "";
-  x ??= 45;
-  if (x is! int && x is! String) {
-    x.field = 45;
-  }
-}
-
-main() {
-  // escape("");
-  // escape(45);
-
-  var object = new X();
-  useAsA(new A());
-  useAsA(object);
-
-  useAsB(new B());
-  useAsB(object);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.textual_outline.expect
deleted file mode 100644
index bdc547b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.textual_outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-class A {
-  var field;
-}
-
-class B {
-  var field;
-}
-
-class C {
-  operator ==(x) => false;
-}
-
-class X implements A, B {
-  var field;
-}
-
-void useAsA(A object) {}
-void useAsB(B object) {}
-void escape(x) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.textual_outline_modelled.expect
deleted file mode 100644
index 344fffd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-class A {
-  var field;
-}
-
-class B {
-  var field;
-}
-
-class C {
-  operator ==(x) => false;
-}
-
-class X implements A, B {
-  var field;
-}
-
-main() {}
-void escape(x) {}
-void useAsA(A object) {}
-void useAsB(B object) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.expect
deleted file mode 100644
index 2a4b4c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.expect
+++ /dev/null
@@ -1,89 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  operator ==(dynamic x) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object implements self::A, self::B {
-  field dynamic field = null;
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method useAsA(self::A* object) → void {
-  dynamic _ = object.{self::A::field};
-}
-static method useAsB(self::B* object) → void {
-  dynamic _ = object.{self::B::field};
-  self::escape(object);
-}
-static method escape(dynamic x) → void {
-  x.{core::Object::==}(null) ?{dynamic} x = "" : null;
-  x.{core::Object::==}(null) ?{dynamic} x = 45 : null;
-  if(!(x is core::int*) && !(x is core::String*)) {
-    x.field = 45;
-  }
-}
-static method main() → dynamic {
-  self::X* object = new self::X::•();
-  self::useAsA(new self::A::•());
-  self::useAsA(object);
-  self::useAsB(new self::B::•());
-  self::useAsB(object);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.outline.expect
deleted file mode 100644
index 9efa03e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.outline.expect
+++ /dev/null
@@ -1,72 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field dynamic field;
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  field dynamic field;
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  operator ==(dynamic x) → core::bool*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object implements self::A, self::B {
-  field dynamic field;
-  synthetic constructor •() → self::X*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method useAsA(self::A* object) → void
-  ;
-static method useAsB(self::B* object) → void
-  ;
-static method escape(dynamic x) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.transformed.expect
deleted file mode 100644
index 2a4b4c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/escape.dart.weak.transformed.expect
+++ /dev/null
@@ -1,89 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  operator ==(dynamic x) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object implements self::A, self::B {
-  field dynamic field = null;
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method useAsA(self::A* object) → void {
-  dynamic _ = object.{self::A::field};
-}
-static method useAsB(self::B* object) → void {
-  dynamic _ = object.{self::B::field};
-  self::escape(object);
-}
-static method escape(dynamic x) → void {
-  x.{core::Object::==}(null) ?{dynamic} x = "" : null;
-  x.{core::Object::==}(null) ?{dynamic} x = 45 : null;
-  if(!(x is core::int*) && !(x is core::String*)) {
-    x.field = 45;
-  }
-}
-static method main() → dynamic {
-  self::X* object = new self::X::•();
-  self::useAsA(new self::A::•());
-  self::useAsA(object);
-  self::useAsB(new self::B::•());
-  self::useAsB(object);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart b/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart
deleted file mode 100644
index df155e9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-export 'hello.dart' show main;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.textual_outline.expect
deleted file mode 100644
index 711d1b4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-export 'hello.dart' show main;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.textual_outline_modelled.expect
deleted file mode 100644
index 711d1b4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-export 'hello.dart' show main;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.expect
deleted file mode 100644
index 94479f0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-import self as self;
-import "hello.dart" as hel;
-additionalExports = (hel::main)
-
-export "org-dartlang-testcase:///hello.dart" show main;
-
-
-library;
-import self as hel;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.outline.expect
deleted file mode 100644
index a6d3627..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.outline.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-library;
-import self as self;
-import "hello.dart" as hel;
-additionalExports = (hel::main)
-
-export "org-dartlang-testcase:///hello.dart" show main;
-
-
-library;
-import self as hel;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.transformed.expect
deleted file mode 100644
index 94479f0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_main.dart.weak.transformed.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-import self as self;
-import "hello.dart" as hel;
-additionalExports = (hel::main)
-
-export "org-dartlang-testcase:///hello.dart" show main;
-
-
-library;
-import self as hel;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart
deleted file mode 100644
index 19158e2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-/// Test that exports are serialized in platform.dill.
-
-// This is somewhat brittle and we should extend this test framework to be
-// able to deal with multiple .dill files.
-import 'dart:developer' show UserTag;
-
-export 'dart:core' show print;
-
-main() {
-  print(UserTag);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.textual_outline.expect
deleted file mode 100644
index 8188bed..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import 'dart:developer' show UserTag;
-export 'dart:core' show print;
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index baea63f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-export 'dart:core' show print;
-import 'dart:developer' show UserTag;
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.expect
deleted file mode 100644
index 497ce03..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-additionalExports = (core::print)
-
-import "dart:developer" show UserTag;
-export "dart:core" show print;
-
-static method main() → dynamic {
-  core::print(#C1);
-}
-
-constants  {
-  #C1 = TypeLiteralConstant(dev::UserTag*)
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.outline.expect
deleted file mode 100644
index 464a785..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-additionalExports = (core::print)
-
-import "dart:developer" show UserTag;
-export "dart:core" show print;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.transformed.expect
deleted file mode 100644
index 497ce03..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/export_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-additionalExports = (core::print)
-
-import "dart:developer" show UserTag;
-export "dart:core" show print;
-
-static method main() → dynamic {
-  core::print(#C1);
-}
-
-constants  {
-  #C1 = TypeLiteralConstant(dev::UserTag*)
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart b/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart
deleted file mode 100644
index 407765a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-foo({fisk}) {
-  print(fisk);
-}
-
-caller(f) {
-  f();
-}
-
-main() {
-  int i = 0;
-  print(i == 1 ? "bad" : "good");
-  print("$i");
-  print("'$i'");
-  print(" '${i}' ");
-  print(" '${i}' '${i}'");
-  print(" '$i' '${i}'");
-  print("foo" "bar");
-  print(" '${i}' '${i}'" " '$i' '${i}'");
-  try {
-    throw "fisk";
-  } on String catch (e, s) {
-    print(e);
-    if (s != null) print(s);
-  }
-  for (; false;) {}
-  var list = ["Hello, World!"];
-  print(list[i]);
-  list[i] = "Hello, Brave New World!";
-  print(list[i]);
-  i = 87;
-  print(-i);
-  print(~i);
-  print(!(i == 42));
-  print(--i);
-  print(++i);
-  print(i--);
-  print(i++);
-  print(new Object());
-  print(const Object());
-  print((new List<String>(2)).runtimeType);
-  foo(fisk: "Blorp gulp");
-  f() {
-    print("f was called");
-  }
-
-  caller(f);
-  caller(() {
-    print("<anon> was called");
-  });
-  g([message]) {
-    print(message);
-  }
-
-  g("Hello, World");
-  caller(([x]) {
-    print("<anon> was called with $x");
-  });
-  h({message}) {
-    print(message);
-  }
-
-  h(message: "Hello, World");
-  caller(({x}) {
-    print("<anon> was called with $x");
-  });
-  print((int).toString());
-  print(int);
-  print(int..toString());
-  try {
-    print(int?.toString());
-    throw "Shouldn't work";
-  } on NoSuchMethodError catch (e) {
-    print("As expected: $e");
-  }
-  print(int.parse("42"));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.textual_outline.expect
deleted file mode 100644
index 1b5dea8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-foo({fisk}) {}
-caller(f) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.textual_outline_modelled.expect
deleted file mode 100644
index 2426a32..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-caller(f) {}
-foo({fisk}) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.expect
deleted file mode 100644
index 8c295b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.expect
+++ /dev/null
@@ -1,101 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart:76:16: Error: Method not found: 'int.toString'.
-//     print(int?.toString());
-//                ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-static method foo({dynamic fisk = #C1}) → dynamic {
-  core::print(fisk);
-}
-static method caller(dynamic f) → dynamic {
-  f.call();
-}
-static method main() → dynamic {
-  core::int* i = 0;
-  core::print(i.{core::num::==}(1) ?{core::String*} "bad" : "good");
-  core::print("${i}");
-  core::print("'${i}'");
-  core::print(" '${i}' ");
-  core::print(" '${i}' '${i}'");
-  core::print(" '${i}' '${i}'");
-  core::print("foobar");
-  core::print(" '${i}' '${i}' '${i}' '${i}'");
-  try {
-    throw "fisk";
-  }
-  on core::String* catch(final core::String* e, final core::StackTrace* s) {
-    core::print(e);
-    if(!s.{core::Object::==}(null))
-      core::print(s);
-  }
-  for (; false; ) {
-  }
-  core::List<core::String*>* list = <core::String*>["Hello, World!"];
-  core::print(list.{core::List::[]}(i));
-  list.{core::List::[]=}(i, "Hello, Brave New World!");
-  core::print(list.{core::List::[]}(i));
-  i = 87;
-  core::print(i.{core::int::unary-}());
-  core::print(i.{core::int::~}());
-  core::print(!i.{core::num::==}(42));
-  core::print(i = i.{core::num::-}(1));
-  core::print(i = i.{core::num::+}(1));
-  core::print(let final core::int* #t1 = i in let final core::int* #t2 = i = #t1.{core::num::-}(1) in #t1);
-  core::print(let final core::int* #t3 = i in let final core::int* #t4 = i = #t3.{core::num::+}(1) in #t3);
-  core::print(new core::Object::•());
-  core::print(#C2);
-  core::print(core::List::•<core::String*>(2).{core::Object::runtimeType});
-  self::foo(fisk: "Blorp gulp");
-  function f() → Null {
-    core::print("f was called");
-  }
-  self::caller(f);
-  self::caller(() → Null {
-    core::print("<anon> was called");
-  });
-  function g([dynamic message = #C1]) → Null {
-    core::print(message);
-  }
-  g.call("Hello, World");
-  self::caller(([dynamic x = #C1]) → Null {
-    core::print("<anon> was called with ${x}");
-  });
-  function h({dynamic message = #C1}) → Null {
-    core::print(message);
-  }
-  h.call(message: "Hello, World");
-  self::caller(({dynamic x = #C1}) → Null {
-    core::print("<anon> was called with ${x}");
-  });
-  core::print((#C3).{core::Type::toString}());
-  core::print(#C3);
-  core::print(let final core::Type* #t5 = #C3 in block {
-    #t5.{core::Type::toString}();
-  } =>#t5);
-  try {
-    core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart:76:16: Error: Method not found: 'int.toString'.
-    print(int?.toString());
-               ^^^^^^^^");
-    throw "Shouldn't work";
-  }
-  on core::NoSuchMethodError* catch(final core::NoSuchMethodError* e) {
-    core::print("As expected: ${e}");
-  }
-  core::print(core::int::parse("42"));
-}
-
-constants  {
-  #C1 = null
-  #C2 = core::Object {}
-  #C3 = TypeLiteralConstant(core::int*)
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///expressions.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.outline.expect
deleted file mode 100644
index 721ce9d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-
-static method foo({dynamic fisk}) → dynamic
-  ;
-static method caller(dynamic f) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.transformed.expect
deleted file mode 100644
index b57f1a5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart.weak.transformed.expect
+++ /dev/null
@@ -1,107 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart:76:16: Error: Method not found: 'int.toString'.
-//     print(int?.toString());
-//                ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-static method foo({dynamic fisk = #C1}) → dynamic {
-  core::print(fisk);
-}
-static method caller(dynamic f) → dynamic {
-  f.call();
-}
-static method main() → dynamic {
-  core::int* i = 0;
-  core::print(i.{core::num::==}(1) ?{core::String*} "bad" : "good");
-  core::print("${i}");
-  core::print("'${i}'");
-  core::print(" '${i}' ");
-  core::print(" '${i}' '${i}'");
-  core::print(" '${i}' '${i}'");
-  core::print("foobar");
-  core::print(" '${i}' '${i}' '${i}' '${i}'");
-  try {
-    throw "fisk";
-  }
-  on core::String* catch(final core::String* e, final core::StackTrace* s) {
-    core::print(e);
-    if(!s.{core::Object::==}(null))
-      core::print(s);
-  }
-  for (; false; ) {
-  }
-  core::List<core::String*>* list = core::_GrowableList::_literal1<core::String*>("Hello, World!");
-  core::print(list.{core::List::[]}(i));
-  list.{core::List::[]=}(i, "Hello, Brave New World!");
-  core::print(list.{core::List::[]}(i));
-  i = 87;
-  core::print(i.{core::int::unary-}());
-  core::print(i.{core::int::~}());
-  core::print(!i.{core::num::==}(42));
-  core::print(i = i.{core::num::-}(1));
-  core::print(i = i.{core::num::+}(1));
-  core::print(let final core::int* #t1 = i in let final core::int* #t2 = i = #t1.{core::num::-}(1) in #t1);
-  core::print(let final core::int* #t3 = i in let final core::int* #t4 = i = #t3.{core::num::+}(1) in #t3);
-  core::print(new core::Object::•());
-  core::print(#C2);
-  core::print(core::_List::•<core::String*>(2).{core::Object::runtimeType});
-  self::foo(fisk: "Blorp gulp");
-  function f() → Null {
-    core::print("f was called");
-  }
-  self::caller(f);
-  self::caller(() → Null {
-    core::print("<anon> was called");
-  });
-  function g([dynamic message = #C1]) → Null {
-    core::print(message);
-  }
-  g.call("Hello, World");
-  self::caller(([dynamic x = #C1]) → Null {
-    core::print("<anon> was called with ${x}");
-  });
-  function h({dynamic message = #C1}) → Null {
-    core::print(message);
-  }
-  h.call(message: "Hello, World");
-  self::caller(({dynamic x = #C1}) → Null {
-    core::print("<anon> was called with ${x}");
-  });
-  core::print((#C3).{core::Type::toString}());
-  core::print(#C3);
-  core::print(let final core::Type* #t5 = #C3 in block {
-    #t5.{core::Type::toString}();
-  } =>#t5);
-  try {
-    core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/expressions.dart:76:16: Error: Method not found: 'int.toString'.
-    print(int?.toString());
-               ^^^^^^^^");
-    throw "Shouldn't work";
-  }
-  on core::NoSuchMethodError* catch(final core::NoSuchMethodError* e) {
-    core::print("As expected: ${e}");
-  }
-  core::print(core::int::parse("42"));
-}
-
-constants  {
-  #C1 = null
-  #C2 = core::Object {}
-  #C3 = TypeLiteralConstant(core::int*)
-}
-
-Extra constant evaluation status:
-Evaluated: StringConcatenation @ org-dartlang-testcase:///expressions.dart:23:8 -> StringConstant("foobar")
-Evaluated: VariableGetImpl @ org-dartlang-testcase:///expressions.dart:74:9 -> TypeLiteralConstant(int*)
-Evaluated: VariableGet @ org-dartlang-testcase:///expressions.dart:74:9 -> TypeLiteralConstant(int*)
-Extra constant evaluation: evaluated: 135, effectively constant: 3
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///expressions.dart:
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart b/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart
deleted file mode 100644
index 6cba547..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-// Regression test for issue #39774.
-
-class SuperClass {}
-
-mixin Mixin<T> {}
-
-class Class1<T, S extends SuperClass> extends S with Mixin<T> {}
-
-class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.textual_outline.expect
deleted file mode 100644
index 4fb5044..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class SuperClass {}
-
-mixin Mixin<T> {}
-
-class Class1<T, S extends SuperClass> extends S with Mixin<T> {}
-
-class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7d6e04d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class Class1<T, S extends SuperClass> extends S with Mixin<T> {}
-
-class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-
-class SuperClass {}
-
-main() {}
-mixin Mixin<T> {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.expect
deleted file mode 100644
index 4c8b6e1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:15:7: Error: The type 'M' can't be mixed in.
-// class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:13:7: Error: The type variable 'S' can't be used as supertype.
-// class Class1<T, S extends SuperClass> extends S with Mixin<T> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:15:7: Error: The type variable 'M' can't be used as supertype.
-// class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class SuperClass extends core::Object {
-  synthetic constructor •() → self::SuperClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Mixin<T extends core::Object* = dynamic> extends core::Object /*isMixinDeclaration*/  {
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Class1&S&Mixin<T extends core::Object* = dynamic, S extends self::SuperClass* = self::SuperClass*> = core::Object with self::Mixin<self::_Class1&S&Mixin::T*> /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Class1&S&Mixin<self::_Class1&S&Mixin::T*, self::_Class1&S&Mixin::S*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Class1<T extends core::Object* = dynamic, S extends self::SuperClass* = self::SuperClass*> extends self::_Class1&S&Mixin<self::Class1::T*, self::Class1::S*> {
-  synthetic constructor •() → self::Class1<self::Class1::T*, self::Class1::S*>*
-    : super self::_Class1&S&Mixin::•()
-    ;
-}
-abstract class _Class2&SuperClass&M<T extends core::Object* = dynamic, M extends self::Mixin<self::_Class2&SuperClass&M::T*>* = self::Mixin<dynamic>*> extends self::SuperClass /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Class2&SuperClass&M<self::_Class2&SuperClass&M::T*, self::_Class2&SuperClass&M::M*>*
-    : super self::SuperClass::•()
-    ;
-}
-class Class2<T extends core::Object* = dynamic, M extends self::Mixin<self::Class2::T*>* = self::Mixin<dynamic>*> extends self::_Class2&SuperClass&M<self::Class2::T*, self::Class2::M*> {
-  synthetic constructor •() → self::Class2<self::Class2::T*, self::Class2::M*>*
-    : super self::_Class2&SuperClass&M::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.outline.expect
deleted file mode 100644
index bbf4a2d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.outline.expect
+++ /dev/null
@@ -1,74 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:15:7: Error: The type 'M' can't be mixed in.
-// class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:13:7: Error: The type variable 'S' can't be used as supertype.
-// class Class1<T, S extends SuperClass> extends S with Mixin<T> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:15:7: Error: The type variable 'M' can't be used as supertype.
-// class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class SuperClass extends core::Object {
-  synthetic constructor •() → self::SuperClass*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Mixin<T extends core::Object* = dynamic> extends core::Object /*isMixinDeclaration*/  {
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Class1&S&Mixin<T extends core::Object* = dynamic, S extends self::SuperClass* = self::SuperClass*> = core::Object with self::Mixin<self::_Class1&S&Mixin::T*> /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Class1&S&Mixin<self::_Class1&S&Mixin::T*, self::_Class1&S&Mixin::S*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Class1<T extends core::Object* = dynamic, S extends self::SuperClass* = self::SuperClass*> extends self::_Class1&S&Mixin<self::Class1::T*, self::Class1::S*> {
-  synthetic constructor •() → self::Class1<self::Class1::T*, self::Class1::S*>*
-    ;
-}
-abstract class _Class2&SuperClass&M<T extends core::Object* = dynamic, M extends self::Mixin<self::_Class2&SuperClass&M::T*>* = self::Mixin<dynamic>*> extends self::SuperClass /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Class2&SuperClass&M<self::_Class2&SuperClass&M::T*, self::_Class2&SuperClass&M::M*>*
-    : super self::SuperClass::•()
-    ;
-}
-class Class2<T extends core::Object* = dynamic, M extends self::Mixin<self::Class2::T*>* = self::Mixin<dynamic>*> extends self::_Class2&SuperClass&M<self::Class2::T*, self::Class2::M*> {
-  synthetic constructor •() → self::Class2<self::Class2::T*, self::Class2::M*>*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.transformed.expect
deleted file mode 100644
index e1ebf6e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart.weak.transformed.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:15:7: Error: The type 'M' can't be mixed in.
-// class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:13:7: Error: The type variable 'S' can't be used as supertype.
-// class Class1<T, S extends SuperClass> extends S with Mixin<T> {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/extend_with_type_variable.dart:15:7: Error: The type variable 'M' can't be used as supertype.
-// class Class2<T, M extends Mixin<T>> extends SuperClass with M {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class SuperClass extends core::Object {
-  synthetic constructor •() → self::SuperClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Mixin<T extends core::Object* = dynamic> extends core::Object /*isMixinDeclaration*/  {
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Class1&S&Mixin<T extends core::Object* = dynamic, S extends self::SuperClass* = self::SuperClass*> extends core::Object implements self::Mixin<self::_Class1&S&Mixin::T*> /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_Class1&S&Mixin<self::_Class1&S&Mixin::T*, self::_Class1&S&Mixin::S*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Class1<T extends core::Object* = dynamic, S extends self::SuperClass* = self::SuperClass*> extends self::_Class1&S&Mixin<self::Class1::T*, self::Class1::S*> {
-  synthetic constructor •() → self::Class1<self::Class1::T*, self::Class1::S*>*
-    : super self::_Class1&S&Mixin::•()
-    ;
-}
-abstract class _Class2&SuperClass&M<T extends core::Object* = dynamic, M extends self::Mixin<self::_Class2&SuperClass&M::T*>* = self::Mixin<dynamic>*> extends self::SuperClass /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Class2&SuperClass&M<self::_Class2&SuperClass&M::T*, self::_Class2&SuperClass&M::M*>*
-    : super self::SuperClass::•()
-    ;
-}
-class Class2<T extends core::Object* = dynamic, M extends self::Mixin<self::Class2::T*>* = self::Mixin<dynamic>*> extends self::_Class2&SuperClass&M<self::Class2::T*, self::Class2::M*> {
-  synthetic constructor •() → self::Class2<self::Class2::T*, self::Class2::M*>*
-    : super self::_Class2&SuperClass&M::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart b/pkg/front_end/testcases/general_nnbd_opt_out/external.dart
deleted file mode 100644
index ae5fa13..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-import 'dart:isolate';
-
-var subscription;
-
-void onData(x) {
-  print(x);
-  subscription.cancel();
-}
-
-main() {
-  var string = new String.fromCharCode(65); // External string factory.
-  var port = new ReceivePort(); // External factory.
-  subscription = port.listen(onData); // Dynamic call on external instance.
-  port.sendPort.send(string);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.textual_outline.expect
deleted file mode 100644
index 72d8f00..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'dart:isolate';
-
-var subscription;
-void onData(x) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.textual_outline_modelled.expect
deleted file mode 100644
index de46c08..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'dart:isolate';
-
-main() {}
-var subscription;
-void onData(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.expect
deleted file mode 100644
index 766ac5f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:isolate" as iso;
-
-import "dart:isolate";
-
-static field dynamic subscription;
-static method onData(dynamic x) → void {
-  core::print(x);
-  self::subscription.cancel();
-}
-static method main() → dynamic {
-  core::String* string = core::String::fromCharCode(65);
-  iso::ReceivePort* port = iso::ReceivePort::•();
-  self::subscription = port.{iso::ReceivePort::listen}(#C1);
-  port.{iso::ReceivePort::sendPort}.{iso::SendPort::send}(string);
-}
-
-constants  {
-  #C1 = tearoff self::onData
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.outline.expect
deleted file mode 100644
index 1c44d50..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-
-import "dart:isolate";
-
-static field dynamic subscription;
-static method onData(dynamic x) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.transformed.expect
deleted file mode 100644
index 766ac5f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external.dart.weak.transformed.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:isolate" as iso;
-
-import "dart:isolate";
-
-static field dynamic subscription;
-static method onData(dynamic x) → void {
-  core::print(x);
-  self::subscription.cancel();
-}
-static method main() → dynamic {
-  core::String* string = core::String::fromCharCode(65);
-  iso::ReceivePort* port = iso::ReceivePort::•();
-  self::subscription = port.{iso::ReceivePort::listen}(#C1);
-  port.{iso::ReceivePort::sendPort}.{iso::SendPort::send}(string);
-}
-
-constants  {
-  #C1 = tearoff self::onData
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart b/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart
deleted file mode 100644
index e1f051e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'dart-ext:here';
-import 'dart-ext:foo/../there';
-import 'dart-ext:/usr/local/somewhere';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.textual_outline.expect
deleted file mode 100644
index e1f051e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'dart-ext:here';
-import 'dart-ext:foo/../there';
-import 'dart-ext:/usr/local/somewhere';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.textual_outline_modelled.expect
deleted file mode 100644
index 29aa279..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-import 'dart-ext:/usr/local/somewhere';
-import 'dart-ext:foo/../there';
-import 'dart-ext:here';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.expect
deleted file mode 100644
index ae59d80..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-@#C2
-@#C4
-@#C6
-library /*isNonNullableByDefault*/;
-import self as self;
-import "dart:_internal" as _in;
-
-static method main() → dynamic {}
-
-constants  {
-  #C1 = "dart-ext:here"
-  #C2 = _in::ExternalName {name:#C1}
-  #C3 = "dart-ext:foo/../there"
-  #C4 = _in::ExternalName {name:#C3}
-  #C5 = "dart-ext:/usr/local/somewhere"
-  #C6 = _in::ExternalName {name:#C5}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///external_import.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:92:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.outline.expect
deleted file mode 100644
index e4b8951..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-@dart._internal::ExternalName::•("dart-ext:here")
-@dart._internal::ExternalName::•("dart-ext:foo/../there")
-@dart._internal::ExternalName::•("dart-ext:/usr/local/somewhere")
-library /*isNonNullableByDefault*/;
-import self as self;
-import "dart:_internal" as _in;
-
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: ConstructorInvocation @ null -> InstanceConstant(const ExternalName{ExternalName.name: "dart-ext:here"})
-Evaluated: ConstructorInvocation @ null -> InstanceConstant(const ExternalName{ExternalName.name: "dart-ext:foo/../there"})
-Evaluated: ConstructorInvocation @ null -> InstanceConstant(const ExternalName{ExternalName.name: "dart-ext:/usr/local/somewhere"})
-Extra constant evaluation: evaluated: 3, effectively constant: 3
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.transformed.expect
deleted file mode 100644
index ae59d80..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/external_import.dart.weak.transformed.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-@#C2
-@#C4
-@#C6
-library /*isNonNullableByDefault*/;
-import self as self;
-import "dart:_internal" as _in;
-
-static method main() → dynamic {}
-
-constants  {
-  #C1 = "dart-ext:here"
-  #C2 = _in::ExternalName {name:#C1}
-  #C3 = "dart-ext:foo/../there"
-  #C4 = _in::ExternalName {name:#C3}
-  #C5 = "dart-ext:/usr/local/somewhere"
-  #C6 = _in::ExternalName {name:#C5}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///external_import.dart:
-- ExternalName. (from org-dartlang-sdk:///sdk/lib/internal/internal.dart:92:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart b/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart
deleted file mode 100644
index 41591fe..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-void main(List<String> args) {
-  var x = args.length;
-  switch (x) {
-    case 3:
-      x = 4;
-    case 5:
-      break;
-    case 6:
-    case 7:
-      if (args[0] == '') {
-        break;
-      } else {
-        return;
-      }
-    case 4:
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.textual_outline.expect
deleted file mode 100644
index 9b82bc0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-void main(List<String> args) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9b82bc0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-void main(List<String> args) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.expect
deleted file mode 100644
index 7842f63..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart:10:5: Error: Switch case may fall through to the next case.
-//     case 3:
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart:14:5: Error: Switch case may fall through to the next case.
-//     case 6:
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main(core::List<core::String*>* args) → void {
-  core::int* x = args.{core::List::length};
-  #L1:
-  switch(x) {
-    #L2:
-    case #C1:
-      {
-        x = 4;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 10);
-      }
-    #L3:
-    case #C2:
-      {
-        break #L1;
-      }
-    #L4:
-    case #C3:
-    case #C4:
-      {
-        if(args.{core::List::[]}(0).{core::String::==}("")) {
-          break #L1;
-        }
-        else {
-          return;
-        }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 14);
-      }
-    #L5:
-    case #C5:
-      {}
-  }
-}
-
-constants  {
-  #C1 = 3
-  #C2 = 5
-  #C3 = 6
-  #C4 = 7
-  #C5 = 4
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.outline.expect
deleted file mode 100644
index 6e0a3e9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main(core::List<core::String*>* args) → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.transformed.expect
deleted file mode 100644
index 7842f63..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart.weak.transformed.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart:10:5: Error: Switch case may fall through to the next case.
-//     case 3:
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/fallthrough.dart:14:5: Error: Switch case may fall through to the next case.
-//     case 6:
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main(core::List<core::String*>* args) → void {
-  core::int* x = args.{core::List::length};
-  #L1:
-  switch(x) {
-    #L2:
-    case #C1:
-      {
-        x = 4;
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 10);
-      }
-    #L3:
-    case #C2:
-      {
-        break #L1;
-      }
-    #L4:
-    case #C3:
-    case #C4:
-      {
-        if(args.{core::List::[]}(0).{core::String::==}("")) {
-          break #L1;
-        }
-        else {
-          return;
-        }
-        throw new core::FallThroughError::_create("org-dartlang-testcase:///fallthrough.dart", 14);
-      }
-    #L5:
-    case #C5:
-      {}
-  }
-}
-
-constants  {
-  #C1 = 3
-  #C2 = 5
-  #C3 = 6
-  #C4 = 7
-  #C5 = 4
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart b/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart
deleted file mode 100644
index 48f6d85..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-int fibonacci(int n) {
-  if (n < 2) return n;
-  return fibonacci(n - 1) + fibonacci(n - 2);
-}
-
-main() {
-  for (int i = 0; i < 20; i++) {
-    print(fibonacci(i));
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.textual_outline.expect
deleted file mode 100644
index 5e1c191..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-int fibonacci(int n) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5e1c191..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-int fibonacci(int n) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.expect
deleted file mode 100644
index 95dc207..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method fibonacci(core::int* n) → core::int* {
-  if(n.{core::num::<}(2))
-    return n;
-  return self::fibonacci(n.{core::num::-}(1)).{core::num::+}(self::fibonacci(n.{core::num::-}(2)));
-}
-static method main() → dynamic {
-  for (core::int* i = 0; i.{core::num::<}(20); i = i.{core::num::+}(1)) {
-    core::print(self::fibonacci(i));
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.outline.expect
deleted file mode 100644
index 4bb744f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method fibonacci(core::int* n) → core::int*
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.transformed.expect
deleted file mode 100644
index 95dc207..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/fibonacci.dart.weak.transformed.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method fibonacci(core::int* n) → core::int* {
-  if(n.{core::num::<}(2))
-    return n;
-  return self::fibonacci(n.{core::num::-}(1)).{core::num::+}(self::fibonacci(n.{core::num::-}(2)));
-}
-static method main() → dynamic {
-  for (core::int* i = 0; i.{core::num::<}(20); i = i.{core::num::+}(1)) {
-    core::print(self::fibonacci(i));
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/folder.options b/pkg/front_end/testcases/general_nnbd_opt_out/folder.options
deleted file mode 100644
index e69de29..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/folder.options
+++ /dev/null
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart
deleted file mode 100644
index 8c91dc7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-main(List<String> arguments) {
-  for (String arguments in arguments) {
-    print(arguments);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.textual_outline.expect
deleted file mode 100644
index b6ad80a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main(List<String> arguments) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.textual_outline_modelled.expect
deleted file mode 100644
index b6ad80a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main(List<String> arguments) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.expect
deleted file mode 100644
index 78f359e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main(core::List<core::String*>* arguments) → dynamic {
-  for (core::String* arguments in arguments) {
-    core::print(arguments);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.outline.expect
deleted file mode 100644
index d20fd29e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main(core::List<core::String*>* arguments) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.transformed.expect
deleted file mode 100644
index ae6b6e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_scope.dart.weak.transformed.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main(core::List<core::String*>* arguments) → dynamic {
-  {
-    core::Iterator<core::String*>* :sync-for-iterator = arguments.{core::Iterable::iterator};
-    for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-      core::String* arguments = :sync-for-iterator.{core::Iterator::current};
-      {
-        core::print(arguments);
-      }
-    }
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart
deleted file mode 100644
index e19ea66..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-bool topLevelField;
-var untypedTopLevelField;
-
-class Super {
-  int superInstanceField;
-  var untypedSuperInstanceField;
-}
-
-class C extends Super {
-  int instanceField;
-  var untypedInstanceField;
-
-  static double staticField;
-
-  static var untypedStaticField;
-
-  m() {
-    String local;
-    var untypedLocal;
-    for (local in []) {}
-    for (untypedLocal in []) {}
-    for (instanceField in []) {}
-    for (untypedInstanceField in []) {}
-    for (staticField in []) {}
-    for (untypedStaticField in []) {}
-    for (topLevelField in []) {}
-    for (untypedTopLevelField in []) {}
-    for (super.superInstanceField in []) {}
-    for (super.untypedSuperInstanceField in []) {}
-    C c = new C();
-    for (c.instanceField in []) {}
-    for (c.untypedSuperInstanceField in []) {}
-    for (unresolved in []) {}
-    for (unresolved.foo in []) {}
-    for (c.unresolved in []) {}
-    for (main() in []) {}
-    for (var x, y in <int>[]) {
-      print(x);
-      print(y);
-    }
-    const int constant = 0;
-    for (constant in []) {}
-  }
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.textual_outline.expect
deleted file mode 100644
index 9808898..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.textual_outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-bool topLevelField;
-var untypedTopLevelField;
-
-class Super {
-  int superInstanceField;
-  var untypedSuperInstanceField;
-}
-
-class C extends Super {
-  int instanceField;
-  var untypedInstanceField;
-  static double staticField;
-  static var untypedStaticField;
-  m() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5b2d0b2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-bool topLevelField;
-
-class C extends Super {
-  int instanceField;
-  m() {}
-  static double staticField;
-  static var untypedStaticField;
-  var untypedInstanceField;
-}
-
-class Super {
-  int superInstanceField;
-  var untypedSuperInstanceField;
-}
-
-main() {}
-var untypedTopLevelField;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.expect
deleted file mode 100644
index 158f177..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.expect
+++ /dev/null
@@ -1,192 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:34:10: Error: Expected an identifier, but got 'super'.
-// Try inserting an identifier before 'super'.
-//     for (super.superInstanceField in []) {}
-//          ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:35:10: Error: Expected an identifier, but got 'super'.
-// Try inserting an identifier before 'super'.
-//     for (super.untypedSuperInstanceField in []) {}
-//          ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:37:11: Error: Unexpected token '.'.
-//     for (c.instanceField in []) {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:38:11: Error: Unexpected token '.'.
-//     for (c.untypedSuperInstanceField in []) {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:40:20: Error: Unexpected token '.'.
-//     for (unresolved.foo in []) {}
-//                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:41:11: Error: Unexpected token '.'.
-//     for (c.unresolved in []) {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:14: Error: Unexpected token '('.
-//     for (main() in []) {}
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:10: Error: Can't assign to this, so it can't be used in a for-in loop.
-//     for (main() in []) {}
-//          ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:15: Error: Unexpected token ','.
-//     for (var x, y in <int>[]) {
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:10: Error: A for-in loop can't have more than one loop variable.
-//     for (var x, y in <int>[]) {
-//          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:48:10: Error: Can't assign to the const variable 'constant'.
-//     for (constant in []) {}
-//          ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:39:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-//     for (unresolved in []) {}
-//          ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:40:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
-//     for (unresolved.foo in []) {}
-//          ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:41:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-//     for (c.unresolved in []) {}
-//            ^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Super extends core::Object {
-  field core::int* superInstanceField = null;
-  field dynamic untypedSuperInstanceField = null;
-  synthetic constructor •() → self::Super*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::Super {
-  field core::int* instanceField = null;
-  field dynamic untypedInstanceField = null;
-  static field core::double* staticField = null;
-  static field dynamic untypedStaticField = null;
-  synthetic constructor •() → self::C*
-    : super self::Super::•()
-    ;
-  method m() → dynamic {
-    core::String* local;
-    dynamic untypedLocal;
-    for (final core::String* #t1 in <core::String*>[]) {
-      local = #t1;
-    }
-    for (final dynamic #t2 in <dynamic>[]) {
-      untypedLocal = #t2;
-    }
-    for (final core::int* #t3 in <core::int*>[]) {
-      this.{self::C::instanceField} = #t3;
-    }
-    for (final dynamic #t4 in <dynamic>[]) {
-      this.{self::C::untypedInstanceField} = #t4;
-    }
-    for (final core::double* #t5 in <core::double*>[]) {
-      self::C::staticField = #t5;
-    }
-    for (final dynamic #t6 in <dynamic>[]) {
-      self::C::untypedStaticField = #t6;
-    }
-    for (final core::bool* #t7 in <core::bool*>[]) {
-      self::topLevelField = #t7;
-    }
-    for (final dynamic #t8 in <dynamic>[]) {
-      self::untypedTopLevelField = #t8;
-    }
-    for (final core::int* #t9 in <core::int*>[]) {
-      super.{self::Super::superInstanceField} = #t9;
-    }
-    for (final dynamic #t10 in <dynamic>[]) {
-      super.{self::Super::untypedSuperInstanceField} = #t10;
-    }
-    self::C* c = new self::C::•();
-    for (final core::int* #t11 in <core::int*>[]) {
-      c.{self::C::instanceField} = #t11;
-    }
-    for (final dynamic #t12 in <dynamic>[]) {
-      c.{self::Super::untypedSuperInstanceField} = #t12;
-    }
-    for (final dynamic #t13 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:39:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-    for (unresolved in []) {}
-         ^^^^^^^^^^";
-    }
-    for (final dynamic #t14 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:40:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
-    for (unresolved.foo in []) {}
-         ^^^^^^^^^^".foo = #t14;
-    }
-    for (final dynamic #t15 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:41:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-    for (c.unresolved in []) {}
-           ^^^^^^^^^^";
-    }
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:10: Error: Can't assign to this, so it can't be used in a for-in loop.
-    for (main() in []) {}
-         ^^^^";
-      for (final dynamic #t16 in <dynamic>[]) {
-        invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:10: Error: Can't assign to this, so it can't be used in a for-in loop.
-    for (main() in []) {}
-         ^^^^";
-        self::main();
-      }
-    }
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:10: Error: A for-in loop can't have more than one loop variable.
-    for (var x, y in <int>[]) {
-         ^^^";
-      for (final core::int* #t17 in <core::int*>[]) {
-        invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:10: Error: A for-in loop can't have more than one loop variable.
-    for (var x, y in <int>[]) {
-         ^^^";
-        dynamic x;
-        dynamic y;
-        core::print(x);
-        core::print(y);
-      }
-    }
-    for (final dynamic #t18 in <dynamic>[]) {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:48:10: Error: Can't assign to the const variable 'constant'.
-    for (constant in []) {}
-         ^^^^^^^^";
-    }
-  }
-}
-static field core::bool* topLevelField;
-static field dynamic untypedTopLevelField;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.outline.expect
deleted file mode 100644
index 549cac9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.outline.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Super extends core::Object {
-  field core::int* superInstanceField;
-  field dynamic untypedSuperInstanceField;
-  synthetic constructor •() → self::Super*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::Super {
-  field core::int* instanceField;
-  field dynamic untypedInstanceField;
-  static field core::double* staticField;
-  static field dynamic untypedStaticField;
-  synthetic constructor •() → self::C*
-    ;
-  method m() → dynamic
-    ;
-}
-static field core::bool* topLevelField;
-static field dynamic untypedTopLevelField;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.transformed.expect
deleted file mode 100644
index 2f1d77e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart.weak.transformed.expect
+++ /dev/null
@@ -1,300 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:34:10: Error: Expected an identifier, but got 'super'.
-// Try inserting an identifier before 'super'.
-//     for (super.superInstanceField in []) {}
-//          ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:35:10: Error: Expected an identifier, but got 'super'.
-// Try inserting an identifier before 'super'.
-//     for (super.untypedSuperInstanceField in []) {}
-//          ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:37:11: Error: Unexpected token '.'.
-//     for (c.instanceField in []) {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:38:11: Error: Unexpected token '.'.
-//     for (c.untypedSuperInstanceField in []) {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:40:20: Error: Unexpected token '.'.
-//     for (unresolved.foo in []) {}
-//                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:41:11: Error: Unexpected token '.'.
-//     for (c.unresolved in []) {}
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:14: Error: Unexpected token '('.
-//     for (main() in []) {}
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:10: Error: Can't assign to this, so it can't be used in a for-in loop.
-//     for (main() in []) {}
-//          ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:15: Error: Unexpected token ','.
-//     for (var x, y in <int>[]) {
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:10: Error: A for-in loop can't have more than one loop variable.
-//     for (var x, y in <int>[]) {
-//          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:48:10: Error: Can't assign to the const variable 'constant'.
-//     for (constant in []) {}
-//          ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:39:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-//     for (unresolved in []) {}
-//          ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:40:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
-//     for (unresolved.foo in []) {}
-//          ^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:41:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-//     for (c.unresolved in []) {}
-//            ^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Super extends core::Object {
-  field core::int* superInstanceField = null;
-  field dynamic untypedSuperInstanceField = null;
-  synthetic constructor •() → self::Super*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::Super {
-  field core::int* instanceField = null;
-  field dynamic untypedInstanceField = null;
-  static field core::double* staticField = null;
-  static field dynamic untypedStaticField = null;
-  synthetic constructor •() → self::C*
-    : super self::Super::•()
-    ;
-  method m() → dynamic {
-    core::String* local;
-    dynamic untypedLocal;
-    {
-      core::Iterator<core::String*>* :sync-for-iterator = core::_GrowableList::•<core::String*>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::String* #t1 = :sync-for-iterator.{core::Iterator::current};
-        {
-          local = #t1;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t2 = :sync-for-iterator.{core::Iterator::current};
-        {
-          untypedLocal = #t2;
-        }
-      }
-    }
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::•<core::int*>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::int* #t3 = :sync-for-iterator.{core::Iterator::current};
-        {
-          this.{self::C::instanceField} = #t3;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t4 = :sync-for-iterator.{core::Iterator::current};
-        {
-          this.{self::C::untypedInstanceField} = #t4;
-        }
-      }
-    }
-    {
-      core::Iterator<core::double*>* :sync-for-iterator = core::_GrowableList::•<core::double*>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::double* #t5 = :sync-for-iterator.{core::Iterator::current};
-        {
-          self::C::staticField = #t5;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t6 = :sync-for-iterator.{core::Iterator::current};
-        {
-          self::C::untypedStaticField = #t6;
-        }
-      }
-    }
-    {
-      core::Iterator<core::bool*>* :sync-for-iterator = core::_GrowableList::•<core::bool*>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::bool* #t7 = :sync-for-iterator.{core::Iterator::current};
-        {
-          self::topLevelField = #t7;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t8 = :sync-for-iterator.{core::Iterator::current};
-        {
-          self::untypedTopLevelField = #t8;
-        }
-      }
-    }
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::•<core::int*>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::int* #t9 = :sync-for-iterator.{core::Iterator::current};
-        {
-          super.{self::Super::superInstanceField} = #t9;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t10 = :sync-for-iterator.{core::Iterator::current};
-        {
-          super.{self::Super::untypedSuperInstanceField} = #t10;
-        }
-      }
-    }
-    self::C* c = new self::C::•();
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::•<core::int*>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::int* #t11 = :sync-for-iterator.{core::Iterator::current};
-        {
-          c.{self::C::instanceField} = #t11;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t12 = :sync-for-iterator.{core::Iterator::current};
-        {
-          c.{self::Super::untypedSuperInstanceField} = #t12;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t13 = :sync-for-iterator.{core::Iterator::current};
-        {
-          invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:39:10: Error: The setter 'unresolved' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-    for (unresolved in []) {}
-         ^^^^^^^^^^";
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t14 = :sync-for-iterator.{core::Iterator::current};
-        {
-          invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:40:10: Error: The getter 'unresolved' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'unresolved'.
-    for (unresolved.foo in []) {}
-         ^^^^^^^^^^".foo = #t14;
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t15 = :sync-for-iterator.{core::Iterator::current};
-        {
-          invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:41:12: Error: The setter 'unresolved' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'unresolved'.
-    for (c.unresolved in []) {}
-           ^^^^^^^^^^";
-        }
-      }
-    }
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:10: Error: Can't assign to this, so it can't be used in a for-in loop.
-    for (main() in []) {}
-         ^^^^";
-      {
-        core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final dynamic #t16 = :sync-for-iterator.{core::Iterator::current};
-          {
-            invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:42:10: Error: Can't assign to this, so it can't be used in a for-in loop.
-    for (main() in []) {}
-         ^^^^";
-            self::main();
-          }
-        }
-      }
-    }
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:10: Error: A for-in loop can't have more than one loop variable.
-    for (var x, y in <int>[]) {
-         ^^^";
-      {
-        core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::•<core::int*>(0).{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          final core::int* #t17 = :sync-for-iterator.{core::Iterator::current};
-          {
-            invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:43:10: Error: A for-in loop can't have more than one loop variable.
-    for (var x, y in <int>[]) {
-         ^^^";
-            dynamic x;
-            dynamic y;
-            core::print(x);
-            core::print(y);
-          }
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t18 = :sync-for-iterator.{core::Iterator::current};
-        {
-          invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/for_in_without_declaration.dart:48:10: Error: Can't assign to the const variable 'constant'.
-    for (constant in []) {}
-         ^^^^^^^^";
-        }
-      }
-    }
-  }
-}
-static field core::bool* topLevelField;
-static field dynamic untypedTopLevelField;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart b/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart
deleted file mode 100644
index 823544c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// 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.6
-
-//------------------------------------------------------------------------------
-
-class A {
-  dynamic operator +(covariant int a) => null;
-}
-
-class B {
-  dynamic operator +(dynamic b) => null;
-}
-
-abstract class C implements A, B {}
-
-//------------------------------------------------------------------------------
-
-class D {
-  dynamic operator +(dynamic d) => null;
-}
-
-class E extends D {
-  dynamic operator +(covariant int e);
-}
-
-//------------------------------------------------------------------------------
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.textual_outline.expect
deleted file mode 100644
index 797b2be..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.textual_outline.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-// @dart = 2.6
-class A {
-  dynamic operator +(covariant int a) => null;
-}
-
-class B {
-  dynamic operator +(dynamic b) => null;
-}
-
-abstract class C implements A, B {}
-
-class D {
-  dynamic operator +(dynamic d) => null;
-}
-
-class E extends D {
-  dynamic operator +(covariant int e);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6d028dc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-// @dart = 2.6
-abstract class C implements A, B {}
-
-class A {
-  dynamic operator +(covariant int a) => null;
-}
-
-class B {
-  dynamic operator +(dynamic b) => null;
-}
-
-class D {
-  dynamic operator +(dynamic d) => null;
-}
-
-class E extends D {
-  dynamic operator +(covariant int e);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.expect
deleted file mode 100644
index 48d2f30..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.expect
+++ /dev/null
@@ -1,79 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator +(covariant core::int* a) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  operator +(dynamic b) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C extends core::Object implements self::A, self::B {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub operator +(covariant dynamic b) → dynamic;
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    : super core::Object::•()
-    ;
-  operator +(dynamic d) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-  forwarding-stub forwarding-semi-stub operator +(covariant core::int* e) → dynamic
-    return super.{self::D::+}(e);
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.outline.expect
deleted file mode 100644
index 1e2bb90..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.outline.expect
+++ /dev/null
@@ -1,75 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  operator +(covariant core::int* a) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  operator +(dynamic b) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C extends core::Object implements self::A, self::B {
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub operator +(covariant dynamic b) → dynamic;
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    ;
-  operator +(dynamic d) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    ;
-  forwarding-stub forwarding-semi-stub operator +(covariant core::int* e) → dynamic
-    return super.{self::D::+}(e);
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.transformed.expect
deleted file mode 100644
index 48d2f30..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/forwarding_stub_for_operator.dart.weak.transformed.expect
+++ /dev/null
@@ -1,79 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator +(covariant core::int* a) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  operator +(dynamic b) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C extends core::Object implements self::A, self::B {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub operator +(covariant dynamic b) → dynamic;
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    : super core::Object::•()
-    ;
-  operator +(dynamic d) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-  forwarding-stub forwarding-semi-stub operator +(covariant core::int* e) → dynamic
-    return super.{self::D::+}(e);
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart b/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart
deleted file mode 100644
index 7dc5bfb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-var x = () {
-  var y = 42;
-  return y;
-};
-
-main() {
-  print(x());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.textual_outline.expect
deleted file mode 100644
index cf6cafe..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-var x = () {
-  var y = 42;
-  return y;
-};
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.textual_outline_modelled.expect
deleted file mode 100644
index 186e9b4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-main() {}
-var x = () {
-  var y = 42;
-  return y;
-};
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.expect
deleted file mode 100644
index ca264d4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static field () →* core::int* x = () → core::int* {
-  core::int* y = 42;
-  return y;
-};
-static method main() → dynamic {
-  core::print(self::x.call());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.outline.expect
deleted file mode 100644
index 9f1148b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static field () →* core::int* x;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.transformed.expect
deleted file mode 100644
index ca264d4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_in_field.dart.weak.transformed.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static field () →* core::int* x = () → core::int* {
-  core::int* y = 42;
-  return y;
-};
-static method main() → dynamic {
-  core::print(self::x.call());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart
deleted file mode 100644
index 1c7087c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-T identity<T>(T t) => t;
-T identityObject<T extends Object>(T t) => t;
-T identityList<T extends List<T>>(T t) => t;
-
-// Test that error messages involving generic function types
-// print the type variable bounds correctly.
-String x = identity; // No bound
-String y = identityObject; // Object bound
-String z = identityList; // List<T> bound
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.textual_outline.expect
deleted file mode 100644
index 008e4b9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-T identity<T>(T t) => t;
-T identityObject<T extends Object>(T t) => t;
-T identityList<T extends List<T>>(T t) => t;
-String x = identity;
-String y = identityObject;
-String z = identityList;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.textual_outline_modelled.expect
deleted file mode 100644
index b27eac3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-String x = identity;
-String y = identityObject;
-String z = identityList;
-T identity<T>(T t) => t;
-T identityList<T extends List<T>>(T t) => t;
-T identityObject<T extends Object>(T t) => t;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.expect
deleted file mode 100644
index 9ebb5f2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:13:12: Error: A value of type 'T Function<T>(T)' can't be assigned to a variable of type 'String'.
-// String x = identity; // No bound
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:14:12: Error: A value of type 'T Function<T extends Object>(T)' can't be assigned to a variable of type 'String'.
-//  - 'Object' is from 'dart:core'.
-// String y = identityObject; // Object bound
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:15:12: Error: A value of type 'T Function<T extends List<T>>(T)' can't be assigned to a variable of type 'String'.
-//  - 'List' is from 'dart:core'.
-// String z = identityList; // List<T> bound
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-static field core::String* x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:13:12: Error: A value of type 'T Function<T>(T)' can't be assigned to a variable of type 'String'.
-String x = identity; // No bound
-           ^" in (#C1) as{TypeError} core::String*;
-static field core::String* y = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:14:12: Error: A value of type 'T Function<T extends Object>(T)' can't be assigned to a variable of type 'String'.
- - 'Object' is from 'dart:core'.
-String y = identityObject; // Object bound
-           ^" in (#C2) as{TypeError} core::String*;
-static field core::String* z = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:15:12: Error: A value of type 'T Function<T extends List<T>>(T)' can't be assigned to a variable of type 'String'.
- - 'List' is from 'dart:core'.
-String z = identityList; // List<T> bound
-           ^" in (#C3) as{TypeError} core::String*;
-static method identity<T extends core::Object* = dynamic>(self::identity::T* t) → self::identity::T*
-  return t;
-static method identityObject<T extends core::Object* = core::Object*>(self::identityObject::T* t) → self::identityObject::T*
-  return t;
-static method identityList<T extends core::List<self::identityList::T*>* = core::List<dynamic>*>(self::identityList::T* t) → self::identityList::T*
-  return t;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::identity
-  #C2 = tearoff self::identityObject
-  #C3 = tearoff self::identityList
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.outline.expect
deleted file mode 100644
index 1e430dd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static field core::String* x;
-static field core::String* y;
-static field core::String* z;
-static method identity<T extends core::Object* = dynamic>(self::identity::T* t) → self::identity::T*
-  ;
-static method identityObject<T extends core::Object* = core::Object*>(self::identityObject::T* t) → self::identityObject::T*
-  ;
-static method identityList<T extends core::List<self::identityList::T*>* = core::List<dynamic>*>(self::identityList::T* t) → self::identityList::T*
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.transformed.expect
deleted file mode 100644
index 9ebb5f2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:13:12: Error: A value of type 'T Function<T>(T)' can't be assigned to a variable of type 'String'.
-// String x = identity; // No bound
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:14:12: Error: A value of type 'T Function<T extends Object>(T)' can't be assigned to a variable of type 'String'.
-//  - 'Object' is from 'dart:core'.
-// String y = identityObject; // Object bound
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:15:12: Error: A value of type 'T Function<T extends List<T>>(T)' can't be assigned to a variable of type 'String'.
-//  - 'List' is from 'dart:core'.
-// String z = identityList; // List<T> bound
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-static field core::String* x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:13:12: Error: A value of type 'T Function<T>(T)' can't be assigned to a variable of type 'String'.
-String x = identity; // No bound
-           ^" in (#C1) as{TypeError} core::String*;
-static field core::String* y = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:14:12: Error: A value of type 'T Function<T extends Object>(T)' can't be assigned to a variable of type 'String'.
- - 'Object' is from 'dart:core'.
-String y = identityObject; // Object bound
-           ^" in (#C2) as{TypeError} core::String*;
-static field core::String* z = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/function_type_assignments.dart:15:12: Error: A value of type 'T Function<T extends List<T>>(T)' can't be assigned to a variable of type 'String'.
- - 'List' is from 'dart:core'.
-String z = identityList; // List<T> bound
-           ^" in (#C3) as{TypeError} core::String*;
-static method identity<T extends core::Object* = dynamic>(self::identity::T* t) → self::identity::T*
-  return t;
-static method identityObject<T extends core::Object* = core::Object*>(self::identityObject::T* t) → self::identityObject::T*
-  return t;
-static method identityList<T extends core::List<self::identityList::T*>* = core::List<dynamic>*>(self::identityList::T* t) → self::identityList::T*
-  return t;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::identity
-  #C2 = tearoff self::identityObject
-  #C3 = tearoff self::identityList
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart
deleted file mode 100644
index 2fac684..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-void Function({obj: Object}) x;
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.textual_outline.expect
deleted file mode 100644
index adb8a0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-void Function({obj: Object}) x;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.expect
deleted file mode 100644
index 67a7869..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:19: Error: Expected an identifier, but got ':'.
-// Try inserting an identifier before ':'.
-// void Function({obj: Object}) x;
-//                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:19: Error: Can't have a default value in a function type.
-// void Function({obj: Object}) x;
-//                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:16: Error: Type 'obj' not found.
-// void Function({obj: Object}) x;
-//                ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:16: Error: 'obj' isn't a type.
-// void Function({obj: Object}) x;
-//                ^^^
-//
-import self as self;
-
-static field () →* void x;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.outline.expect
deleted file mode 100644
index 2b1a8ff..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:19: Error: Expected an identifier, but got ':'.
-// Try inserting an identifier before ':'.
-// void Function({obj: Object}) x;
-//                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:19: Error: Can't have a default value in a function type.
-// void Function({obj: Object}) x;
-//                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:16: Error: Type 'obj' not found.
-// void Function({obj: Object}) x;
-//                ^^^
-//
-import self as self;
-
-static field () →* void x;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.transformed.expect
deleted file mode 100644
index 67a7869..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart.weak.transformed.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:19: Error: Expected an identifier, but got ':'.
-// Try inserting an identifier before ':'.
-// void Function({obj: Object}) x;
-//                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:19: Error: Can't have a default value in a function type.
-// void Function({obj: Object}) x;
-//                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:16: Error: Type 'obj' not found.
-// void Function({obj: Object}) x;
-//                ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_default_value.dart:7:16: Error: 'obj' isn't a type.
-// void Function({obj: Object}) x;
-//                ^^^
-//
-import self as self;
-
-static field () →* void x;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart
deleted file mode 100644
index 15f82c9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-import "package:expect/expect.dart" show Expect;
-
-test(f) {
-  if (f is void Function(Object, StackTrace)) return 1;
-  if (f is void Function(Object)) return 10;
-  if (f is void Function()) return 100;
-}
-
-main() {
-  Expect.equals(
-      111,
-      test(() => null) +
-          test((Object o) => null) +
-          test((Object o, StackTrace t) => null));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.textual_outline.expect
deleted file mode 100644
index eade016..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart" show Expect;
-
-test(f) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.textual_outline_modelled.expect
deleted file mode 100644
index 207b09a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart" show Expect;
-
-main() {}
-test(f) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.expect
deleted file mode 100644
index 3e17d2c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart" show Expect;
-
-static method test(dynamic f) → dynamic {
-  if(f is (core::Object*, core::StackTrace*) →* void)
-    return 1;
-  if(f is (core::Object*) →* void)
-    return 10;
-  if(f is () →* void)
-    return 100;
-}
-static method main() → dynamic {
-  exp::Expect::equals(111, self::test(() → Null => null).+(self::test((core::Object* o) → Null => null)).+(self::test((core::Object* o, core::StackTrace* t) → Null => null)));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.outline.expect
deleted file mode 100644
index f49d6de..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-
-import "package:expect/expect.dart" show Expect;
-
-static method test(dynamic f) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.transformed.expect
deleted file mode 100644
index 3e17d2c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_is_check.dart.weak.transformed.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart" show Expect;
-
-static method test(dynamic f) → dynamic {
-  if(f is (core::Object*, core::StackTrace*) →* void)
-    return 1;
-  if(f is (core::Object*) →* void)
-    return 10;
-  if(f is () →* void)
-    return 100;
-}
-static method main() → dynamic {
-  exp::Expect::equals(111, self::test(() → Null => null).+(self::test((core::Object* o) → Null => null)).+(self::test((core::Object* o, core::StackTrace* t) → Null => null)));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart
deleted file mode 100644
index 17939d6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-// Tests that an inline function type inside a `Function` type isn't a
-// parser error.
-
-typedef F = int Function(int f(String x));
-
-main() {
-  F f = null;
-  String Function(String g(int y)) g = null;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.textual_outline.expect
deleted file mode 100644
index 569b9be..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-typedef F = int Function(int f(String x));
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.textual_outline_modelled.expect
deleted file mode 100644
index 95953c9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-typedef F = int Function(int f(String x));
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.expect
deleted file mode 100644
index 9726fd1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart:10:31: Error: Inline function types cannot be used for parameters in a generic function type.
-// Try changing the inline function type (as in 'int f()') to a prefixed function type using the `Function` keyword (as in 'int Function() f').
-// typedef F = int Function(int f(String x));
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart:14:27: Error: Inline function types cannot be used for parameters in a generic function type.
-// Try changing the inline function type (as in 'int f()') to a prefixed function type using the `Function` keyword (as in 'int Function() f').
-//   String Function(String g(int y)) g = null;
-//                           ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F = ((core::String*) →* core::int*) →* core::int*;
-static method main() → dynamic {
-  ((core::String*) →* core::int*) →* core::int* f = null;
-  ((core::int*) →* core::String*) →* core::String* g = null;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.outline.expect
deleted file mode 100644
index 2da7635..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart:10:31: Error: Inline function types cannot be used for parameters in a generic function type.
-// Try changing the inline function type (as in 'int f()') to a prefixed function type using the `Function` keyword (as in 'int Function() f').
-// typedef F = int Function(int f(String x));
-//                               ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F = ((core::String*) →* core::int*) →* core::int*;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.transformed.expect
deleted file mode 100644
index 9726fd1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart.weak.transformed.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart:10:31: Error: Inline function types cannot be used for parameters in a generic function type.
-// Try changing the inline function type (as in 'int f()') to a prefixed function type using the `Function` keyword (as in 'int Function() f').
-// typedef F = int Function(int f(String x));
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/function_type_recovery.dart:14:27: Error: Inline function types cannot be used for parameters in a generic function type.
-// Try changing the inline function type (as in 'int f()') to a prefixed function type using the `Function` keyword (as in 'int Function() f').
-//   String Function(String g(int y)) g = null;
-//                           ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F = ((core::String*) →* core::int*) →* core::int*;
-static method main() → dynamic {
-  ((core::String*) →* core::int*) →* core::int* f = null;
-  ((core::int*) →* core::String*) →* core::String* g = null;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart b/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart
deleted file mode 100644
index b36e1e9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() {
-  void local(void f({a})) {
-    f(a: "Hello, World");
-    f();
-  }
-
-  local(({a: "Default greeting!"}) {
-    print(a);
-  });
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.expect
deleted file mode 100644
index c10936d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  function local(({a: dynamic}) →* void f) → void {
-    f.call(a: "Hello, World");
-    f.call();
-  }
-  local.call(({dynamic a = #C1}) → Null {
-    core::print(a);
-  });
-}
-
-constants  {
-  #C1 = "Default greeting!"
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.transformed.expect
deleted file mode 100644
index c10936d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/functions.dart.weak.transformed.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  function local(({a: dynamic}) →* void f) → void {
-    f.call(a: "Hello, World");
-    f.call();
-  }
-  local.call(({dynamic a = #C1}) → Null {
-    core::print(a);
-  });
-}
-
-constants  {
-  #C1 = "Default greeting!"
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart
deleted file mode 100644
index ce42d56..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// The test checks that an expression with static type Future<dynamic> is
-// accepted as a return expression of a method with an async body and the
-// declared return type Future<int>.
-
-import 'dart:async';
-
-class A {
-  dynamic foo() => null;
-}
-
-class B {
-  A a;
-
-  Future<dynamic> bar() async => a.foo();
-}
-
-class C {
-  B b = B();
-
-  Future<int> baz() async => b.bar();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.textual_outline.expect
deleted file mode 100644
index 7123fde..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-class A {
-  dynamic foo() => null;
-}
-
-class B {
-  A a;
-  Future<dynamic> bar() async => a.foo();
-}
-
-class C {
-  B b = B();
-  Future<int> baz() async => b.bar();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7123fde..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-import 'dart:async';
-
-class A {
-  dynamic foo() => null;
-}
-
-class B {
-  A a;
-  Future<dynamic> bar() async => a.foo();
-}
-
-class C {
-  B b = B();
-  Future<int> baz() async => b.bar();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.expect
deleted file mode 100644
index 2a464ed..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.expect
+++ /dev/null
@@ -1,61 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  field self::A* a = null;
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  method bar() → asy::Future<dynamic>* async 
-    return this.{self::B::a}.{self::A::foo}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field self::B* b = new self::B::•();
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method baz() → asy::Future<core::int*>* async 
-    return this.{self::C::b}.{self::B::bar}() as{TypeError} FutureOr<core::int*>*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.outline.expect
deleted file mode 100644
index 3869a0e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  method foo() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  field self::A* a;
-  synthetic constructor •() → self::B*
-    ;
-  method bar() → asy::Future<dynamic>* async 
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field self::B* b;
-  synthetic constructor •() → self::C*
-    ;
-  method baz() → asy::Future<core::int*>* async 
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.transformed.expect
deleted file mode 100644
index f62a5eb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/future_or_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,111 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-import "dart:async";
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  field self::A* a = null;
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  method bar() → asy::Future<dynamic>* /* originally async */ {
-    final asy::_Future<dynamic>* :async_future = new asy::_Future::•<dynamic>();
-    core::bool* :is_sync = false;
-    FutureOr<dynamic>* :return_value;
-    (dynamic) →* dynamic :async_op_then;
-    (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-    core::int* :await_jump_var = 0;
-    dynamic :await_ctx_var;
-    function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-      try {
-        #L1:
-        {
-          :return_value = this.{self::B::a}.{self::A::foo}();
-          break #L1;
-        }
-        asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-      }
-    :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-    :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-    :async_op.call();
-    :is_sync = true;
-    return :async_future;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field self::B* b = new self::B::•();
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method baz() → asy::Future<core::int*>* /* originally async */ {
-    final asy::_Future<core::int*>* :async_future = new asy::_Future::•<core::int*>();
-    core::bool* :is_sync = false;
-    FutureOr<core::int*>* :return_value;
-    (dynamic) →* dynamic :async_op_then;
-    (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-    core::int* :await_jump_var = 0;
-    dynamic :await_ctx_var;
-    function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-      try {
-        #L2:
-        {
-          :return_value = this.{self::C::b}.{self::B::bar}() as{TypeError} FutureOr<core::int*>*;
-          break #L2;
-        }
-        asy::_completeOnAsyncReturn(:async_future, :return_value, :is_sync);
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        asy::_completeOnAsyncError(:async_future, exception, stack_trace, :is_sync);
-      }
-    :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-    :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-    :async_op.call();
-    :is_sync = true;
-    return :async_future;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart b/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart
deleted file mode 100644
index 18724a7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.6
-
-num add<A extends num, B extends num>(A a, B b) => a + b;
-
-test() {
-  int x = add;
-}
-
-main() {
-  if (add(1,2) < 3) test();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.textual_outline.expect
deleted file mode 100644
index c120177..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-num add<A extends num, B extends num>(A a, B b) => a + b;
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.textual_outline_modelled.expect
deleted file mode 100644
index a09c841..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-main() {}
-num add<A extends num, B extends num>(A a, B b) => a + b;
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.expect
deleted file mode 100644
index 74f8d85..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart:10:11: Error: A value of type 'num Function<A extends num, B extends num>(A, B)' can't be assigned to a variable of type 'int'.
-//   int x = add;
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method add<A extends core::num* = core::num*, B extends core::num* = core::num*>(self::add::A* a, self::add::B* b) → core::num*
-  return a.{core::num::+}(b);
-static method test() → dynamic {
-  core::int* x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart:10:11: Error: A value of type 'num Function<A extends num, B extends num>(A, B)' can't be assigned to a variable of type 'int'.
-  int x = add;
-          ^" in (#C1) as{TypeError} core::int*;
-}
-static method main() → dynamic {
-  if(self::add<core::int*, core::int*>(1, 2).{core::num::<}(3))
-    self::test();
-}
-
-constants  {
-  #C1 = tearoff self::add
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.outline.expect
deleted file mode 100644
index c236efd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method add<A extends core::num* = core::num*, B extends core::num* = core::num*>(self::add::A* a, self::add::B* b) → core::num*
-  ;
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.transformed.expect
deleted file mode 100644
index 74f8d85..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart.weak.transformed.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart:10:11: Error: A value of type 'num Function<A extends num, B extends num>(A, B)' can't be assigned to a variable of type 'int'.
-//   int x = add;
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method add<A extends core::num* = core::num*, B extends core::num* = core::num*>(self::add::A* a, self::add::B* b) → core::num*
-  return a.{core::num::+}(b);
-static method test() → dynamic {
-  core::int* x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/generic_function_type_in_message.dart:10:11: Error: A value of type 'num Function<A extends num, B extends num>(A, B)' can't be assigned to a variable of type 'int'.
-  int x = add;
-          ^" in (#C1) as{TypeError} core::int*;
-}
-static method main() → dynamic {
-  if(self::add<core::int*, core::int*>(1, 2).{core::num::<}(3))
-    self::test();
-}
-
-constants  {
-  #C1 = tearoff self::add
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart
deleted file mode 100644
index cda844c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-@Foo
-part 'having_part_with_part_and_annotation_lib1.dart';
-
-const int Foo = 42;
-
-void fromMain() {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.textual_outline.expect
deleted file mode 100644
index 2e43bfb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-@Foo
-part 'having_part_with_part_and_annotation_lib1.dart';
-
-const int Foo = 42;
-void fromMain() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.textual_outline_modelled.expect
deleted file mode 100644
index c66d6f8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-@Foo
-part 'having_part_with_part_and_annotation_lib1.dart';
-
-const int Foo = 42;
-main() {}
-void fromMain() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.expect
deleted file mode 100644
index e61d126..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib1.dart:10:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_part_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart: Context: This is the containing library.
-//
-import self as self;
-import "dart:core" as core;
-
-@#C1
-part having_part_with_part_and_annotation_lib1.dart;
-static const field core::int* Foo = #C1;
-static const field core::int* Bar = #C2 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
-static method fromMain() → void {}
-static method main() → dynamic {}
-static method /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.outline.expect
deleted file mode 100644
index ac9251d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib1.dart:10:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_part_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart: Context: This is the containing library.
-//
-import self as self;
-import "dart:core" as core;
-
-part having_part_with_part_and_annotation_lib1.dart;
-static const field core::int* Foo = 42;
-static const field core::int* Bar = 43 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
-static method fromMain() → void
-  ;
-static method main() → dynamic
-  ;
-static method /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */ fromLib1() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.transformed.expect
deleted file mode 100644
index e61d126..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart.weak.transformed.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib1.dart:10:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_part_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation.dart: Context: This is the containing library.
-//
-import self as self;
-import "dart:core" as core;
-
-@#C1
-part having_part_with_part_and_annotation_lib1.dart;
-static const field core::int* Foo = #C1;
-static const field core::int* Bar = #C2 /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */;
-static method fromMain() → void {}
-static method main() → dynamic {}
-static method /* from org-dartlang-testcase:///having_part_with_part_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib1.dart
deleted file mode 100644
index 14d7c63..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib1.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-part of 'having_part_with_part_and_annotation.dart';
-
-@Bar
-part 'having_part_with_part_and_annotation_lib2.dart';
-
-const int Bar = 43;
-
-void fromLib1() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib2.dart
deleted file mode 100644
index 087998e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_part_and_annotation_lib2.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-part of 'having_part_with_part_and_annotation_lib1.dart';
-
-void fromLib2() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart
deleted file mode 100644
index ddc32c6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-@Foo
-part 'having_part_with_parts_and_annotation_lib1.dart';
-
-const int Foo = 42;
-
-void fromMain() {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.textual_outline.expect
deleted file mode 100644
index 48738fd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-@Foo
-part 'having_part_with_parts_and_annotation_lib1.dart';
-
-const int Foo = 42;
-void fromMain() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.textual_outline_modelled.expect
deleted file mode 100644
index 485fed8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-@Foo
-part 'having_part_with_parts_and_annotation_lib1.dart';
-
-const int Foo = 42;
-main() {}
-void fromMain() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.expect
deleted file mode 100644
index b7032ac..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart:10:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_parts_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart: Context: This is the containing library.
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart:12:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_parts_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart: Context: This is the containing library.
-//
-import self as self;
-import "dart:core" as core;
-
-@#C1
-part having_part_with_parts_and_annotation_lib1.dart;
-static const field core::int* Foo = #C1;
-static const field core::int* Bar = #C2 /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */;
-static const field core::int* Baz = #C3 /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */;
-static method fromMain() → void {}
-static method main() → dynamic {}
-static method /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-  #C3 = 44
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.outline.expect
deleted file mode 100644
index a3c13ef..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.outline.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart:10:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_parts_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart: Context: This is the containing library.
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart:12:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_parts_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart: Context: This is the containing library.
-//
-import self as self;
-import "dart:core" as core;
-
-part having_part_with_parts_and_annotation_lib1.dart;
-static const field core::int* Foo = 42;
-static const field core::int* Bar = 43 /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */;
-static const field core::int* Baz = 44 /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */;
-static method fromMain() → void
-  ;
-static method main() → dynamic
-  ;
-static method /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */ fromLib1() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.transformed.expect
deleted file mode 100644
index b7032ac..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart.weak.transformed.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart:10:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_parts_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart: Context: This is the containing library.
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart:12:6: Error: A file that's a part of a library can't have parts itself.
-// Try moving the 'part' declaration to the containing library.
-// part 'having_part_with_parts_and_annotation_lib2.dart';
-//      ^
-// pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation.dart: Context: This is the containing library.
-//
-import self as self;
-import "dart:core" as core;
-
-@#C1
-part having_part_with_parts_and_annotation_lib1.dart;
-static const field core::int* Foo = #C1;
-static const field core::int* Bar = #C2 /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */;
-static const field core::int* Baz = #C3 /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */;
-static method fromMain() → void {}
-static method main() → dynamic {}
-static method /* from org-dartlang-testcase:///having_part_with_parts_and_annotation_lib1.dart */ fromLib1() → void {}
-
-constants  {
-  #C1 = 42
-  #C2 = 43
-  #C3 = 44
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart
deleted file mode 100644
index 8e9a78d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib1.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.6
-
-part of 'having_part_with_parts_and_annotation.dart';
-
-@Bar
-part 'having_part_with_parts_and_annotation_lib2.dart';
-@Baz
-part 'having_part_with_parts_and_annotation_lib2.dart';
-
-const int Bar = 43;
-const int Baz = 44;
-
-void fromLib1() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib2.dart
deleted file mode 100644
index d104ad2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/having_part_with_parts_and_annotation_lib2.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-part of 'having_part_with_parts_and_annotation_lib1.dart';
-
-void fromLib2() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart b/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart
deleted file mode 100644
index 3ea0736..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() {
-  print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.expect
deleted file mode 100644
index fea7b39..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.transformed.expect
deleted file mode 100644
index fea7b39..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/hello.dart.weak.transformed.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart
deleted file mode 100644
index 8822159..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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.6
-
-class Class {
-  method() {}
-}
-
-main() {
-  Class a;
-  Class b = new Class();
-  a ?? b
-    ..method();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.textual_outline.expect
deleted file mode 100644
index d00fcfd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-class Class {
-  method() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.textual_outline_modelled.expect
deleted file mode 100644
index d00fcfd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-class Class {
-  method() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.expect
deleted file mode 100644
index bb43faf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class extends core::Object {
-  synthetic constructor •() → self::Class*
-    : super core::Object::•()
-    ;
-  method method() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Class* a;
-  self::Class* b = new self::Class::•();
-  let final self::Class* #t1 = let final self::Class* #t2 = a in #t2.{self::Class::==}(null) ?{self::Class*} b : #t2 in block {
-    #t1.{self::Class::method}();
-  } =>#t1;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.outline.expect
deleted file mode 100644
index aec3c89..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class extends core::Object {
-  synthetic constructor •() → self::Class*
-    ;
-  method method() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.transformed.expect
deleted file mode 100644
index bb43faf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_cascade.dart.weak.transformed.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class extends core::Object {
-  synthetic constructor •() → self::Class*
-    : super core::Object::•()
-    ;
-  method method() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Class* a;
-  self::Class* b = new self::Class::•();
-  let final self::Class* #t1 = let final self::Class* #t2 = a in #t2.{self::Class::==}(null) ?{self::Class*} b : #t2 in block {
-    #t1.{self::Class::method}();
-  } =>#t1;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart
deleted file mode 100644
index 18a8af4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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.6
-
-main() {
-  Object a, b;
-  return [a ?? b];
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.expect
deleted file mode 100644
index 0cc41e9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::Object* a;
-  core::Object* b;
-  return <core::Object*>[let final core::Object* #t1 = a in #t1.{core::Object::==}(null) ?{core::Object*} b : #t1];
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.transformed.expect
deleted file mode 100644
index 188b5b3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_list_literal.dart.weak.transformed.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::Object* a;
-  core::Object* b;
-  return core::_GrowableList::_literal1<core::Object*>(let final core::Object* #t1 = a in #t1.{core::Object::==}(null) ?{core::Object*} b : #t1);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart
deleted file mode 100644
index 190622a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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.6
-
-main() {
-  Object a, b;
-  return {a ?? b};
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.expect
deleted file mode 100644
index bbc6109..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method main() → dynamic {
-  core::Object* a;
-  core::Object* b;
-  return block {
-    final core::Set<core::Object*>* #t1 = col::LinkedHashSet::•<core::Object*>();
-    #t1.{core::Set::add}{Invariant}(let final core::Object* #t2 = a in #t2.{core::Object::==}(null) ?{core::Object*} b : #t2);
-  } =>#t1;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.transformed.expect
deleted file mode 100644
index 637e41b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/if_null_in_set_literal.dart.weak.transformed.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method main() → dynamic {
-  core::Object* a;
-  core::Object* b;
-  return block {
-    final core::Set<core::Object*>* #t1 = new col::_CompactLinkedHashSet::•<core::Object*>();
-    #t1.{core::Set::add}{Invariant}(let final core::Object* #t2 = a in #t2.{core::Object::==}(null) ?{core::Object*} b : #t2);
-  } =>#t1;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart b/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart
deleted file mode 100644
index b96181c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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.6
-
-import "dart:core" as core;
-
-class A implements core.Function {
-  // No error here: core.Function is ignored.
-  operator ==(other) => false;
-}
-
-class B implements Function {
-  // Error here Object.== and Function.== disagree on the type of other.
-  operator ==(other) => false;
-}
-
-class Function {
-  core.bool operator ==(core.Object other) => false;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.textual_outline.expect
deleted file mode 100644
index d0ad2e6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-import "dart:core" as core;
-
-class A implements core.Function {
-  operator ==(other) => false;
-}
-
-class B implements Function {
-  operator ==(other) => false;
-}
-
-class Function {
-  core.bool operator ==(core.Object other) => false;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.textual_outline_modelled.expect
deleted file mode 100644
index d0ad2e6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-import "dart:core" as core;
-
-class A implements core.Function {
-  operator ==(other) => false;
-}
-
-class B implements Function {
-  operator ==(other) => false;
-}
-
-class Function {
-  core.bool operator ==(core.Object other) => false;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.expect
deleted file mode 100644
index c25c94e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator ==(dynamic other) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object implements self::Function {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  operator ==(dynamic other) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Function extends core::Object {
-  synthetic constructor •() → self::Function*
-    : super core::Object::•()
-    ;
-  operator ==(core::Object* other) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.outline.expect
deleted file mode 100644
index 0eda64b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.outline.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  operator ==(dynamic other) → core::bool*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object implements self::Function {
-  synthetic constructor •() → self::B*
-    ;
-  operator ==(dynamic other) → core::bool*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Function extends core::Object {
-  synthetic constructor •() → self::Function*
-    ;
-  operator ==(core::Object* other) → core::bool*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.transformed.expect
deleted file mode 100644
index c25c94e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/ignore_function.dart.weak.transformed.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator ==(dynamic other) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object implements self::Function {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  operator ==(dynamic other) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Function extends core::Object {
-  synthetic constructor •() → self::Function*
-    : super core::Object::•()
-    ;
-  operator ==(core::Object* other) → core::bool*
-    return false;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart
deleted file mode 100644
index d51e0d0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-main() {
-  var x = void f<T>(T t) {};
-  print(x.runtimeType);
-  print(void g<T>(T t) {});
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.expect
deleted file mode 100644
index 0681005..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart:8:16: Error: A function expression can't have a name.
-//   var x = void f<T>(T t) {};
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart:10:14: Error: A function expression can't have a name.
-//   print(void g<T>(T t) {});
-//              ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  <T extends core::Object* = dynamic>(T*) →* Null x = let final <T extends core::Object* = dynamic>(T*) →* Null f = <T extends core::Object* = dynamic>(T* t) → Null {} in f;
-  core::print(x.{core::Object::runtimeType});
-  core::print(let final <T extends core::Object* = dynamic>(T*) →* Null g = <T extends core::Object* = dynamic>(T* t) → Null {} in g);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.transformed.expect
deleted file mode 100644
index 0681005..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart.weak.transformed.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart:8:16: Error: A function expression can't have a name.
-//   var x = void f<T>(T t) {};
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression.dart:10:14: Error: A function expression can't have a name.
-//   print(void g<T>(T t) {});
-//              ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  <T extends core::Object* = dynamic>(T*) →* Null x = let final <T extends core::Object* = dynamic>(T*) →* Null f = <T extends core::Object* = dynamic>(T* t) → Null {} in f;
-  core::print(x.{core::Object::runtimeType});
-  core::print(let final <T extends core::Object* = dynamic>(T*) →* Null g = <T extends core::Object* = dynamic>(T* t) → Null {} in g);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart
deleted file mode 100644
index f02ce3a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-main() {
-  void f() {}
-  print(void f() {});
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.expect
deleted file mode 100644
index 215b3e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart:9:14: Error: A function expression can't have a name.
-//   print(void f() {});
-//              ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  function f() → void {}
-  core::print(let final () →* Null f = () → Null {} in f);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.transformed.expect
deleted file mode 100644
index 215b3e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart.weak.transformed.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/illegal_named_function_expression_scope.dart:9:14: Error: A function expression can't have a name.
-//   print(void f() {});
-//              ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  function f() → void {}
-  core::print(let final () →* Null f = () → Null {} in f);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart
deleted file mode 100644
index 77e832e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-const constTopLevelField = 42;
-
-class C {
-  const C(x);
-  static const constField = 87;
-}
-
-main() {
-  C(C.constField);
-  C(constTopLevelField);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.textual_outline.expect
deleted file mode 100644
index c31ef38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-const constTopLevelField = 42;
-
-class C {
-  const C(x);
-  static const constField = 87;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.textual_outline_modelled.expect
deleted file mode 100644
index 8a51783..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class C {
-  const C(x);
-  static const constField = 87;
-}
-
-const constTopLevelField = 42;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.expect
deleted file mode 100644
index 93d939a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object /*hasConstConstructor*/  {
-  static const field core::int* constField = #C1;
-  const constructor •(dynamic x) → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* constTopLevelField = #C2;
-static method main() → dynamic {
-  new self::C::•(#C1);
-  new self::C::•(#C2);
-}
-
-constants  {
-  #C1 = 87
-  #C2 = 42
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.outline.expect
deleted file mode 100644
index d89b87a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.outline.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object /*hasConstConstructor*/  {
-  static const field core::int* constField = 87;
-  const constructor •(dynamic x) → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* constTopLevelField = 42;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.transformed.expect
deleted file mode 100644
index 93d939a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_const_with_static_fields.dart.weak.transformed.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object /*hasConstConstructor*/  {
-  static const field core::int* constField = #C1;
-  const constructor •(dynamic x) → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* constTopLevelField = #C2;
-static method main() → dynamic {
-  new self::C::•(#C1);
-  new self::C::•(#C2);
-}
-
-constants  {
-  #C1 = 87
-  #C2 = 42
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart
deleted file mode 100644
index d1974f5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import "implicit_new.dart" as prefix;
-
-class Foo {
-  operator +(other) => null;
-}
-
-class Bar {
-  Bar.named();
-
-  operator +(other) => null;
-}
-
-testNSM() {
-  var y = prefix.Bar();
-  prefix.Bar();
-}
-
-f(x) => x;
-
-class IndexTester {
-  operator [](_) => null;
-  void operator []=(_a, _b) {}
-}
-
-main() {
-  var x = Foo();
-  x = prefix.Foo();
-  var z = Bar.named();
-  z = prefix.Bar.named();
-  f(Foo());
-  f(prefix.Foo());
-  f(Bar.named());
-  f(prefix.Bar.named());
-  var l = [Foo(), Bar.named()];
-  l = [prefix.Foo(), prefix.Bar.named()];
-  var m = {"foo": Foo(), "bar": Bar.named()};
-  m = {"foo": prefix.Foo(), "bar": prefix.Bar.named()};
-  var i = new IndexTester();
-  i[Foo()];
-  i[prefix.Foo()];
-  i[Bar.named()];
-  i[prefix.Bar.named()];
-  i[Foo()] = null;
-  i[prefix.Foo()] = null;
-  i[Bar.named()] = null;
-  i[prefix.Bar.named()] = null;
-  Foo() + Bar.named();
-  prefix.Foo() + prefix.Bar.named();
-  Bar.named() + Foo();
-  prefix.Bar.named() + prefix.Foo();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.textual_outline.expect
deleted file mode 100644
index 7b7c2fb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.textual_outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-import "implicit_new.dart" as prefix;
-
-class Foo {
-  operator +(other) => null;
-}
-
-class Bar {
-  Bar.named();
-  operator +(other) => null;
-}
-
-testNSM() {}
-f(x) => x;
-
-class IndexTester {
-  operator [](_) => null;
-  void operator []=(_a, _b) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.textual_outline_modelled.expect
deleted file mode 100644
index d1ae95e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-// @dart = 2.6
-import "implicit_new.dart" as prefix;
-
-class Bar {
-  Bar.named();
-  operator +(other) => null;
-}
-
-class Foo {
-  operator +(other) => null;
-}
-
-class IndexTester {
-  operator [](_) => null;
-  void operator []=(_a, _b) {}
-}
-
-f(x) => x;
-main() {}
-testNSM() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.expect
deleted file mode 100644
index d5261cc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.expect
+++ /dev/null
@@ -1,106 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:20:18: Error: Method not found: 'Bar'.
-//   var y = prefix.Bar();
-//                  ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:21:10: Error: Method not found: 'Bar'.
-//   prefix.Bar();
-//          ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///implicit_new.dart" as prefix;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  operator +(dynamic other) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  constructor named() → self::Bar*
-    : super core::Object::•()
-    ;
-  operator +(dynamic other) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class IndexTester extends core::Object {
-  synthetic constructor •() → self::IndexTester*
-    : super core::Object::•()
-    ;
-  operator [](dynamic _) → dynamic
-    return null;
-  operator []=(dynamic _a, dynamic _b) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method testNSM() → dynamic {
-  dynamic y = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:20:18: Error: Method not found: 'Bar'.
-  var y = prefix.Bar();
-                 ^^^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:21:10: Error: Method not found: 'Bar'.
-  prefix.Bar();
-         ^^^";
-}
-static method f(dynamic x) → dynamic
-  return x;
-static method main() → dynamic {
-  self::Foo* x = new self::Foo::•();
-  x = new self::Foo::•();
-  self::Bar* z = new self::Bar::named();
-  z = new self::Bar::named();
-  self::f(new self::Foo::•());
-  self::f(new self::Foo::•());
-  self::f(new self::Bar::named());
-  self::f(new self::Bar::named());
-  core::List<core::Object*>* l = <core::Object*>[new self::Foo::•(), new self::Bar::named()];
-  l = <core::Object*>[new self::Foo::•(), new self::Bar::named()];
-  core::Map<core::String*, core::Object*>* m = <core::String*, core::Object*>{"foo": new self::Foo::•(), "bar": new self::Bar::named()};
-  m = <core::String*, core::Object*>{"foo": new self::Foo::•(), "bar": new self::Bar::named()};
-  self::IndexTester* i = new self::IndexTester::•();
-  i.{self::IndexTester::[]}(new self::Foo::•());
-  i.{self::IndexTester::[]}(new self::Foo::•());
-  i.{self::IndexTester::[]}(new self::Bar::named());
-  i.{self::IndexTester::[]}(new self::Bar::named());
-  i.{self::IndexTester::[]=}(new self::Foo::•(), null);
-  i.{self::IndexTester::[]=}(new self::Foo::•(), null);
-  i.{self::IndexTester::[]=}(new self::Bar::named(), null);
-  i.{self::IndexTester::[]=}(new self::Bar::named(), null);
-  new self::Foo::•().{self::Foo::+}(new self::Bar::named());
-  new self::Foo::•().{self::Foo::+}(new self::Bar::named());
-  new self::Bar::named().{self::Bar::+}(new self::Foo::•());
-  new self::Bar::named().{self::Bar::+}(new self::Foo::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.outline.expect
deleted file mode 100644
index 9eab8b7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.outline.expect
+++ /dev/null
@@ -1,62 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///implicit_new.dart" as prefix;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    ;
-  operator +(dynamic other) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  constructor named() → self::Bar*
-    ;
-  operator +(dynamic other) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class IndexTester extends core::Object {
-  synthetic constructor •() → self::IndexTester*
-    ;
-  operator [](dynamic _) → dynamic
-    ;
-  operator []=(dynamic _a, dynamic _b) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method testNSM() → dynamic
-  ;
-static method f(dynamic x) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.transformed.expect
deleted file mode 100644
index ecfe40c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart.weak.transformed.expect
+++ /dev/null
@@ -1,106 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:20:18: Error: Method not found: 'Bar'.
-//   var y = prefix.Bar();
-//                  ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:21:10: Error: Method not found: 'Bar'.
-//   prefix.Bar();
-//          ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///implicit_new.dart" as prefix;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  operator +(dynamic other) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  constructor named() → self::Bar*
-    : super core::Object::•()
-    ;
-  operator +(dynamic other) → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class IndexTester extends core::Object {
-  synthetic constructor •() → self::IndexTester*
-    : super core::Object::•()
-    ;
-  operator [](dynamic _) → dynamic
-    return null;
-  operator []=(dynamic _a, dynamic _b) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method testNSM() → dynamic {
-  dynamic y = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:20:18: Error: Method not found: 'Bar'.
-  var y = prefix.Bar();
-                 ^^^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/implicit_new.dart:21:10: Error: Method not found: 'Bar'.
-  prefix.Bar();
-         ^^^";
-}
-static method f(dynamic x) → dynamic
-  return x;
-static method main() → dynamic {
-  self::Foo* x = new self::Foo::•();
-  x = new self::Foo::•();
-  self::Bar* z = new self::Bar::named();
-  z = new self::Bar::named();
-  self::f(new self::Foo::•());
-  self::f(new self::Foo::•());
-  self::f(new self::Bar::named());
-  self::f(new self::Bar::named());
-  core::List<core::Object*>* l = core::_GrowableList::_literal2<core::Object*>(new self::Foo::•(), new self::Bar::named());
-  l = core::_GrowableList::_literal2<core::Object*>(new self::Foo::•(), new self::Bar::named());
-  core::Map<core::String*, core::Object*>* m = <core::String*, core::Object*>{"foo": new self::Foo::•(), "bar": new self::Bar::named()};
-  m = <core::String*, core::Object*>{"foo": new self::Foo::•(), "bar": new self::Bar::named()};
-  self::IndexTester* i = new self::IndexTester::•();
-  i.{self::IndexTester::[]}(new self::Foo::•());
-  i.{self::IndexTester::[]}(new self::Foo::•());
-  i.{self::IndexTester::[]}(new self::Bar::named());
-  i.{self::IndexTester::[]}(new self::Bar::named());
-  i.{self::IndexTester::[]=}(new self::Foo::•(), null);
-  i.{self::IndexTester::[]=}(new self::Foo::•(), null);
-  i.{self::IndexTester::[]=}(new self::Bar::named(), null);
-  i.{self::IndexTester::[]=}(new self::Bar::named(), null);
-  new self::Foo::•().{self::Foo::+}(new self::Bar::named());
-  new self::Foo::•().{self::Foo::+}(new self::Bar::named());
-  new self::Bar::named().{self::Bar::+}(new self::Foo::•());
-  new self::Bar::named().{self::Bar::+}(new self::Foo::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart
deleted file mode 100644
index 4836e22..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2011, 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.6
-
-// Test that if, while etc create an implicit scope if the body
-// is not a compound statement.
-
-import "package:expect/expect.dart";
-
-class ImplicitScopeTest {
-  static bool alwaysTrue() {
-    return 1 + 1 == 2;
-  }
-
-  static testMain() {
-    var a = "foo";
-    var b;
-    if (alwaysTrue())
-      var a = "bar";
-    else
-      var b = a;
-    Expect.equals("foo", a);
-    Expect.equals(null, b);
-
-    while (!alwaysTrue()) var a = "bar", b = "baz";
-    Expect.equals("foo", a);
-    Expect.equals(null, b);
-
-    for (int i = 0; i < 10; i++) var a = "bar", b = "baz";
-    Expect.equals("foo", a);
-    Expect.equals(null, b);
-
-    do var a = "bar", b = "baz"; while ("black" == "white");
-    Expect.equals("foo", a);
-    Expect.equals(null, b);
-  }
-}
-
-main() {
-  ImplicitScopeTest.testMain();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.textual_outline.expect
deleted file mode 100644
index ea15953..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart";
-
-class ImplicitScopeTest {
-  static bool alwaysTrue() {}
-  static testMain() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index ea15953..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart";
-
-class ImplicitScopeTest {
-  static bool alwaysTrue() {}
-  static testMain() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.expect
deleted file mode 100644
index f041292..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class ImplicitScopeTest extends core::Object {
-  synthetic constructor •() → self::ImplicitScopeTest*
-    : super core::Object::•()
-    ;
-  static method alwaysTrue() → core::bool* {
-    return 1.{core::num::+}(1).{core::num::==}(2);
-  }
-  static method testMain() → dynamic {
-    core::String* a = "foo";
-    dynamic b;
-    if(self::ImplicitScopeTest::alwaysTrue()) {
-      core::String* a = "bar";
-    }
-    else {
-      core::String* b = a;
-    }
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-    while (!self::ImplicitScopeTest::alwaysTrue()) {
-      core::String* a = "bar";
-      core::String* b = "baz";
-    }
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-    for (core::int* i = 0; i.{core::num::<}(10); i = i.{core::num::+}(1)) {
-      core::String* a = "bar";
-      core::String* b = "baz";
-    }
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-    do {
-      core::String* a = "bar";
-      core::String* b = "baz";
-    }
-    while ("black".{core::String::==}("white"))
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::ImplicitScopeTest::testMain();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.outline.expect
deleted file mode 100644
index a3bc6ba..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-class ImplicitScopeTest extends core::Object {
-  synthetic constructor •() → self::ImplicitScopeTest*
-    ;
-  static method alwaysTrue() → core::bool*
-    ;
-  static method testMain() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.transformed.expect
deleted file mode 100644
index b63a7e4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_scope_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,65 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class ImplicitScopeTest extends core::Object {
-  synthetic constructor •() → self::ImplicitScopeTest*
-    : super core::Object::•()
-    ;
-  static method alwaysTrue() → core::bool* {
-    return 1.{core::num::+}(1).{core::num::==}(2);
-  }
-  static method testMain() → dynamic {
-    core::String* a = "foo";
-    dynamic b;
-    if(self::ImplicitScopeTest::alwaysTrue()) {
-      core::String* a = "bar";
-    }
-    else {
-      core::String* b = a;
-    }
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-    while (!self::ImplicitScopeTest::alwaysTrue()) {
-      core::String* a = "bar";
-      core::String* b = "baz";
-    }
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-    for (core::int* i = 0; i.{core::num::<}(10); i = i.{core::num::+}(1)) {
-      core::String* a = "bar";
-      core::String* b = "baz";
-    }
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-    do {
-      core::String* a = "bar";
-      core::String* b = "baz";
-    }
-    while ("black".{core::String::==}("white"))
-    exp::Expect::equals("foo", a);
-    exp::Expect::equals(null, b);
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::ImplicitScopeTest::testMain();
-}
-
-
-Extra constant evaluation status:
-Evaluated: MethodInvocation @ org-dartlang-testcase:///implicit_scope_test.dart:14:18 -> BoolConstant(true)
-Evaluated: MethodInvocation @ org-dartlang-testcase:///implicit_scope_test.dart:35:49 -> BoolConstant(false)
-Extra constant evaluation: evaluated: 28, effectively constant: 2
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart
deleted file mode 100644
index 93b0636..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class C {
-  m() {
-    print("Called m");
-  }
-
-  testC() {
-    m();
-  }
-}
-
-class D extends C {
-  testD() {
-    m();
-  }
-}
-
-main() {
-  new C().testC();
-  new D().testD();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.textual_outline.expect
deleted file mode 100644
index 7971f11..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class C {
-  m() {}
-  testC() {}
-}
-
-class D extends C {
-  testD() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7971f11..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class C {
-  m() {}
-  testC() {}
-}
-
-class D extends C {
-  testD() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.expect
deleted file mode 100644
index 4eec5c6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method m() → dynamic {
-    core::print("Called m");
-  }
-  method testC() → dynamic {
-    this.{self::C::m}();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  method testD() → dynamic {
-    this.{self::C::m}();
-  }
-}
-static method main() → dynamic {
-  new self::C::•().{self::C::testC}();
-  new self::D::•().{self::D::testD}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.outline.expect
deleted file mode 100644
index 1a47f4d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.outline.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method m() → dynamic
-    ;
-  method testC() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  method testD() → dynamic
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.transformed.expect
deleted file mode 100644
index 4eec5c6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/implicit_this.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method m() → dynamic {
-    core::print("Called m");
-  }
-  method testC() → dynamic {
-    this.{self::C::m}();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  method testD() → dynamic {
-    this.{self::C::m}();
-  }
-}
-static method main() → dynamic {
-  new self::C::•().{self::C::testC}();
-  new self::D::•().{self::D::testD}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart
deleted file mode 100644
index f47feb5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-import 'import_conflicting_getters_lib1.dart';
-import 'import_conflicting_getters_lib2.dart';
-
-main() {}
-
-errors() {
-  print(foo);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.textual_outline.expect
deleted file mode 100644
index a245e33..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_getters_lib1.dart';
-import 'import_conflicting_getters_lib2.dart';
-
-main() {}
-errors() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6d91e80..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_getters_lib1.dart';
-import 'import_conflicting_getters_lib2.dart';
-
-errors() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.expect
deleted file mode 100644
index 1d6816d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart:13:9: Error: 'foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib2.dart'.
-//   print(foo);
-//         ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///import_conflicting_getters_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_getters_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart:13:9: Error: 'foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib2.dart'.
-  print(foo);
-        ^^^");
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static get foo() → core::int*
-  return 42;
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static get foo() → core::int*
-  return 87;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.outline.expect
deleted file mode 100644
index a6a70a1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_getters_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_getters_lib2.dart";
-
-static method main() → dynamic
-  ;
-static method errors() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static get foo() → core::int*
-  ;
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static get foo() → core::int*
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.transformed.expect
deleted file mode 100644
index 1d6816d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart.weak.transformed.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart:13:9: Error: 'foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib2.dart'.
-//   print(foo);
-//         ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///import_conflicting_getters_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_getters_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters.dart:13:9: Error: 'foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib2.dart'.
-  print(foo);
-        ^^^");
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static get foo() → core::int*
-  return 42;
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static get foo() → core::int*
-  return 87;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib1.dart
deleted file mode 100644
index 98d73e1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib1.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-int get foo => 42;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib2.dart
deleted file mode 100644
index 522a3a3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_getters_lib2.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-int get foo => 87;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart
deleted file mode 100644
index 6b06630..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-import 'import_conflicting_setters_lib1.dart';
-import 'import_conflicting_setters_lib2.dart';
-
-main() {}
-
-errors() {
-  foo = 42;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.textual_outline.expect
deleted file mode 100644
index ac0d854..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_setters_lib1.dart';
-import 'import_conflicting_setters_lib2.dart';
-
-main() {}
-errors() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.textual_outline_modelled.expect
deleted file mode 100644
index 592f7b0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_setters_lib1.dart';
-import 'import_conflicting_setters_lib2.dart';
-
-errors() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.expect
deleted file mode 100644
index c050ae7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart:13:3: Error: Setter not found: 'foo'.
-//   foo = 42;
-//   ^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_setters_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_setters_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart:13:3: Error: Setter not found: 'foo'.
-  foo = 42;
-  ^^^";
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static set foo(core::int* value) → void {}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static set foo(core::int* value) → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.outline.expect
deleted file mode 100644
index 11fc2b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_setters_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_setters_lib2.dart";
-
-static method main() → dynamic
-  ;
-static method errors() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static set foo(core::int* value) → void
-  ;
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static set foo(core::int* value) → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.transformed.expect
deleted file mode 100644
index c050ae7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart.weak.transformed.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart:13:3: Error: Setter not found: 'foo'.
-//   foo = 42;
-//   ^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_setters_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_setters_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters.dart:13:3: Error: Setter not found: 'foo'.
-  foo = 42;
-  ^^^";
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-static set foo(core::int* value) → void {}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-static set foo(core::int* value) → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters_lib1.dart
deleted file mode 100644
index 670e14f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters_lib1.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-void set foo(int value) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters_lib2.dart
deleted file mode 100644
index 670e14f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_setters_lib2.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-void set foo(int value) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart
deleted file mode 100644
index 129776c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.6
-
-import 'import_conflicting_type_member_lib1.dart';
-import 'import_conflicting_type_member_lib2.dart';
-
-main() {}
-
-errors() {
-  Foo foo;
-  Foo();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.textual_outline.expect
deleted file mode 100644
index 79e6e92..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_type_member_lib1.dart';
-import 'import_conflicting_type_member_lib2.dart';
-
-main() {}
-errors() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.textual_outline_modelled.expect
deleted file mode 100644
index 71e6b48..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_type_member_lib1.dart';
-import 'import_conflicting_type_member_lib2.dart';
-
-errors() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.expect
deleted file mode 100644
index 317d3c9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart:8:1: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart'.
-// import 'import_conflicting_type_member_lib2.dart';
-// ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart:14:3: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart'.
-//   Foo();
-//   ^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_type_member_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_type_member_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  invalid-type foo;
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart:14:3: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart'.
-  Foo();
-  ^^^";
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self2::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-
-static method Foo() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.outline.expect
deleted file mode 100644
index d2b0c91..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.outline.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_type_member_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_type_member_lib2.dart";
-
-static method main() → dynamic
-  ;
-static method errors() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self2::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-
-static method Foo() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.transformed.expect
deleted file mode 100644
index 317d3c9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart.weak.transformed.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart:8:1: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart'.
-// import 'import_conflicting_type_member_lib2.dart';
-// ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart:14:3: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart'.
-//   Foo();
-//   ^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_type_member_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_type_member_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  invalid-type foo;
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member.dart:14:3: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart'.
-  Foo();
-  ^^^";
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self2::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-
-static method Foo() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart
deleted file mode 100644
index 66f1b70..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib1.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-class Foo {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart
deleted file mode 100644
index f75bdd4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_type_member_lib2.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-Foo() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart
deleted file mode 100644
index 6724e41..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-import 'import_conflicting_types_lib1.dart';
-import 'import_conflicting_types_lib2.dart';
-
-main() {}
-
-errors() {
-  Foo foo;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.textual_outline.expect
deleted file mode 100644
index 287c61f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_types_lib1.dart';
-import 'import_conflicting_types_lib2.dart';
-
-main() {}
-errors() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.textual_outline_modelled.expect
deleted file mode 100644
index 48302b2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'import_conflicting_types_lib1.dart';
-import 'import_conflicting_types_lib2.dart';
-
-errors() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.expect
deleted file mode 100644
index 5fb3ddb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.expect
+++ /dev/null
@@ -1,57 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart:8:1: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib2.dart'.
-// import 'import_conflicting_types_lib2.dart';
-// ^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_types_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_types_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  invalid-type foo;
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self2::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self3::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.outline.expect
deleted file mode 100644
index 5963c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.outline.expect
+++ /dev/null
@@ -1,48 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_types_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_types_lib2.dart";
-
-static method main() → dynamic
-  ;
-static method errors() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self2::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self3::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.transformed.expect
deleted file mode 100644
index 5fb3ddb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart.weak.transformed.expect
+++ /dev/null
@@ -1,57 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types.dart:8:1: Error: 'Foo' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib2.dart'.
-// import 'import_conflicting_types_lib2.dart';
-// ^^^
-//
-import self as self;
-
-import "org-dartlang-testcase:///import_conflicting_types_lib1.dart";
-import "org-dartlang-testcase:///import_conflicting_types_lib2.dart";
-
-static method main() → dynamic {}
-static method errors() → dynamic {
-  invalid-type foo;
-}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self2::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self3::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib1.dart
deleted file mode 100644
index 66f1b70..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib1.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-class Foo {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib2.dart
deleted file mode 100644
index 66f1b70..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/import_conflicting_types_lib2.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-class Foo {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart b/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart
deleted file mode 100644
index e8679db..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class C {
-  C.a(this);
-  C.b(this.);
-  C.c(this, p);
-  C.d(this., p);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.textual_outline.expect
deleted file mode 100644
index 23e89ac..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class C {
-  C.a(this.);
-  C.b(this.);
-  C.c(this., p);
-  C.d(this., p);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.expect
deleted file mode 100644
index 4f7c820..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:8:11: Error: Expected '.' before this.
-//   C.a(this);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:8:11: Error: Expected an identifier, but got ')'.
-// Try inserting an identifier before ')'.
-//   C.a(this);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:9:12: Error: Expected an identifier, but got ')'.
-// Try inserting an identifier before ')'.
-//   C.b(this.);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:10:11: Error: Expected '.' before this.
-//   C.c(this, p);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:10:11: Error: Expected an identifier, but got ','.
-// Try inserting an identifier before ','.
-//   C.c(this, p);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:11:12: Error: Expected an identifier, but got ','.
-// Try inserting an identifier before ','.
-//   C.d(this., p);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  constructor a() → self::C*
-    : super core::Object::•()
-    ;
-  constructor b() → self::C*
-    : super core::Object::•()
-    ;
-  constructor c() → self::C*
-    : super core::Object::•()
-    ;
-  constructor d() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.outline.expect
deleted file mode 100644
index a696d1ec..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.outline.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:8:11: Error: Expected '.' before this.
-//   C.a(this);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:8:11: Error: Expected an identifier, but got ')'.
-// Try inserting an identifier before ')'.
-//   C.a(this);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:9:12: Error: Expected an identifier, but got ')'.
-// Try inserting an identifier before ')'.
-//   C.b(this.);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:10:11: Error: Expected '.' before this.
-//   C.c(this, p);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:10:11: Error: Expected an identifier, but got ','.
-// Try inserting an identifier before ','.
-//   C.c(this, p);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:11:12: Error: Expected an identifier, but got ','.
-// Try inserting an identifier before ','.
-//   C.d(this., p);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  constructor a() → self::C*
-    ;
-  constructor b() → self::C*
-    ;
-  constructor c() → self::C*
-    ;
-  constructor d() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.transformed.expect
deleted file mode 100644
index 4f7c820..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart.weak.transformed.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:8:11: Error: Expected '.' before this.
-//   C.a(this);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:8:11: Error: Expected an identifier, but got ')'.
-// Try inserting an identifier before ')'.
-//   C.a(this);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:9:12: Error: Expected an identifier, but got ')'.
-// Try inserting an identifier before ')'.
-//   C.b(this.);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:10:11: Error: Expected '.' before this.
-//   C.c(this, p);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:10:11: Error: Expected an identifier, but got ','.
-// Try inserting an identifier before ','.
-//   C.c(this, p);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/incomplete_field_formal_parameter.dart:11:12: Error: Expected an identifier, but got ','.
-// Try inserting an identifier before ','.
-//   C.d(this., p);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  constructor a() → self::C*
-    : super core::Object::•()
-    ;
-  constructor b() → self::C*
-    : super core::Object::•()
-    ;
-  constructor c() → self::C*
-    : super core::Object::•()
-    ;
-  constructor d() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart b/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart
deleted file mode 100644
index 260ea8d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-library test;
-
-typedef void F<T>(T t);
-
-class B<T> {
-  T f(int x) {}
-}
-
-abstract class I<T> {
-  T f(Object x);
-}
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.textual_outline.expect
deleted file mode 100644
index 121eb31..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-library test;
-
-typedef void F<T>(T t);
-
-class B<T> {
-  T f(int x) {}
-}
-
-abstract class I<T> {
-  T f(Object x);
-}
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.textual_outline_modelled.expect
deleted file mode 100644
index 2c05413..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-library test;
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-abstract class I<T> {
-  T f(Object x);
-}
-
-class B<T> {
-  T f(int x) {}
-}
-
-typedef void F<T>(T t);
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.expect
deleted file mode 100644
index 9aa836e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.expect
+++ /dev/null
@@ -1,64 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method f(core::int* x) → self::B::T* {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f(core::Object* x) → self::I::T*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.outline.expect
deleted file mode 100644
index 4e1cc48..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.outline.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    ;
-  method f(core::int* x) → self::B::T*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    ;
-  abstract method f(core::Object* x) → self::I::T*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.transformed.expect
deleted file mode 100644
index 9aa836e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart.weak.transformed.expect
+++ /dev/null
@@ -1,64 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_contravariant_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method f(core::int* x) → self::B::T* {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f(core::Object* x) → self::I::T*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart
deleted file mode 100644
index cbbcfea..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-library test;
-
-typedef void F<T>(T t);
-
-class B<T> {
-  void f(F<T> x, int y) {}
-}
-
-abstract class I<T> {
-  void f(F<T> x, Object y);
-}
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.textual_outline.expect
deleted file mode 100644
index 5525e8f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-library test;
-
-typedef void F<T>(T t);
-
-class B<T> {
-  void f(F<T> x, int y) {}
-}
-
-abstract class I<T> {
-  void f(F<T> x, Object y);
-}
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.textual_outline_modelled.expect
deleted file mode 100644
index b877341..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-library test;
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-abstract class I<T> {
-  void f(F<T> x, Object y);
-}
-
-class B<T> {
-  void f(F<T> x, int y) {}
-}
-
-typedef void F<T>(T t);
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.expect
deleted file mode 100644
index 4d48525..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.expect
+++ /dev/null
@@ -1,64 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method f((self::B::T*) →* void x, core::int* y) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f((self::I::T*) →* void x, core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.outline.expect
deleted file mode 100644
index 8f6d7d7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.outline.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    ;
-  method f((self::B::T*) →* void x, core::int* y) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    ;
-  abstract method f((self::I::T*) →* void x, core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.transformed.expect
deleted file mode 100644
index 4d48525..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart.weak.transformed.expect
+++ /dev/null
@@ -1,64 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantImpl_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method f((self::B::T*) →* void x, core::int* y) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f((self::I::T*) →* void x, core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart
deleted file mode 100644
index 9d1452d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-library test;
-
-typedef void F<T>(T t);
-
-abstract class A<T> {
-  void f(T x, int y);
-}
-
-class B<T> implements A<F<T>> {
-  void f(F<T> x, int y) {}
-}
-
-abstract class I<T> implements A<F<T>> {
-  void f(F<T> x, Object y);
-}
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.textual_outline.expect
deleted file mode 100644
index 6d9f5e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.textual_outline.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-// @dart = 2.6
-library test;
-
-typedef void F<T>(T t);
-
-abstract class A<T> {
-  void f(T x, int y);
-}
-
-class B<T> implements A<F<T>> {
-  void f(F<T> x, int y) {}
-}
-
-abstract class I<T> implements A<F<T>> {
-  void f(F<T> x, Object y);
-}
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.textual_outline_modelled.expect
deleted file mode 100644
index ff9bcce..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-library test;
-
-abstract class A<T> {
-  void f(T x, int y);
-}
-
-abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-
-abstract class I<T> implements A<F<T>> {
-  void f(F<T> x, Object y);
-}
-
-class B<T> implements A<F<T>> {
-  void f(F<T> x, int y) {}
-}
-
-typedef void F<T>(T t);
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.expect
deleted file mode 100644
index 5ab98d0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.expect
+++ /dev/null
@@ -1,88 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:15:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class B<T> implements A<F<T>> {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// abstract class I<T> implements A<F<T>> {
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:23:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:23:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f(generic-covariant-impl self::A::T* x, core::int* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method f((self::B::T*) →* void x, core::int* y) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f((self::I::T*) →* void x, core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.outline.expect
deleted file mode 100644
index 815c68a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.outline.expect
+++ /dev/null
@@ -1,86 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:15:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class B<T> implements A<F<T>> {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// abstract class I<T> implements A<F<T>> {
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:23:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:23:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    ;
-  abstract method f(generic-covariant-impl self::A::T* x, core::int* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    ;
-  method f((self::B::T*) →* void x, core::int* y) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    ;
-  abstract method f((self::I::T*) →* void x, core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.transformed.expect
deleted file mode 100644
index 5ab98d0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart.weak.transformed.expect
+++ /dev/null
@@ -1,88 +0,0 @@
-library test;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:15:7: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// class B<T> implements A<F<T>> {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:19:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'A'.
-// abstract class I<T> implements A<F<T>> {
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:23:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'B'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/interface_covariantInterface_from_class.dart:23:16: Error: Can't use implicitly 'out' variable 'T' in an 'in' position in supertype 'I'.
-// abstract class C<T> extends B<F<T>> implements I<F<T>> {}
-//                ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef F<contravariant T extends core::Object* = dynamic> = (T*) →* void;
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f(generic-covariant-impl self::A::T* x, core::int* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  method f((self::B::T*) →* void x, core::int* y) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class I<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::I<self::I::T*>*
-    : super core::Object::•()
-    ;
-  abstract method f((self::I::T*) →* void x, core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart
deleted file mode 100644
index c563811..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {
-  String operator +(int i) => '';
-}
-
-test(int i, String s, A a) {
-  i = 1;
-  i = s;
-  i ??= 1;
-  i ??= s;
-  a = new A();
-  a += 1;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.textual_outline.expect
deleted file mode 100644
index d8b263a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class A {
-  String operator +(int i) => '';
-}
-
-test(int i, String s, A a) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.textual_outline_modelled.expect
deleted file mode 100644
index f55ddde..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class A {
-  String operator +(int i) => '';
-}
-
-main() {}
-test(int i, String s, A a) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.expect
deleted file mode 100644
index 7968f4c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:13:7: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   i = s;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:15:9: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   i ??= s;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:17:5: Error: A value of type 'String' can't be assigned to a variable of type 'A'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart'.
-//   a += 1;
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator +(core::int* i) → core::String*
-    return "";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(core::int* i, core::String* s, self::A* a) → dynamic {
-  i = 1;
-  i = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:13:7: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  i = s;
-      ^" in s as{TypeError} core::int*;
-  i.{core::num::==}(null) ?{core::int*} i = 1 : null;
-  i.{core::num::==}(null) ?{core::Object*} i = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:15:9: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  i ??= s;
-        ^" in s as{TypeError} core::int* : null;
-  a = new self::A::•();
-  a = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:17:5: Error: A value of type 'String' can't be assigned to a variable of type 'A'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart'.
-  a += 1;
-    ^" in a.{self::A::+}(1) as{TypeError} self::A*;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.outline.expect
deleted file mode 100644
index ed1296c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  operator +(core::int* i) → core::String*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(core::int* i, core::String* s, self::A* a) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.transformed.expect
deleted file mode 100644
index 7968f4c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart.weak.transformed.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:13:7: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   i = s;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:15:9: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-//   i ??= s;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:17:5: Error: A value of type 'String' can't be assigned to a variable of type 'A'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart'.
-//   a += 1;
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  operator +(core::int* i) → core::String*
-    return "";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(core::int* i, core::String* s, self::A* a) → dynamic {
-  i = 1;
-  i = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:13:7: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  i = s;
-      ^" in s as{TypeError} core::int*;
-  i.{core::num::==}(null) ?{core::int*} i = 1 : null;
-  i.{core::num::==}(null) ?{core::Object*} i = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:15:9: Error: A value of type 'String' can't be assigned to a variable of type 'int'.
-  i ??= s;
-        ^" in s as{TypeError} core::int* : null;
-  a = new self::A::•();
-  a = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart:17:5: Error: A value of type 'String' can't be assigned to a variable of type 'A'.
- - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_assignment.dart'.
-  a += 1;
-    ^" in a.{self::A::+}(1) as{TypeError} self::A*;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart
deleted file mode 100644
index 7d008bf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class C {
-  C();
-  factory C.fact() => null;
-  factory C.fact2() = D;
-  C.nonFact();
-  C.nonFact2() : this.nonFact();
-  static void staticFunction(int i) {}
-}
-
-class D extends C {}
-
-void topLevelFunction(int i) {}
-
-bad() {
-  void localFunction(int i) {}
-  List<int> a = <Object>[];
-  Map<int, String> b = <Object, String>{};
-  Map<int, String> c = <int, Object>{};
-  int Function(Object) d = (int i) => i;
-  D e = new C.fact();
-  D f = new C.fact2();
-  D g = new C.nonFact();
-  D h = new C.nonFact2();
-  void Function(Object) i = C.staticFunction;
-  void Function(Object) j = topLevelFunction;
-  void Function(Object) k = localFunction;
-}
-
-ok() {
-  void localFunction(int i) {}
-  List<int> a = <int>[];
-  Map<int, String> b = <int, String>{};
-  Map<int, String> c = <int, String>{};
-  int Function(int) d = (int i) => i;
-  D e = new C.fact();
-  D f = new C.fact2();
-  C g = new C.nonFact();
-  C h = new C.nonFact2();
-  void Function(int) i = C.staticFunction;
-  void Function(int) j = topLevelFunction;
-  void Function(int) k = localFunction;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.textual_outline.expect
deleted file mode 100644
index 44ec294..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-class C {
-  C();
-  factory C.fact() => null;
-  factory C.fact2() = D;
-  C.nonFact();
-  C.nonFact2() : this.nonFact();
-  static void staticFunction(int i) {}
-}
-
-class D extends C {}
-
-void topLevelFunction(int i) {}
-bad() {}
-ok() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.textual_outline_modelled.expect
deleted file mode 100644
index e1bc0c5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-bad() {}
-
-class C {
-  C();
-  C.nonFact();
-  C.nonFact2() : this.nonFact();
-  factory C.fact() => null;
-  factory C.fact2() = D;
-  static void staticFunction(int i) {}
-}
-
-class D extends C {}
-
-main() {}
-ok() {}
-void topLevelFunction(int i) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.expect
deleted file mode 100644
index ca5af00..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.expect
+++ /dev/null
@@ -1,174 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:22:25: Error: The list literal type 'List<Object>' isn't of expected type 'List<int>'.
-//  - 'List' is from 'dart:core'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the list literal or the context in which it is used.
-//   List<int> a = <Object>[];
-//                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:23:40: Error: The map literal type 'Map<Object, String>' isn't of expected type 'Map<int, String>'.
-//  - 'Map' is from 'dart:core'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the map literal or the context in which it is used.
-//   Map<int, String> b = <Object, String>{};
-//                                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:24:37: Error: The map literal type 'Map<int, Object>' isn't of expected type 'Map<int, String>'.
-//  - 'Map' is from 'dart:core'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the map literal or the context in which it is used.
-//   Map<int, String> c = <int, Object>{};
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:25:28: Error: The function expression type 'int Function(int)' isn't of expected type 'int Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the function expression or the context in which it is used.
-//   int Function(Object) d = (int i) => i;
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:28:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-// Change the type of the object being constructed or the context in which it is used.
-//   D g = new C.nonFact();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:29:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-// Change the type of the object being constructed or the context in which it is used.
-//   D h = new C.nonFact2();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:30:31: Error: The static method has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the method or the context in which it is used.
-//   void Function(Object) i = C.staticFunction;
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:31:29: Error: The top level function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the function or the context in which it is used.
-//   void Function(Object) j = topLevelFunction;
-//                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:32:29: Error: The local function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the function or the context in which it is used.
-//   void Function(Object) k = localFunction;
-//                             ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::C::fact2];
-  constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  constructor nonFact() → self::C*
-    : super core::Object::•()
-    ;
-  constructor nonFact2() → self::C*
-    : this self::C::nonFact()
-    ;
-  static factory fact() → self::C*
-    return null;
-  static factory fact2() → self::C*
-    let dynamic #redirecting_factory = self::D::• in invalid-expression;
-  static method staticFunction(core::int* i) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-static method topLevelFunction(core::int* i) → void {}
-static method bad() → dynamic {
-  function localFunction(core::int* i) → void {}
-  core::List<core::int*>* a = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:22:25: Error: The list literal type 'List<Object>' isn't of expected type 'List<int>'.
- - 'List' is from 'dart:core'.
- - 'Object' is from 'dart:core'.
-Change the type of the list literal or the context in which it is used.
-  List<int> a = <Object>[];
-                        ^" in <core::Object*>[];
-  core::Map<core::int*, core::String*>* b = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:23:40: Error: The map literal type 'Map<Object, String>' isn't of expected type 'Map<int, String>'.
- - 'Map' is from 'dart:core'.
- - 'Object' is from 'dart:core'.
-Change the type of the map literal or the context in which it is used.
-  Map<int, String> b = <Object, String>{};
-                                       ^" in <core::Object*, core::String*>{};
-  core::Map<core::int*, core::String*>* c = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:24:37: Error: The map literal type 'Map<int, Object>' isn't of expected type 'Map<int, String>'.
- - 'Map' is from 'dart:core'.
- - 'Object' is from 'dart:core'.
-Change the type of the map literal or the context in which it is used.
-  Map<int, String> c = <int, Object>{};
-                                    ^" in <core::int*, core::Object*>{};
-  (core::Object*) →* core::int* d = let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:25:28: Error: The function expression type 'int Function(int)' isn't of expected type 'int Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the function expression or the context in which it is used.
-  int Function(Object) d = (int i) => i;
-                           ^" in (core::int* i) → core::int* => i;
-  self::D* e = self::C::fact() as{TypeError} self::D*;
-  self::D* f = new self::D::•() as{TypeError} self::D*;
-  self::D* g = let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:28:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-Change the type of the object being constructed or the context in which it is used.
-  D g = new C.nonFact();
-            ^" in new self::C::nonFact();
-  self::D* h = let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:29:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-Change the type of the object being constructed or the context in which it is used.
-  D h = new C.nonFact2();
-            ^" in new self::C::nonFact2();
-  (core::Object*) →* void i = let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:30:31: Error: The static method has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the method or the context in which it is used.
-  void Function(Object) i = C.staticFunction;
-                              ^" in #C1;
-  (core::Object*) →* void j = let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:31:29: Error: The top level function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the function or the context in which it is used.
-  void Function(Object) j = topLevelFunction;
-                            ^" in #C2;
-  (core::Object*) →* void k = let final<BottomType> #t9 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:32:29: Error: The local function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the function or the context in which it is used.
-  void Function(Object) k = localFunction;
-                            ^" in localFunction;
-}
-static method ok() → dynamic {
-  function localFunction(core::int* i) → void {}
-  core::List<core::int*>* a = <core::int*>[];
-  core::Map<core::int*, core::String*>* b = <core::int*, core::String*>{};
-  core::Map<core::int*, core::String*>* c = <core::int*, core::String*>{};
-  (core::int*) →* core::int* d = (core::int* i) → core::int* => i;
-  self::D* e = self::C::fact() as{TypeError} self::D*;
-  self::D* f = new self::D::•() as{TypeError} self::D*;
-  self::C* g = new self::C::nonFact();
-  self::C* h = new self::C::nonFact2();
-  (core::int*) →* void i = #C1;
-  (core::int*) →* void j = #C2;
-  (core::int*) →* void k = localFunction;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::C::staticFunction
-  #C2 = tearoff self::topLevelFunction
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.outline.expect
deleted file mode 100644
index c096df0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.outline.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::C::fact2];
-  constructor •() → self::C*
-    ;
-  constructor nonFact() → self::C*
-    ;
-  constructor nonFact2() → self::C*
-    ;
-  static factory fact() → self::C*
-    ;
-  static factory fact2() → self::C*
-    let dynamic #redirecting_factory = self::D::• in invalid-expression;
-  static method staticFunction(core::int* i) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-}
-static method topLevelFunction(core::int* i) → void
-  ;
-static method bad() → dynamic
-  ;
-static method ok() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.transformed.expect
deleted file mode 100644
index 214f497..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart.weak.transformed.expect
+++ /dev/null
@@ -1,174 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:22:25: Error: The list literal type 'List<Object>' isn't of expected type 'List<int>'.
-//  - 'List' is from 'dart:core'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the list literal or the context in which it is used.
-//   List<int> a = <Object>[];
-//                         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:23:40: Error: The map literal type 'Map<Object, String>' isn't of expected type 'Map<int, String>'.
-//  - 'Map' is from 'dart:core'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the map literal or the context in which it is used.
-//   Map<int, String> b = <Object, String>{};
-//                                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:24:37: Error: The map literal type 'Map<int, Object>' isn't of expected type 'Map<int, String>'.
-//  - 'Map' is from 'dart:core'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the map literal or the context in which it is used.
-//   Map<int, String> c = <int, Object>{};
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:25:28: Error: The function expression type 'int Function(int)' isn't of expected type 'int Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the function expression or the context in which it is used.
-//   int Function(Object) d = (int i) => i;
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:28:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-// Change the type of the object being constructed or the context in which it is used.
-//   D g = new C.nonFact();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:29:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-// Change the type of the object being constructed or the context in which it is used.
-//   D h = new C.nonFact2();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:30:31: Error: The static method has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the method or the context in which it is used.
-//   void Function(Object) i = C.staticFunction;
-//                               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:31:29: Error: The top level function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the function or the context in which it is used.
-//   void Function(Object) j = topLevelFunction;
-//                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:32:29: Error: The local function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
-//  - 'Object' is from 'dart:core'.
-// Change the type of the function or the context in which it is used.
-//   void Function(Object) k = localFunction;
-//                             ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::C::fact2];
-  constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  constructor nonFact() → self::C*
-    : super core::Object::•()
-    ;
-  constructor nonFact2() → self::C*
-    : this self::C::nonFact()
-    ;
-  static factory fact() → self::C*
-    return null;
-  static factory fact2() → self::C*
-    let<BottomType> #redirecting_factory = self::D::• in invalid-expression;
-  static method staticFunction(core::int* i) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-static method topLevelFunction(core::int* i) → void {}
-static method bad() → dynamic {
-  function localFunction(core::int* i) → void {}
-  core::List<core::int*>* a = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:22:25: Error: The list literal type 'List<Object>' isn't of expected type 'List<int>'.
- - 'List' is from 'dart:core'.
- - 'Object' is from 'dart:core'.
-Change the type of the list literal or the context in which it is used.
-  List<int> a = <Object>[];
-                        ^" in core::_GrowableList::•<core::Object*>(0);
-  core::Map<core::int*, core::String*>* b = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:23:40: Error: The map literal type 'Map<Object, String>' isn't of expected type 'Map<int, String>'.
- - 'Map' is from 'dart:core'.
- - 'Object' is from 'dart:core'.
-Change the type of the map literal or the context in which it is used.
-  Map<int, String> b = <Object, String>{};
-                                       ^" in <core::Object*, core::String*>{};
-  core::Map<core::int*, core::String*>* c = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:24:37: Error: The map literal type 'Map<int, Object>' isn't of expected type 'Map<int, String>'.
- - 'Map' is from 'dart:core'.
- - 'Object' is from 'dart:core'.
-Change the type of the map literal or the context in which it is used.
-  Map<int, String> c = <int, Object>{};
-                                    ^" in <core::int*, core::Object*>{};
-  (core::Object*) →* core::int* d = let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:25:28: Error: The function expression type 'int Function(int)' isn't of expected type 'int Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the function expression or the context in which it is used.
-  int Function(Object) d = (int i) => i;
-                           ^" in (core::int* i) → core::int* => i;
-  self::D* e = self::C::fact() as{TypeError} self::D*;
-  self::D* f = new self::D::•();
-  self::D* g = let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:28:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-Change the type of the object being constructed or the context in which it is used.
-  D g = new C.nonFact();
-            ^" in new self::C::nonFact();
-  self::D* h = let final<BottomType> #t6 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:29:13: Error: The constructor returns type 'C' that isn't of expected type 'D'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart'.
-Change the type of the object being constructed or the context in which it is used.
-  D h = new C.nonFact2();
-            ^" in new self::C::nonFact2();
-  (core::Object*) →* void i = let final<BottomType> #t7 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:30:31: Error: The static method has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the method or the context in which it is used.
-  void Function(Object) i = C.staticFunction;
-                              ^" in #C1;
-  (core::Object*) →* void j = let final<BottomType> #t8 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:31:29: Error: The top level function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the function or the context in which it is used.
-  void Function(Object) j = topLevelFunction;
-                            ^" in #C2;
-  (core::Object*) →* void k = let final<BottomType> #t9 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_cast.dart:32:29: Error: The local function has type 'void Function(int)' that isn't of expected type 'void Function(Object)'.
- - 'Object' is from 'dart:core'.
-Change the type of the function or the context in which it is used.
-  void Function(Object) k = localFunction;
-                            ^" in localFunction;
-}
-static method ok() → dynamic {
-  function localFunction(core::int* i) → void {}
-  core::List<core::int*>* a = core::_GrowableList::•<core::int*>(0);
-  core::Map<core::int*, core::String*>* b = <core::int*, core::String*>{};
-  core::Map<core::int*, core::String*>* c = <core::int*, core::String*>{};
-  (core::int*) →* core::int* d = (core::int* i) → core::int* => i;
-  self::D* e = self::C::fact() as{TypeError} self::D*;
-  self::D* f = new self::D::•();
-  self::C* g = new self::C::nonFact();
-  self::C* h = new self::C::nonFact2();
-  (core::int*) →* void i = #C1;
-  (core::int*) →* void j = #C2;
-  (core::int*) →* void k = localFunction;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = tearoff self::C::staticFunction
-  #C2 = tearoff self::topLevelFunction
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart
deleted file mode 100644
index 910163b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class C {
-  static foo() {
-    this.bar();
-  }
-}
-
-test() {
-  (null as Missing).bar();
-  null.bar();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.textual_outline.expect
deleted file mode 100644
index 48caf67..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class C {
-  static foo() {}
-}
-
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.textual_outline_modelled.expect
deleted file mode 100644
index 499c0b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class C {
-  static foo() {}
-}
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.expect
deleted file mode 100644
index 383580e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.expect
+++ /dev/null
@@ -1,48 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:9:5: Error: Expected identifier, but got 'this'.
-//     this.bar();
-//     ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:14:12: Error: 'Missing' isn't a type.
-//   (null as Missing).bar();
-//            ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:15:8: Error: The method 'bar' isn't defined for the class 'Null'.
-// Try correcting the name to the name of an existing method, or defining a method named 'bar'.
-//   null.bar();
-//        ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  static method foo() → dynamic {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:9:5: Error: Expected identifier, but got 'this'.
-    this.bar();
-    ^^^^".bar();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  (null as invalid-type).bar();
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:15:8: Error: The method 'bar' isn't defined for the class 'Null'.
-Try correcting the name to the name of an existing method, or defining a method named 'bar'.
-  null.bar();
-       ^^^";
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.outline.expect
deleted file mode 100644
index 41d0f67..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  static method foo() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.transformed.expect
deleted file mode 100644
index a287469..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart.weak.transformed.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:9:5: Error: Expected identifier, but got 'this'.
-//     this.bar();
-//     ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:14:12: Error: 'Missing' isn't a type.
-//   (null as Missing).bar();
-//            ^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:15:8: Error: The method 'bar' isn't defined for the class 'Null'.
-// Try correcting the name to the name of an existing method, or defining a method named 'bar'.
-//   null.bar();
-//        ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  static method foo() → dynamic {
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:9:5: Error: Expected identifier, but got 'this'.
-    this.bar();
-    ^^^^".bar();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  (null as invalid-type).bar();
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invalid_type.dart:15:8: Error: The method 'bar' isn't defined for the class 'Null'.
-Try correcting the name to the name of an existing method, or defining a method named 'bar'.
-  null.bar();
-       ^^^";
-}
-static method main() → dynamic {}
-
-
-Extra constant evaluation status:
-Evaluated: AsExpression @ org-dartlang-testcase:///invalid_type.dart:14:9 -> NullConstant(null)
-Extra constant evaluation: evaluated: 3, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart b/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart
deleted file mode 100644
index d3f730c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() {
-  print("Hello, World!");
-  z("Hello, World!");
-  z.print("Hello, World!");
-  y.z.print("Hello, World!");
-  x.y.z.print("Hello, World!");
-
-  1 +
-      print("Hello, World!") +
-      z("Hello, World!") +
-      z.print("Hello, World!") +
-      y.z.print("Hello, World!") +
-      x.y.z.print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.expect
deleted file mode 100644
index 6c22e73..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.expect
+++ /dev/null
@@ -1,69 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:9:3: Error: Method not found: 'z'.
-//   z("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:10:3: Error: Getter not found: 'z'.
-//   z.print("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:11:3: Error: Getter not found: 'y'.
-//   y.z.print("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:12:3: Error: Getter not found: 'x'.
-//   x.y.z.print("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:16:7: Error: Method not found: 'z'.
-//       z("Hello, World!") +
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:17:7: Error: Getter not found: 'z'.
-//       z.print("Hello, World!") +
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:18:7: Error: Getter not found: 'y'.
-//       y.z.print("Hello, World!") +
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:19:7: Error: Getter not found: 'x'.
-//       x.y.z.print("Hello, World!");
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:15:7: Error: This expression has type 'void' and can't be used.
-//       print("Hello, World!") +
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:9:3: Error: Method not found: 'z'.
-  z(\"Hello, World!\");
-  ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:10:3: Error: Getter not found: 'z'.
-  z.print(\"Hello, World!\");
-  ^".print("Hello, World!");
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:11:3: Error: Getter not found: 'y'.
-  y.z.print(\"Hello, World!\");
-  ^".z.print("Hello, World!");
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:12:3: Error: Getter not found: 'x'.
-  x.y.z.print(\"Hello, World!\");
-  ^".y.z.print("Hello, World!");
-  1.{core::num::+}(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:15:7: Error: This expression has type 'void' and can't be used.
-      print(\"Hello, World!\") +
-      ^" in core::print("Hello, World!")).{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:16:7: Error: Method not found: 'z'.
-      z(\"Hello, World!\") +
-      ^" as{TypeError,ForDynamic} core::num*).{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:17:7: Error: Getter not found: 'z'.
-      z.print(\"Hello, World!\") +
-      ^".print("Hello, World!") as{TypeError,ForDynamic} core::num*).{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:18:7: Error: Getter not found: 'y'.
-      y.z.print(\"Hello, World!\") +
-      ^".z.print("Hello, World!") as{TypeError,ForDynamic} core::num*).{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:19:7: Error: Getter not found: 'x'.
-      x.y.z.print(\"Hello, World!\");
-      ^".y.z.print("Hello, World!") as{TypeError,ForDynamic} core::num*);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.transformed.expect
deleted file mode 100644
index 93219c5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart.weak.transformed.expect
+++ /dev/null
@@ -1,69 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:9:3: Error: Method not found: 'z'.
-//   z("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:10:3: Error: Getter not found: 'z'.
-//   z.print("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:11:3: Error: Getter not found: 'y'.
-//   y.z.print("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:12:3: Error: Getter not found: 'x'.
-//   x.y.z.print("Hello, World!");
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:16:7: Error: Method not found: 'z'.
-//       z("Hello, World!") +
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:17:7: Error: Getter not found: 'z'.
-//       z.print("Hello, World!") +
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:18:7: Error: Getter not found: 'y'.
-//       y.z.print("Hello, World!") +
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:19:7: Error: Getter not found: 'x'.
-//       x.y.z.print("Hello, World!");
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:15:7: Error: This expression has type 'void' and can't be used.
-//       print("Hello, World!") +
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print("Hello, World!");
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:9:3: Error: Method not found: 'z'.
-  z(\"Hello, World!\");
-  ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:10:3: Error: Getter not found: 'z'.
-  z.print(\"Hello, World!\");
-  ^".print("Hello, World!");
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:11:3: Error: Getter not found: 'y'.
-  y.z.print(\"Hello, World!\");
-  ^".z.print("Hello, World!");
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:12:3: Error: Getter not found: 'x'.
-  x.y.z.print(\"Hello, World!\");
-  ^".y.z.print("Hello, World!");
-  1.{core::num::+}(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:15:7: Error: This expression has type 'void' and can't be used.
-      print(\"Hello, World!\") +
-      ^" in core::print("Hello, World!")).{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:16:7: Error: Method not found: 'z'.
-      z(\"Hello, World!\") +
-      ^").{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:17:7: Error: Getter not found: 'z'.
-      z.print(\"Hello, World!\") +
-      ^".print("Hello, World!") as{TypeError,ForDynamic} core::num*).{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:18:7: Error: Getter not found: 'y'.
-      y.z.print(\"Hello, World!\") +
-      ^".z.print("Hello, World!") as{TypeError,ForDynamic} core::num*).{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/invocations.dart:19:7: Error: Getter not found: 'x'.
-      x.y.z.print(\"Hello, World!\");
-      ^".y.z.print("Hello, World!") as{TypeError,ForDynamic} core::num*);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart
deleted file mode 100644
index 877ac8e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-// 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.6
-
-abstract class A {}
-
-abstract class B {
-  void foo(num x);
-}
-
-abstract class C implements B {
-  void foo(covariant int x);
-}
-
-abstract class D1 implements A, C, B {
-  void foo(covariant int x);
-}
-
-class D2 implements A, C, B {
-  void foo(covariant int x) {}
-}
-
-abstract class D3 implements A, C, B {}
-
-abstract class D4 implements A, C, B {
-  void foo(int x);
-}
-
-abstract class D5 implements A, C, B {
-  void foo(num x);
-}
-
-abstract class E {
-  void set foo(num x);
-}
-
-abstract class G implements E {
-  void set foo(covariant int x);
-}
-
-abstract class H1 implements A, E, G {
-  void set foo(covariant int x);
-}
-
-class H2 implements A, E, G {
-  void set foo(covariant int x) {}
-}
-
-abstract class H3 implements A, E, G {}
-
-abstract class H4 implements A, E, G {
-  void set foo(int x);
-}
-
-abstract class H5 implements A, E, G {
-  void set foo(num x);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.textual_outline.expect
deleted file mode 100644
index 5f82a89..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.textual_outline.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-// @dart = 2.6
-abstract class A {}
-
-abstract class B {
-  void foo(num x);
-}
-
-abstract class C implements B {
-  void foo(covariant int x);
-}
-
-abstract class D1 implements A, C, B {
-  void foo(covariant int x);
-}
-
-class D2 implements A, C, B {
-  void foo(covariant int x) {}
-}
-
-abstract class D3 implements A, C, B {}
-
-abstract class D4 implements A, C, B {
-  void foo(int x);
-}
-
-abstract class D5 implements A, C, B {
-  void foo(num x);
-}
-
-abstract class E {
-  void set foo(num x);
-}
-
-abstract class G implements E {
-  void set foo(covariant int x);
-}
-
-abstract class H1 implements A, E, G {
-  void set foo(covariant int x);
-}
-
-class H2 implements A, E, G {
-  void set foo(covariant int x) {}
-}
-
-abstract class H3 implements A, E, G {}
-
-abstract class H4 implements A, E, G {
-  void set foo(int x);
-}
-
-abstract class H5 implements A, E, G {
-  void set foo(num x);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5031f69..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-// @dart = 2.6
-abstract class A {}
-
-abstract class B {
-  void foo(num x);
-}
-
-abstract class C implements B {
-  void foo(covariant int x);
-}
-
-abstract class D1 implements A, C, B {
-  void foo(covariant int x);
-}
-
-abstract class D3 implements A, C, B {}
-
-abstract class D4 implements A, C, B {
-  void foo(int x);
-}
-
-abstract class D5 implements A, C, B {
-  void foo(num x);
-}
-
-abstract class E {
-  void set foo(num x);
-}
-
-abstract class G implements E {
-  void set foo(covariant int x);
-}
-
-abstract class H1 implements A, E, G {
-  void set foo(covariant int x);
-}
-
-abstract class H3 implements A, E, G {}
-
-abstract class H4 implements A, E, G {
-  void set foo(int x);
-}
-
-abstract class H5 implements A, E, G {
-  void set foo(num x);
-}
-
-class D2 implements A, C, B {
-  void foo(covariant int x) {}
-}
-
-class H2 implements A, E, G {
-  void set foo(covariant int x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.expect
deleted file mode 100644
index a21207c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.expect
+++ /dev/null
@@ -1,244 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract method foo(core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C extends core::Object implements self::B {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D1 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D1*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D2 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D2*
-    : super core::Object::•()
-    ;
-  method foo(covariant core::int* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D3 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D3*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub method foo(covariant core::num* x) → void;
-}
-abstract class D4 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D4*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D5 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D5*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class E extends core::Object {
-  synthetic constructor •() → self::E*
-    : super core::Object::•()
-    ;
-  abstract set foo(core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class G extends core::Object implements self::E {
-  synthetic constructor •() → self::G*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H1 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H1*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class H2 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H2*
-    : super core::Object::•()
-    ;
-  set foo(covariant core::int* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H3 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H3*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub set foo(covariant core::num* x) → void;
-}
-abstract class H4 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H4*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H5 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H5*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.outline.expect
deleted file mode 100644
index 4a3fad8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.outline.expect
+++ /dev/null
@@ -1,232 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract method foo(core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C extends core::Object implements self::B {
-  synthetic constructor •() → self::C*
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D1 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D1*
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D2 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D2*
-    ;
-  method foo(covariant core::int* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D3 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D3*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub method foo(covariant core::num* x) → void;
-}
-abstract class D4 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D4*
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D5 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D5*
-    ;
-  abstract method foo(covariant core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class E extends core::Object {
-  synthetic constructor •() → self::E*
-    ;
-  abstract set foo(core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class G extends core::Object implements self::E {
-  synthetic constructor •() → self::G*
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H1 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H1*
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class H2 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H2*
-    ;
-  set foo(covariant core::int* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H3 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H3*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub set foo(covariant core::num* x) → void;
-}
-abstract class H4 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H4*
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H5 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H5*
-    ;
-  abstract set foo(covariant core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.transformed.expect
deleted file mode 100644
index a21207c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue129167943.dart.weak.transformed.expect
+++ /dev/null
@@ -1,244 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract method foo(core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C extends core::Object implements self::B {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D1 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D1*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D2 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D2*
-    : super core::Object::•()
-    ;
-  method foo(covariant core::int* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D3 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D3*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub method foo(covariant core::num* x) → void;
-}
-abstract class D4 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D4*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class D5 extends core::Object implements self::A, self::C, self::B {
-  synthetic constructor •() → self::D5*
-    : super core::Object::•()
-    ;
-  abstract method foo(covariant core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class E extends core::Object {
-  synthetic constructor •() → self::E*
-    : super core::Object::•()
-    ;
-  abstract set foo(core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class G extends core::Object implements self::E {
-  synthetic constructor •() → self::G*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H1 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H1*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class H2 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H2*
-    : super core::Object::•()
-    ;
-  set foo(covariant core::int* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H3 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H3*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract forwarding-stub set foo(covariant core::num* x) → void;
-}
-abstract class H4 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H4*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::int* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class H5 extends core::Object implements self::A, self::E, self::G {
-  synthetic constructor •() → self::H5*
-    : super core::Object::•()
-    ;
-  abstract set foo(covariant core::num* x) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart
deleted file mode 100644
index db2cecb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.6
-
-import "issue34515_lib1.dart";
-import "issue34515_lib2.dart";
-
-void test() {
-  ImportedClass(1);
-  ImportedClass("a");
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.textual_outline.expect
deleted file mode 100644
index 148d7dd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import "issue34515_lib1.dart";
-import "issue34515_lib2.dart";
-
-void test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.textual_outline_modelled.expect
deleted file mode 100644
index 2357783..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import "issue34515_lib1.dart";
-import "issue34515_lib2.dart";
-
-main() {}
-void test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.expect
deleted file mode 100644
index a2cf9f6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:11:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-//   ImportedClass(1);
-//   ^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:12:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-//   ImportedClass("a");
-//   ^^^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///issue34515_lib1.dart";
-import "org-dartlang-testcase:///issue34515_lib2.dart";
-
-static method test() → void {
-  let final core::Object* #t1 = 1 in invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:11:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-  ImportedClass(1);
-  ^^^^^^^^^^^^^";
-  let final core::Object* #t2 = "a" in invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:12:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-  ImportedClass(\"a\");
-  ^^^^^^^^^^^^^";
-}
-static method main() → dynamic {}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class ImportedClass extends core::Object {
-  constructor •(core::int* a) → self2::ImportedClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class ImportedClass extends core::Object {
-  constructor •(core::String* a) → self3::ImportedClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.outline.expect
deleted file mode 100644
index a6f6e10..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.outline.expect
+++ /dev/null
@@ -1,48 +0,0 @@
-library;
-import self as self;
-
-import "org-dartlang-testcase:///issue34515_lib1.dart";
-import "org-dartlang-testcase:///issue34515_lib2.dart";
-
-static method test() → void
-  ;
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class ImportedClass extends core::Object {
-  constructor •(core::int* a) → self2::ImportedClass*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class ImportedClass extends core::Object {
-  constructor •(core::String* a) → self3::ImportedClass*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.transformed.expect
deleted file mode 100644
index a2cf9f6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart.weak.transformed.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:11:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-//   ImportedClass(1);
-//   ^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:12:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-//   ImportedClass("a");
-//   ^^^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///issue34515_lib1.dart";
-import "org-dartlang-testcase:///issue34515_lib2.dart";
-
-static method test() → void {
-  let final core::Object* #t1 = 1 in invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:11:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-  ImportedClass(1);
-  ^^^^^^^^^^^^^";
-  let final core::Object* #t2 = "a" in invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue34515.dart:12:3: Error: 'ImportedClass' is imported from both 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart' and 'pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart'.
-  ImportedClass(\"a\");
-  ^^^^^^^^^^^^^";
-}
-static method main() → dynamic {}
-
-library;
-import self as self2;
-import "dart:core" as core;
-
-class ImportedClass extends core::Object {
-  constructor •(core::int* a) → self2::ImportedClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-
-library;
-import self as self3;
-import "dart:core" as core;
-
-class ImportedClass extends core::Object {
-  constructor •(core::String* a) → self3::ImportedClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart
deleted file mode 100644
index e6e53df..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib1.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-class ImportedClass {
-  ImportedClass(int a);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart
deleted file mode 100644
index ece1120..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34515_lib2.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-class ImportedClass {
-  ImportedClass(String a);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart
deleted file mode 100644
index f027368..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class Foo<T> {
-  final Future<dynamic> Function() quux;
-  T t;
-
-  Foo(this.quux, this.t);
-
-  Future<T> call() => quux().then<T>((_) => t);
-}
-
-class Bar {
-  Foo<Baz> qux;
-
-  Future<void> quuz() =>
-      qux().then((baz) => corge(baz)).then((grault) => garply(grault));
-
-  Grault corge(Baz baz) => null;
-
-  void garply(Grault grault) {}
-}
-
-class Baz {}
-
-class Grault {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.textual_outline.expect
deleted file mode 100644
index 45604e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.textual_outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-class Foo<T> {
-  final Future<dynamic> Function() quux;
-  T t;
-  Foo(this.quux, this.t);
-  Future<T> call() => quux().then<T>((_) => t);
-}
-
-class Bar {
-  Foo<Baz> qux;
-  Future<void> quuz() =>
-      qux().then((baz) => corge(baz)).then((grault) => garply(grault));
-  Grault corge(Baz baz) => null;
-  void garply(Grault grault) {}
-}
-
-class Baz {}
-
-class Grault {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.textual_outline_modelled.expect
deleted file mode 100644
index 67e1bed..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-class Bar {
-  Foo<Baz> qux;
-  Future<void> quuz() =>
-      qux().then((baz) => corge(baz)).then((grault) => garply(grault));
-  Grault corge(Baz baz) => null;
-  void garply(Grault grault) {}
-}
-
-class Baz {}
-
-class Foo<T> {
-  Foo(this.quux, this.t);
-  Future<T> call() => quux().then<T>((_) => t);
-  T t;
-  final Future<dynamic> Function() quux;
-}
-
-class Grault {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.expect
deleted file mode 100644
index 089fed4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  final field () →* asy::Future<dynamic>* quux;
-  generic-covariant-impl field self::Foo::T* t;
-  constructor •(() →* asy::Future<dynamic>* quux, self::Foo::T* t) → self::Foo<self::Foo::T*>*
-    : self::Foo::quux = quux, self::Foo::t = t, super core::Object::•()
-    ;
-  method call() → asy::Future<self::Foo::T*>*
-    return this.{self::Foo::quux}.call().{asy::Future::then}<self::Foo::T*>((dynamic _) → self::Foo::T* => this.{self::Foo::t});
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  field self::Foo<self::Baz*>* qux = null;
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  method quuz() → asy::Future<void>*
-    return this.{self::Bar::qux}.{self::Foo::call}().{asy::Future::then}<self::Grault*>((self::Baz* baz) → self::Grault* => this.{self::Bar::corge}(baz)).{asy::Future::then}<void>((self::Grault* grault) → void => this.{self::Bar::garply}(grault));
-  method corge(self::Baz* baz) → self::Grault*
-    return null;
-  method garply(self::Grault* grault) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Baz extends core::Object {
-  synthetic constructor •() → self::Baz*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Grault extends core::Object {
-  synthetic constructor •() → self::Grault*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.outline.expect
deleted file mode 100644
index ada0c39..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.outline.expect
+++ /dev/null
@@ -1,74 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  final field () →* asy::Future<dynamic>* quux;
-  generic-covariant-impl field self::Foo::T* t;
-  constructor •(() →* asy::Future<dynamic>* quux, self::Foo::T* t) → self::Foo<self::Foo::T*>*
-    ;
-  method call() → asy::Future<self::Foo::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  field self::Foo<self::Baz*>* qux;
-  synthetic constructor •() → self::Bar*
-    ;
-  method quuz() → asy::Future<void>*
-    ;
-  method corge(self::Baz* baz) → self::Grault*
-    ;
-  method garply(self::Grault* grault) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Baz extends core::Object {
-  synthetic constructor •() → self::Baz*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Grault extends core::Object {
-  synthetic constructor •() → self::Grault*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.transformed.expect
deleted file mode 100644
index 089fed4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue34899.dart.weak.transformed.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  final field () →* asy::Future<dynamic>* quux;
-  generic-covariant-impl field self::Foo::T* t;
-  constructor •(() →* asy::Future<dynamic>* quux, self::Foo::T* t) → self::Foo<self::Foo::T*>*
-    : self::Foo::quux = quux, self::Foo::t = t, super core::Object::•()
-    ;
-  method call() → asy::Future<self::Foo::T*>*
-    return this.{self::Foo::quux}.call().{asy::Future::then}<self::Foo::T*>((dynamic _) → self::Foo::T* => this.{self::Foo::t});
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  field self::Foo<self::Baz*>* qux = null;
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  method quuz() → asy::Future<void>*
-    return this.{self::Bar::qux}.{self::Foo::call}().{asy::Future::then}<self::Grault*>((self::Baz* baz) → self::Grault* => this.{self::Bar::corge}(baz)).{asy::Future::then}<void>((self::Grault* grault) → void => this.{self::Bar::garply}(grault));
-  method corge(self::Baz* baz) → self::Grault*
-    return null;
-  method garply(self::Grault* grault) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Baz extends core::Object {
-  synthetic constructor •() → self::Baz*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Grault extends core::Object {
-  synthetic constructor •() → self::Grault*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart
deleted file mode 100644
index e07b191..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-class A {
-  int a;
-  A(int a) {
-    (this).a = a;
-  }
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.textual_outline.expect
deleted file mode 100644
index 1db249f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class A {
-  int a;
-  A(int a) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.textual_outline_modelled.expect
deleted file mode 100644
index 1369a93..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class A {
-  A(int a) {}
-  int a;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.expect
deleted file mode 100644
index fe26450..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* a = null;
-  constructor •(core::int* a) → self::A*
-    : super core::Object::•() {
-    this.{self::A::a} = a;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.outline.expect
deleted file mode 100644
index f25c2ca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* a;
-  constructor •(core::int* a) → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.transformed.expect
deleted file mode 100644
index fe26450..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue35875.dart.weak.transformed.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* a = null;
-  constructor •(core::int* a) → self::A*
-    : super core::Object::•() {
-    this.{self::A::a} = a;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart
deleted file mode 100644
index b49b617..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.6
-
-class C {
-  final Set<int> s;
-  C(List<int> ell) : s = {for (var e in ell) if (e.isOdd) 2 * e};
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.textual_outline.expect
deleted file mode 100644
index be597eb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class C {
-  final Set<int> s;
-  C(List<int> ell)
-      : s = {
-          for (var e in ell)
-            if (e.isOdd) 2 * e
-        };
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.textual_outline_modelled.expect
deleted file mode 100644
index d3c4d06..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class C {
-  C(List<int> ell)
-      : s = {
-          for (var e in ell)
-            if (e.isOdd) 2 * e
-        };
-  final Set<int> s;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.expect
deleted file mode 100644
index d66702b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-class C extends core::Object {
-  final field core::Set<core::int*>* s;
-  constructor •(core::List<core::int*>* ell) → self::C*
-    : self::C::s = block {
-      final core::Set<core::int*>* #t1 = col::LinkedHashSet::•<core::int*>();
-      for (core::int* e in ell)
-        if(e.{core::int::isOdd})
-          #t1.{core::Set::add}{Invariant}(2.{core::num::*}(e));
-    } =>#t1, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.outline.expect
deleted file mode 100644
index 5e84591..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  final field core::Set<core::int*>* s;
-  constructor •(core::List<core::int*>* ell) → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.transformed.expect
deleted file mode 100644
index fa88301..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37027.dart.weak.transformed.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-class C extends core::Object {
-  final field core::Set<core::int*>* s;
-  constructor •(core::List<core::int*>* ell) → self::C*
-    : self::C::s = block {
-      final core::Set<core::int*>* #t1 = new col::_CompactLinkedHashSet::•<core::int*>();
-      {
-        core::Iterator<core::int*>* :sync-for-iterator = ell.{core::Iterable::iterator};
-        for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-          core::int* e = :sync-for-iterator.{core::Iterator::current};
-          if(e.{core::int::isOdd})
-            #t1.{core::Set::add}{Invariant}(2.{core::num::*}(e));
-        }
-      }
-    } =>#t1, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart
deleted file mode 100644
index abefa5b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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.6
-
-// This test checks that the bug reported at http://dartbug.com/37381 is fixed.
-
-class A<X> {
-  R f<R>(R Function<X>(A<X>) f) => f<X>(this);
-}
-
-main() {
-  A<num> a = A<int>();
-  a.f(<X>(_) => 42);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.textual_outline.expect
deleted file mode 100644
index 6761b51..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-class A<X> {
-  R f<R>(R Function<X>(A<X>) f) => f<X>(this);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6761b51..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-class A<X> {
-  R f<R>(R Function<X>(A<X>) f) => f<X>(this);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.expect
deleted file mode 100644
index dee4ed1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  method f<R extends core::Object* = dynamic>(<X extends core::Object* = dynamic>(self::A<X*>*) →* self::A::f::R* f) → self::A::f::R*
-    return f.call<self::A::X*>(this);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::A<core::num*>* a = new self::A::•<core::int*>();
-  a.{self::A::f}<core::int*>(<X extends core::Object* = dynamic>(self::A<X*>* _) → core::int* => 42);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.outline.expect
deleted file mode 100644
index a22155d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    ;
-  method f<R extends core::Object* = dynamic>(<X extends core::Object* = dynamic>(self::A<X*>*) →* self::A::f::R* f) → self::A::f::R*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.transformed.expect
deleted file mode 100644
index dee4ed1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37381.dart.weak.transformed.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  method f<R extends core::Object* = dynamic>(<X extends core::Object* = dynamic>(self::A<X*>*) →* self::A::f::R* f) → self::A::f::R*
-    return f.call<self::A::X*>(this);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::A<core::num*>* a = new self::A::•<core::int*>();
-  a.{self::A::f}<core::int*>(<X extends core::Object* = dynamic>(self::A<X*>* _) → core::int* => 42);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart
deleted file mode 100644
index baf5d94..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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.6
-
-// This test checks that the bug reported at http://dartbug.com/37776 is fixed.
-
-class X {
-  const X.foo();
-}
-
-class X {
-  const X.foo();
-}
-
-void main() {
-  const X.foo();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.textual_outline.expect
deleted file mode 100644
index a6efc6f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class X {
-  const X.foo();
-}
-
-class X {
-  const X.foo();
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.textual_outline_modelled.expect
deleted file mode 100644
index a6efc6f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class X {
-  const X.foo();
-}
-
-class X {
-  const X.foo();
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.expect
deleted file mode 100644
index eec8b7d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:13:7: Error: 'X' is already declared in this scope.
-// class X {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:9:7: Context: Previous declaration of 'X'.
-// class X {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:18:9: Error: Method not found: 'X.foo'.
-//   const X.foo();
-//         ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class X#1 extends core::Object /*hasConstConstructor*/  {
-  const constructor foo() → self::X#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object /*hasConstConstructor*/  {
-  const constructor foo() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:18:9: Error: Method not found: 'X.foo'.
-  const X.foo();
-        ^^^";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.outline.expect
deleted file mode 100644
index 29b0340..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.outline.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:13:7: Error: 'X' is already declared in this scope.
-// class X {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:9:7: Context: Previous declaration of 'X'.
-// class X {
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class X#1 extends core::Object /*hasConstConstructor*/  {
-  const constructor foo() → self::X#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object /*hasConstConstructor*/  {
-  const constructor foo() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.transformed.expect
deleted file mode 100644
index eec8b7d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart.weak.transformed.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:13:7: Error: 'X' is already declared in this scope.
-// class X {
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:9:7: Context: Previous declaration of 'X'.
-// class X {
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:18:9: Error: Method not found: 'X.foo'.
-//   const X.foo();
-//         ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class X#1 extends core::Object /*hasConstConstructor*/  {
-  const constructor foo() → self::X#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object /*hasConstConstructor*/  {
-  const constructor foo() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue37776.dart:18:9: Error: Method not found: 'X.foo'.
-  const X.foo();
-        ^^^";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart
deleted file mode 100644
index 9a40d09..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-typedef G<X> = void Function();
-
-class A<X extends G<A<Y, X>>, Y extends G<A<X, Y>>> {}
-
-main() {
-  A();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.textual_outline.expect
deleted file mode 100644
index bc1d3b5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-typedef G<X> = void Function();
-
-class A<X extends G<A<Y, X>>, Y extends G<A<X, Y>>> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.textual_outline_modelled.expect
deleted file mode 100644
index 3a99d60..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class A<X extends G<A<Y, X>>, Y extends G<A<X, Y>>> {}
-
-main() {}
-typedef G<X> = void Function();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.expect
deleted file mode 100644
index 07ce423..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef G<unrelated X extends core::Object* = dynamic> = () →* void;
-class A<X extends () →* void = () →* void, Y extends () →* void = () →* void> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*, self::A::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•<() →* void, () →* void>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.outline.expect
deleted file mode 100644
index b09f203..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef G<unrelated X extends core::Object* = dynamic> = () →* void;
-class A<X extends () →* void = () →* void, Y extends () →* void = () →* void> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*, self::A::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.transformed.expect
deleted file mode 100644
index 07ce423..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38812.dart.weak.transformed.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef G<unrelated X extends core::Object* = dynamic> = () →* void;
-class A<X extends () →* void = () →* void, Y extends () →* void = () →* void> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*, self::A::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•<() →* void, () →* void>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart
deleted file mode 100644
index a8cb1ab..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.6
-
-class A {
-  int v;
-  int v;
-  A(this.v);
-  A.second();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.textual_outline.expect
deleted file mode 100644
index 82a3e53..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class A {
-  int v;
-  int v;
-  A(this.v);
-  A.second();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6f239ae..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class A {
-  A(this.v);
-  A.second();
-  int v;
-  int v;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.expect
deleted file mode 100644
index 227ba25..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:9:7: Error: 'v' is already declared in this scope.
-//   int v;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:8:7: Context: Previous declaration of 'v'.
-//   int v;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:10:10: Error: Can't use 'v' because it is declared more than once.
-//   A(this.v);
-//          ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* v = null;
-  constructor •(core::int* v) → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:10:10: Error: Can't use 'v' because it is declared more than once.
-  A(this.v);
-         ^"
-    ;
-  constructor second() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.outline.expect
deleted file mode 100644
index 1281bf2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.outline.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:9:7: Error: 'v' is already declared in this scope.
-//   int v;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:8:7: Context: Previous declaration of 'v'.
-//   int v;
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* v;
-  constructor •(core::int* v) → self::A*
-    ;
-  constructor second() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.transformed.expect
deleted file mode 100644
index 227ba25..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart.weak.transformed.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:9:7: Error: 'v' is already declared in this scope.
-//   int v;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:8:7: Context: Previous declaration of 'v'.
-//   int v;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:10:10: Error: Can't use 'v' because it is declared more than once.
-//   A(this.v);
-//          ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::int* v = null;
-  constructor •(core::int* v) → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue38938.dart:10:10: Error: Can't use 'v' because it is declared more than once.
-  A(this.v);
-         ^"
-    ;
-  constructor second() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart
deleted file mode 100644
index d5198cb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-class D<X extends void Function()> {
-  factory D.foo() => new D._();
-  D._() {}
-}
-
-main() {
-  print(new D.foo());
-}
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.textual_outline.expect
deleted file mode 100644
index 84dc47f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class D<X extends void Function()> {
-  factory D.foo() => new D._();
-  D._() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.textual_outline_modelled.expect
deleted file mode 100644
index a160055..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class D<X extends void Function()> {
-  D._() {}
-  factory D.foo() => new D._();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.expect
deleted file mode 100644
index c85022a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class D<X extends () →* void = () →* void> extends core::Object {
-  constructor _() → self::D<self::D::X*>*
-    : super core::Object::•() {}
-  static factory foo<X extends () →* void = () →* void>() → self::D<self::D::foo::X*>*
-    return new self::D::_<self::D::foo::X*>();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::print(self::D::foo<() →* void>());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.outline.expect
deleted file mode 100644
index 0c892f9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class D<X extends () →* void = () →* void> extends core::Object {
-  constructor _() → self::D<self::D::X*>*
-    ;
-  static factory foo<X extends () →* void = () →* void>() → self::D<self::D::foo::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.transformed.expect
deleted file mode 100644
index c85022a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38943.dart.weak.transformed.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class D<X extends () →* void = () →* void> extends core::Object {
-  constructor _() → self::D<self::D::X*>*
-    : super core::Object::•() {}
-  static factory foo<X extends () →* void = () →* void>() → self::D<self::D::foo::X*>*
-    return new self::D::_<self::D::foo::X*>();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::print(self::D::foo<() →* void>());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart
deleted file mode 100644
index f2739ee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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.6
-
-class A<Q> {}
-class B<X> extends Object with A<void Function<Y extends X>()> {}
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.textual_outline.expect
deleted file mode 100644
index 3b0969c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class A<Q> {}
-
-class B<X> extends Object with A<void Function<Y extends X>()> {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.textual_outline_modelled.expect
deleted file mode 100644
index 3b0969c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class A<Q> {}
-
-class B<X> extends Object with A<void Function<Y extends X>()> {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.expect
deleted file mode 100644
index ad89036..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart:8:7: Error: Can't use implicitly 'out' variable 'X' in an 'inout' position in supertype 'A'.
-// class B<X> extends Object with A<void Function<Y extends X>()> {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A<Q extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::Q*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&A<X extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&A<self::_B&Object&A::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<X extends core::Object* = dynamic> extends self::_B&Object&A<self::B::X*> {
-  synthetic constructor •() → self::B<self::B::X*>*
-    : super self::_B&Object&A::•()
-    ;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.outline.expect
deleted file mode 100644
index c3137e6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.outline.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart:8:7: Error: Can't use implicitly 'out' variable 'X' in an 'inout' position in supertype 'A'.
-// class B<X> extends Object with A<void Function<Y extends X>()> {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A<Q extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::Q*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&A<X extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&A<self::_B&Object&A::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<X extends core::Object* = dynamic> extends self::_B&Object&A<self::B::X*> {
-  synthetic constructor •() → self::B<self::B::X*>*
-    ;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.transformed.expect
deleted file mode 100644
index ad89036..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart.weak.transformed.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38944.dart:8:7: Error: Can't use implicitly 'out' variable 'X' in an 'inout' position in supertype 'A'.
-// class B<X> extends Object with A<void Function<Y extends X>()> {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A<Q extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::Q*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&A<X extends core::Object* = dynamic> extends core::Object /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&A<self::_B&Object&A::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<X extends core::Object* = dynamic> extends self::_B&Object&A<self::B::X*> {
-  synthetic constructor •() → self::B<self::B::X*>*
-    : super self::_B&Object&A::•()
-    ;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart
deleted file mode 100644
index 6a23d12..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// 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.6
-
-class C {
-  dynamic x = this;
-  var x = this;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.textual_outline.expect
deleted file mode 100644
index 41ad065..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class C {
-  dynamic x = this;
-  var x = this;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.textual_outline_modelled.expect
deleted file mode 100644
index 41ad065..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class C {
-  dynamic x = this;
-  var x = this;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.expect
deleted file mode 100644
index 646f343..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:9:7: Error: 'x' is already declared in this scope.
-//   var x = this;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:8:11: Context: Previous declaration of 'x'.
-//   dynamic x = this;
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:8:15: Error: Can't access 'this' in a field initializer.
-//   dynamic x = this;
-//               ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:9:11: Error: Can't access 'this' in a field initializer.
-//   var x = this;
-//           ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic x = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.outline.expect
deleted file mode 100644
index cad9ffd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.outline.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:9:7: Error: 'x' is already declared in this scope.
-//   var x = this;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:8:11: Context: Previous declaration of 'x'.
-//   dynamic x = this;
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic x;
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.transformed.expect
deleted file mode 100644
index 646f343..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart.weak.transformed.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:9:7: Error: 'x' is already declared in this scope.
-//   var x = this;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:8:11: Context: Previous declaration of 'x'.
-//   dynamic x = this;
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:8:15: Error: Can't access 'this' in a field initializer.
-//   dynamic x = this;
-//               ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue38961.dart:9:11: Error: Can't access 'this' in a field initializer.
-//   var x = this;
-//           ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic x = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart
deleted file mode 100644
index d08533b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart
+++ /dev/null
@@ -1,88 +0,0 @@
-// 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.6
-
-class A {}
-
-class B extends A {}
-
-List<B> xs;
-List<List<B>> xss;
-
-class Class<T extends A> {
-  void method1a(T t) {
-    if (t is B) {
-      // `t` is now promoted to T & B
-
-      // The list literal has type List<T>, not List<T & B>
-      var ys = [t];
-      xs = ys;
-    }
-  }
-
-  void method1b(T t) {
-    if (t is B) {
-      // `t` is now promoted to T & B
-
-      // The list literal has type List<List<T>>, not List<List<T & B>>
-      var yss = [
-        [t]
-      ];
-      xss = yss;
-    }
-  }
-
-  void method2a(T t) {
-    dynamic alias;
-    if (t is B) {
-      // `t` is now promoted to T & B
-
-      // The list literal has type List<T>, not List<T & B>
-      var ys = [t];
-      alias = ys;
-      xs = alias;
-    }
-  }
-
-  void method2b(T t) {
-    dynamic alias;
-    if (t is B) {
-      // `t` is now promoted to T & B
-
-      // The list literal has type List<List<T>>, not List<List<T & B>>
-      var yss = [
-        [t]
-      ];
-      alias = yss;
-      xss = alias;
-    }
-  }
-}
-
-void main() {
-  throws(() {
-    Class<A>().method2a(B());
-    print(xs.runtimeType); // 'List<A>'.
-  });
-  throws(() {
-    Class<A>().method2b(B());
-    print(xs.runtimeType); // 'List<A>'.
-  });
-}
-
-void errors() {
-  Class<A>().method1a(B());
-  Class<A>().method1b(B());
-}
-
-void throws(void Function() f) {
-  try {
-    f();
-  } catch (e) {
-    print(e);
-    return;
-  }
-  throw 'Expected throws';
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.textual_outline.expect
deleted file mode 100644
index 9226278..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.textual_outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-List<B> xs;
-List<List<B>> xss;
-
-class Class<T extends A> {
-  void method1a(T t) {}
-  void method1b(T t) {}
-  void method2a(T t) {}
-  void method2b(T t) {}
-}
-
-void main() {}
-void errors() {}
-void throws(void Function() f) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.textual_outline_modelled.expect
deleted file mode 100644
index ba257d0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-List<B> xs;
-List<List<B>> xss;
-
-class A {}
-
-class B extends A {}
-
-class Class<T extends A> {
-  void method1a(T t) {}
-  void method1b(T t) {}
-  void method2a(T t) {}
-  void method2b(T t) {}
-}
-
-void errors() {}
-void main() {}
-void throws(void Function() f) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.expect
deleted file mode 100644
index 7874ca5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.expect
+++ /dev/null
@@ -1,116 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:21:12: Error: A value of type 'List<T>' can't be assigned to a variable of type 'List<B>'.
-//  - 'List' is from 'dart:core'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-//       xs = ys;
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:33:13: Error: A value of type 'List<List<T>>' can't be assigned to a variable of type 'List<List<B>>'.
-//  - 'List' is from 'dart:core'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-//       xss = yss;
-//             ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class Class<T extends self::A* = self::A*> extends core::Object {
-  synthetic constructor •() → self::Class<self::Class::T*>*
-    : super core::Object::•()
-    ;
-  method method1a(generic-covariant-impl self::Class::T* t) → void {
-    if(t is self::B*) {
-      core::List<self::Class::T*>* ys = <self::Class::T*>[t{self::Class::T* & self::B* /* '*' & '*' = '*' */}];
-      self::xs = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:21:12: Error: A value of type 'List<T>' can't be assigned to a variable of type 'List<B>'.
- - 'List' is from 'dart:core'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-      xs = ys;
-           ^" in ys as{TypeError} core::List<self::B*>*;
-    }
-  }
-  method method1b(generic-covariant-impl self::Class::T* t) → void {
-    if(t is self::B*) {
-      core::List<core::List<self::Class::T*>*>* yss = <core::List<self::Class::T*>*>[<self::Class::T*>[t{self::Class::T* & self::B* /* '*' & '*' = '*' */}]];
-      self::xss = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:33:13: Error: A value of type 'List<List<T>>' can't be assigned to a variable of type 'List<List<B>>'.
- - 'List' is from 'dart:core'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-      xss = yss;
-            ^" in yss as{TypeError} core::List<core::List<self::B*>*>*;
-    }
-  }
-  method method2a(generic-covariant-impl self::Class::T* t) → void {
-    dynamic alias;
-    if(t is self::B*) {
-      core::List<self::Class::T*>* ys = <self::Class::T*>[t{self::Class::T* & self::B* /* '*' & '*' = '*' */}];
-      alias = ys;
-      self::xs = alias as{TypeError,ForDynamic} core::List<self::B*>*;
-    }
-  }
-  method method2b(generic-covariant-impl self::Class::T* t) → void {
-    dynamic alias;
-    if(t is self::B*) {
-      core::List<core::List<self::Class::T*>*>* yss = <core::List<self::Class::T*>*>[<self::Class::T*>[t{self::Class::T* & self::B* /* '*' & '*' = '*' */}]];
-      alias = yss;
-      self::xss = alias as{TypeError,ForDynamic} core::List<core::List<self::B*>*>*;
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::List<self::B*>* xs;
-static field core::List<core::List<self::B*>*>* xss;
-static method main() → void {
-  self::throws(() → Null {
-    new self::Class::•<self::A*>().{self::Class::method2a}(new self::B::•());
-    core::print(self::xs.{core::Object::runtimeType});
-  });
-  self::throws(() → Null {
-    new self::Class::•<self::A*>().{self::Class::method2b}(new self::B::•());
-    core::print(self::xs.{core::Object::runtimeType});
-  });
-}
-static method errors() → void {
-  new self::Class::•<self::A*>().{self::Class::method1a}(new self::B::•());
-  new self::Class::•<self::A*>().{self::Class::method1b}(new self::B::•());
-}
-static method throws(() →* void f) → void {
-  try {
-    f.call();
-  }
-  on dynamic catch(final dynamic e) {
-    core::print(e);
-    return;
-  }
-  throw "Expected throws";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.outline.expect
deleted file mode 100644
index fbf21ce..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.outline.expect
+++ /dev/null
@@ -1,52 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class Class<T extends self::A* = self::A*> extends core::Object {
-  synthetic constructor •() → self::Class<self::Class::T*>*
-    ;
-  method method1a(generic-covariant-impl self::Class::T* t) → void
-    ;
-  method method1b(generic-covariant-impl self::Class::T* t) → void
-    ;
-  method method2a(generic-covariant-impl self::Class::T* t) → void
-    ;
-  method method2b(generic-covariant-impl self::Class::T* t) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::List<self::B*>* xs;
-static field core::List<core::List<self::B*>*>* xss;
-static method main() → void
-  ;
-static method errors() → void
-  ;
-static method throws(() →* void f) → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.transformed.expect
deleted file mode 100644
index b28b175..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart.weak.transformed.expect
+++ /dev/null
@@ -1,116 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:21:12: Error: A value of type 'List<T>' can't be assigned to a variable of type 'List<B>'.
-//  - 'List' is from 'dart:core'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-//       xs = ys;
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:33:13: Error: A value of type 'List<List<T>>' can't be assigned to a variable of type 'List<List<B>>'.
-//  - 'List' is from 'dart:core'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-//       xss = yss;
-//             ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class Class<T extends self::A* = self::A*> extends core::Object {
-  synthetic constructor •() → self::Class<self::Class::T*>*
-    : super core::Object::•()
-    ;
-  method method1a(generic-covariant-impl self::Class::T* t) → void {
-    if(t is self::B*) {
-      core::List<self::Class::T*>* ys = core::_GrowableList::_literal1<self::Class::T*>(t{self::Class::T* & self::B* /* '*' & '*' = '*' */});
-      self::xs = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:21:12: Error: A value of type 'List<T>' can't be assigned to a variable of type 'List<B>'.
- - 'List' is from 'dart:core'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-      xs = ys;
-           ^" in ys as{TypeError} core::List<self::B*>*;
-    }
-  }
-  method method1b(generic-covariant-impl self::Class::T* t) → void {
-    if(t is self::B*) {
-      core::List<core::List<self::Class::T*>*>* yss = core::_GrowableList::_literal1<core::List<self::Class::T*>*>(core::_GrowableList::_literal1<self::Class::T*>(t{self::Class::T* & self::B* /* '*' & '*' = '*' */}));
-      self::xss = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart:33:13: Error: A value of type 'List<List<T>>' can't be assigned to a variable of type 'List<List<B>>'.
- - 'List' is from 'dart:core'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/issue39344.dart'.
-      xss = yss;
-            ^" in yss as{TypeError} core::List<core::List<self::B*>*>*;
-    }
-  }
-  method method2a(generic-covariant-impl self::Class::T* t) → void {
-    dynamic alias;
-    if(t is self::B*) {
-      core::List<self::Class::T*>* ys = core::_GrowableList::_literal1<self::Class::T*>(t{self::Class::T* & self::B* /* '*' & '*' = '*' */});
-      alias = ys;
-      self::xs = alias as{TypeError,ForDynamic} core::List<self::B*>*;
-    }
-  }
-  method method2b(generic-covariant-impl self::Class::T* t) → void {
-    dynamic alias;
-    if(t is self::B*) {
-      core::List<core::List<self::Class::T*>*>* yss = core::_GrowableList::_literal1<core::List<self::Class::T*>*>(core::_GrowableList::_literal1<self::Class::T*>(t{self::Class::T* & self::B* /* '*' & '*' = '*' */}));
-      alias = yss;
-      self::xss = alias as{TypeError,ForDynamic} core::List<core::List<self::B*>*>*;
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::List<self::B*>* xs;
-static field core::List<core::List<self::B*>*>* xss;
-static method main() → void {
-  self::throws(() → Null {
-    new self::Class::•<self::A*>().{self::Class::method2a}(new self::B::•());
-    core::print(self::xs.{core::Object::runtimeType});
-  });
-  self::throws(() → Null {
-    new self::Class::•<self::A*>().{self::Class::method2b}(new self::B::•());
-    core::print(self::xs.{core::Object::runtimeType});
-  });
-}
-static method errors() → void {
-  new self::Class::•<self::A*>().{self::Class::method1a}(new self::B::•());
-  new self::Class::•<self::A*>().{self::Class::method1b}(new self::B::•());
-}
-static method throws(() →* void f) → void {
-  try {
-    f.call();
-  }
-  on dynamic catch(final dynamic e) {
-    core::print(e);
-    return;
-  }
-  throw "Expected throws";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart
deleted file mode 100644
index 97e736e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.6
-
-// This is a regression test for http://dartbug.com/39421.
-
-class A {}
-
-class A {}
-
-class B {
-  foo(List<Null> a) {}
-}
-
-class C extends B {
-  foo(List<A> a) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.textual_outline.expect
deleted file mode 100644
index b597c8a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class A {}
-
-class B {
-  foo(List<Null> a) {}
-}
-
-class C extends B {
-  foo(List<A> a) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.textual_outline_modelled.expect
deleted file mode 100644
index b597c8a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class A {}
-
-class B {
-  foo(List<Null> a) {}
-}
-
-class C extends B {
-  foo(List<A> a) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.expect
deleted file mode 100644
index c9cb480..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.expect
+++ /dev/null
@@ -1,78 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:11:7: Error: 'A' is already declared in this scope.
-// class A {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:9:7: Context: Previous declaration of 'A'.
-// class A {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Error: 'A' isn't a type.
-//   foo(List<A> a) {}
-//            ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Context: This isn't a type.
-//   foo(List<A> a) {}
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Error: Can't use 'A' because it is declared more than once.
-//   foo(List<A> a) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A#1 extends core::Object {
-  synthetic constructor •() → self::A#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  method foo(core::List<Null>* a) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-  method foo(core::List<invalid-type>* a) → dynamic {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.outline.expect
deleted file mode 100644
index aabd160..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.outline.expect
+++ /dev/null
@@ -1,73 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:11:7: Error: 'A' is already declared in this scope.
-// class A {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:9:7: Context: Previous declaration of 'A'.
-// class A {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Error: 'A' isn't a type.
-//   foo(List<A> a) {}
-//            ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Context: This isn't a type.
-//   foo(List<A> a) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A#1 extends core::Object {
-  synthetic constructor •() → self::A#1*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  method foo(core::List<Null>* a) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    ;
-  method foo(core::List<invalid-type>* a) → dynamic
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.transformed.expect
deleted file mode 100644
index c9cb480..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart.weak.transformed.expect
+++ /dev/null
@@ -1,78 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:11:7: Error: 'A' is already declared in this scope.
-// class A {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:9:7: Context: Previous declaration of 'A'.
-// class A {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Error: 'A' isn't a type.
-//   foo(List<A> a) {}
-//            ^
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Context: This isn't a type.
-//   foo(List<A> a) {}
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/issue39421.dart:18:12: Error: Can't use 'A' because it is declared more than once.
-//   foo(List<A> a) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A#1 extends core::Object {
-  synthetic constructor •() → self::A#1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  method foo(core::List<Null>* a) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-  method foo(core::List<invalid-type>* a) → dynamic {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart b/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart
deleted file mode 100644
index 57e4039..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-// This is a regression test for http://dartbug.com/39817.
-
-foo() {
-  Null _null;
-  for(var i in _null) {};
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.textual_outline.expect
deleted file mode 100644
index 41dbdca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-foo() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.textual_outline_modelled.expect
deleted file mode 100644
index 41dbdca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-foo() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.expect
deleted file mode 100644
index cad4f51..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-
-static method foo() → dynamic {
-  Null _null;
-  for (dynamic i in _null) {
-  }
-  ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.outline.expect
deleted file mode 100644
index 07ce31d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method foo() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.transformed.expect
deleted file mode 100644
index cad4f51..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/issue39817.dart.weak.transformed.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-
-static method foo() → dynamic {
-  Null _null;
-  for (dynamic i in _null) {
-  }
-  ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart b/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart
deleted file mode 100644
index 60454a7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-testString() {
-  print("a");
-}
-
-testInt() {
-  print(1);
-}
-
-testBool() {
-  print(true);
-  print(false);
-}
-
-testDouble() {
-  print(1.0);
-}
-
-testNull() {
-  print(null);
-}
-
-testList() {
-  print([]);
-  print(["a", "b"]);
-}
-
-testMap() {
-  print({});
-  print({"a": "b"});
-}
-
-testSymbol() {
-  print(#fisk);
-  print(#_fisk);
-  print(#fisk.hest.ko);
-}
-
-main() {
-  testString();
-  testInt();
-  testBool();
-  testDouble();
-  testNull();
-  testList();
-  testMap();
-  testSymbol();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.textual_outline.expect
deleted file mode 100644
index 4ac4f62..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-testString() {}
-testInt() {}
-testBool() {}
-testDouble() {}
-testNull() {}
-testList() {}
-testMap() {}
-testSymbol() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.textual_outline_modelled.expect
deleted file mode 100644
index ae913a9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-main() {}
-testBool() {}
-testDouble() {}
-testInt() {}
-testList() {}
-testMap() {}
-testNull() {}
-testString() {}
-testSymbol() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.expect
deleted file mode 100644
index 8ef3e48..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method testString() → dynamic {
-  core::print("a");
-}
-static method testInt() → dynamic {
-  core::print(1);
-}
-static method testBool() → dynamic {
-  core::print(true);
-  core::print(false);
-}
-static method testDouble() → dynamic {
-  core::print(1.0);
-}
-static method testNull() → dynamic {
-  core::print(null);
-}
-static method testList() → dynamic {
-  core::print(<dynamic>[]);
-  core::print(<core::String*>["a", "b"]);
-}
-static method testMap() → dynamic {
-  core::print(<dynamic, dynamic>{});
-  core::print(<core::String*, core::String*>{"a": "b"});
-}
-static method testSymbol() → dynamic {
-  core::print(#C1);
-  core::print(#C2);
-  core::print(#C3);
-}
-static method main() → dynamic {
-  self::testString();
-  self::testInt();
-  self::testBool();
-  self::testDouble();
-  self::testNull();
-  self::testList();
-  self::testMap();
-  self::testSymbol();
-}
-
-constants  {
-  #C1 = #fisk
-  #C2 = #org-dartlang-testcase:///literals.dart::_fisk
-  #C3 = #fisk.hest.ko
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.outline.expect
deleted file mode 100644
index ffc79f2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-library;
-import self as self;
-
-static method testString() → dynamic
-  ;
-static method testInt() → dynamic
-  ;
-static method testBool() → dynamic
-  ;
-static method testDouble() → dynamic
-  ;
-static method testNull() → dynamic
-  ;
-static method testList() → dynamic
-  ;
-static method testMap() → dynamic
-  ;
-static method testSymbol() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.transformed.expect
deleted file mode 100644
index ae7c90f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/literals.dart.weak.transformed.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method testString() → dynamic {
-  core::print("a");
-}
-static method testInt() → dynamic {
-  core::print(1);
-}
-static method testBool() → dynamic {
-  core::print(true);
-  core::print(false);
-}
-static method testDouble() → dynamic {
-  core::print(1.0);
-}
-static method testNull() → dynamic {
-  core::print(null);
-}
-static method testList() → dynamic {
-  core::print(core::_GrowableList::•<dynamic>(0));
-  core::print(core::_GrowableList::_literal2<core::String*>("a", "b"));
-}
-static method testMap() → dynamic {
-  core::print(<dynamic, dynamic>{});
-  core::print(<core::String*, core::String*>{"a": "b"});
-}
-static method testSymbol() → dynamic {
-  core::print(#C1);
-  core::print(#C2);
-  core::print(#C3);
-}
-static method main() → dynamic {
-  self::testString();
-  self::testInt();
-  self::testBool();
-  self::testDouble();
-  self::testNull();
-  self::testList();
-  self::testMap();
-  self::testSymbol();
-}
-
-constants  {
-  #C1 = #fisk
-  #C2 = #org-dartlang-testcase:///literals.dart::_fisk
-  #C3 = #fisk.hest.ko
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart b/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart
deleted file mode 100644
index 421ad73..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-main() {
-  T f<T>(List<T> l) => l[0];
-  var x = f([0]);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.expect
deleted file mode 100644
index 487fec1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  function f<T extends core::Object* = dynamic>(core::List<T*>* l) → T*
-    return l.{core::List::[]}(0);
-  core::int* x = f.call<core::int*>(<core::int*>[0]);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.transformed.expect
deleted file mode 100644
index 328d4cc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/local_generic_function.dart.weak.transformed.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  function f<T extends core::Object* = dynamic>(core::List<T*>* l) → T*
-    return l.{core::List::[]}(0);
-  core::int* x = f.call<core::int*>(core::_GrowableList::_literal1<core::int*>(0));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart b/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart
deleted file mode 100644
index 6638425..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// Test for potentially slow compilation of long typedef dependency chains.
-
-typedef Foo01<X, Y, Z> = void Function(Null);
-typedef Foo02<X, Y, Z> = void Function(Foo01<X, Y, Z>);
-typedef Foo03<X, Y, Z> = void Function(Foo02<X, Y, Z>);
-typedef Foo04<X, Y, Z> = void Function(Foo03<X, Y, Z>);
-typedef Foo05<X, Y, Z> = void Function(Foo04<X, Y, Z>);
-typedef Foo06<X, Y, Z> = void Function(Foo05<X, Y, Z>);
-typedef Foo07<X, Y, Z> = void Function(Foo06<X, Y, Z>);
-typedef Foo08<X, Y, Z> = void Function(Foo07<X, Y, Z>);
-typedef Foo09<X, Y, Z> = void Function(Foo08<X, Y, Z>);
-typedef Foo10<X, Y, Z> = void Function(Foo09<X, Y, Z>);
-typedef Foo11<X, Y, Z> = void Function(Foo10<X, Y, Z>);
-typedef Foo12<X, Y, Z> = void Function(Foo11<X, Y, Z>);
-typedef Foo13<X, Y, Z> = void Function(Foo12<X, Y, Z>);
-typedef Foo14<X, Y, Z> = void Function(Foo13<X, Y, Z>);
-typedef Foo15<X, Y, Z> = void Function(Foo14<X, Y, Z>);
-typedef Foo16<X, Y, Z> = void Function(Foo15<X, Y, Z>);
-typedef Foo17<X, Y, Z> = void Function(Foo16<X, Y, Z>);
-typedef Foo18<X, Y, Z> = void Function(Foo17<X, Y, Z>);
-typedef Foo19<X, Y, Z> = void Function(Foo18<X, Y, Z>);
-typedef Foo20<X, Y, Z> = void Function(Foo19<X, Y, Z>);
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.textual_outline.expect
deleted file mode 100644
index 0c87ff5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.textual_outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-// @dart = 2.6
-typedef Foo01<X, Y, Z> = void Function(Null);
-typedef Foo02<X, Y, Z> = void Function(Foo01<X, Y, Z>);
-typedef Foo03<X, Y, Z> = void Function(Foo02<X, Y, Z>);
-typedef Foo04<X, Y, Z> = void Function(Foo03<X, Y, Z>);
-typedef Foo05<X, Y, Z> = void Function(Foo04<X, Y, Z>);
-typedef Foo06<X, Y, Z> = void Function(Foo05<X, Y, Z>);
-typedef Foo07<X, Y, Z> = void Function(Foo06<X, Y, Z>);
-typedef Foo08<X, Y, Z> = void Function(Foo07<X, Y, Z>);
-typedef Foo09<X, Y, Z> = void Function(Foo08<X, Y, Z>);
-typedef Foo10<X, Y, Z> = void Function(Foo09<X, Y, Z>);
-typedef Foo11<X, Y, Z> = void Function(Foo10<X, Y, Z>);
-typedef Foo12<X, Y, Z> = void Function(Foo11<X, Y, Z>);
-typedef Foo13<X, Y, Z> = void Function(Foo12<X, Y, Z>);
-typedef Foo14<X, Y, Z> = void Function(Foo13<X, Y, Z>);
-typedef Foo15<X, Y, Z> = void Function(Foo14<X, Y, Z>);
-typedef Foo16<X, Y, Z> = void Function(Foo15<X, Y, Z>);
-typedef Foo17<X, Y, Z> = void Function(Foo16<X, Y, Z>);
-typedef Foo18<X, Y, Z> = void Function(Foo17<X, Y, Z>);
-typedef Foo19<X, Y, Z> = void Function(Foo18<X, Y, Z>);
-typedef Foo20<X, Y, Z> = void Function(Foo19<X, Y, Z>);
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.textual_outline_modelled.expect
deleted file mode 100644
index 62fc26e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-// @dart = 2.6
-main() {}
-typedef Foo01<X, Y, Z> = void Function(Null);
-typedef Foo02<X, Y, Z> = void Function(Foo01<X, Y, Z>);
-typedef Foo03<X, Y, Z> = void Function(Foo02<X, Y, Z>);
-typedef Foo04<X, Y, Z> = void Function(Foo03<X, Y, Z>);
-typedef Foo05<X, Y, Z> = void Function(Foo04<X, Y, Z>);
-typedef Foo06<X, Y, Z> = void Function(Foo05<X, Y, Z>);
-typedef Foo07<X, Y, Z> = void Function(Foo06<X, Y, Z>);
-typedef Foo08<X, Y, Z> = void Function(Foo07<X, Y, Z>);
-typedef Foo09<X, Y, Z> = void Function(Foo08<X, Y, Z>);
-typedef Foo10<X, Y, Z> = void Function(Foo09<X, Y, Z>);
-typedef Foo11<X, Y, Z> = void Function(Foo10<X, Y, Z>);
-typedef Foo12<X, Y, Z> = void Function(Foo11<X, Y, Z>);
-typedef Foo13<X, Y, Z> = void Function(Foo12<X, Y, Z>);
-typedef Foo14<X, Y, Z> = void Function(Foo13<X, Y, Z>);
-typedef Foo15<X, Y, Z> = void Function(Foo14<X, Y, Z>);
-typedef Foo16<X, Y, Z> = void Function(Foo15<X, Y, Z>);
-typedef Foo17<X, Y, Z> = void Function(Foo16<X, Y, Z>);
-typedef Foo18<X, Y, Z> = void Function(Foo17<X, Y, Z>);
-typedef Foo19<X, Y, Z> = void Function(Foo18<X, Y, Z>);
-typedef Foo20<X, Y, Z> = void Function(Foo19<X, Y, Z>);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.expect
deleted file mode 100644
index 10636b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef Foo01<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (Null) →* void;
-typedef Foo02<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((Null) →* void) →* void;
-typedef Foo03<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((Null) →* void) →* void) →* void;
-typedef Foo04<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((Null) →* void) →* void) →* void) →* void;
-typedef Foo05<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((Null) →* void) →* void) →* void) →* void) →* void;
-typedef Foo06<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((Null) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo07<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo08<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo09<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo10<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo11<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo12<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo13<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo14<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo15<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo16<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo17<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo18<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo19<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo20<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.outline.expect
deleted file mode 100644
index 15cb773..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.outline.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef Foo01<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (Null) →* void;
-typedef Foo02<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((Null) →* void) →* void;
-typedef Foo03<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((Null) →* void) →* void) →* void;
-typedef Foo04<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((Null) →* void) →* void) →* void) →* void;
-typedef Foo05<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((Null) →* void) →* void) →* void) →* void) →* void;
-typedef Foo06<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((Null) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo07<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo08<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo09<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo10<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo11<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo12<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo13<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo14<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo15<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo16<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo17<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo18<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo19<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo20<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.transformed.expect
deleted file mode 100644
index 10636b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/long_chain_of_typedefs.dart.weak.transformed.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef Foo01<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (Null) →* void;
-typedef Foo02<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((Null) →* void) →* void;
-typedef Foo03<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((Null) →* void) →* void) →* void;
-typedef Foo04<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((Null) →* void) →* void) →* void) →* void;
-typedef Foo05<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((Null) →* void) →* void) →* void) →* void) →* void;
-typedef Foo06<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((Null) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo07<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo08<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo09<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo10<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo11<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo12<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo13<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo14<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo15<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo16<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo17<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo18<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo19<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = (((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-typedef Foo20<unrelated X extends core::Object* = dynamic, unrelated Y extends core::Object* = dynamic, unrelated Z extends core::Object* = dynamic> = ((((((((((((((((((((Null) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void) →* void;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart b/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart
deleted file mode 100644
index ac4820c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-/// Test that we produce a compile-time error when magic constness would
-/// otherwise apply.
-// TODO(ahe): Update this test when we implement magic constness correctly.
-
-class Constant {
-  const Constant();
-}
-
-class NotConstant {}
-
-foo({a: Constant(), b: Constant(), c: []}) {}
-
-test() {
-  const NotConstant();
-  Constant();
-  const x = Constant();
-  bool.fromEnvironment("fisk");
-  const b = bool.fromEnvironment("fisk");
-}
-
-main() {
-  // Don't invoke [test] as it throws a compile-time due to `const NotConstant()`.
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.textual_outline.expect
deleted file mode 100644
index ee3bb292..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class Constant {
-  const Constant();
-}
-
-class NotConstant {}
-
-foo({a: Constant(), b: Constant(), c: []}) {}
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7c029de..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class Constant {
-  const Constant();
-}
-
-class NotConstant {}
-
-foo({a: Constant(), b: Constant(), c: []}) {}
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.expect
deleted file mode 100644
index 6d8e8308..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:17:9: Error: Constant expression expected.
-// Try inserting 'const'.
-// foo({a: Constant(), b: Constant(), c: []}) {}
-//         ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:17:24: Error: Constant expression expected.
-// Try inserting 'const'.
-// foo({a: Constant(), b: Constant(), c: []}) {}
-//                        ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:17:39: Error: Constant expression expected.
-// Try inserting 'const'.
-// foo({a: Constant(), b: Constant(), c: []}) {}
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:20:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-// Try using a constructor or factory that is 'const'.
-//   const NotConstant();
-//         ^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Constant extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::Constant*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class NotConstant extends core::Object {
-  synthetic constructor •() → self::NotConstant*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo({dynamic a = #C1, dynamic b = #C1, dynamic c = invalid-expression "Non-constant list literal"}) → dynamic {}
-static method test() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:20:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-Try using a constructor or factory that is 'const'.
-  const NotConstant();
-        ^^^^^^^^^^^";
-  new self::Constant::•();
-  core::bool::fromEnvironment("fisk");
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = self::Constant {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///magic_const.dart:
-- Constant. (from org-dartlang-testcase:///magic_const.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.outline.expect
deleted file mode 100644
index 9cad368..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.outline.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Constant extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::Constant*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class NotConstant extends core::Object {
-  synthetic constructor •() → self::NotConstant*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo({dynamic a, dynamic b, dynamic c}) → dynamic
-  ;
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.transformed.expect
deleted file mode 100644
index 160e248..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart.weak.transformed.expect
+++ /dev/null
@@ -1,81 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:17:9: Error: Constant expression expected.
-// Try inserting 'const'.
-// foo({a: Constant(), b: Constant(), c: []}) {}
-//         ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:17:24: Error: Constant expression expected.
-// Try inserting 'const'.
-// foo({a: Constant(), b: Constant(), c: []}) {}
-//                        ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:17:39: Error: Constant expression expected.
-// Try inserting 'const'.
-// foo({a: Constant(), b: Constant(), c: []}) {}
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:20:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-// Try using a constructor or factory that is 'const'.
-//   const NotConstant();
-//         ^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Constant extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::Constant*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class NotConstant extends core::Object {
-  synthetic constructor •() → self::NotConstant*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method foo({dynamic a = #C1, dynamic b = #C1, dynamic c = invalid-expression "Non-constant list literal"}) → dynamic {}
-static method test() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/magic_const.dart:20:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-Try using a constructor or factory that is 'const'.
-  const NotConstant();
-        ^^^^^^^^^^^";
-  new self::Constant::•();
-  core::bool::fromEnvironment("fisk");
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = self::Constant {}
-}
-
-Extra constant evaluation status:
-Evaluated: FactoryConstructorInvocationJudgment @ org-dartlang-testcase:///magic_const.dart:23:8 -> BoolConstant(false)
-Extra constant evaluation: evaluated: 2, effectively constant: 1
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///magic_const.dart:
-- Constant. (from org-dartlang-testcase:///magic_const.dart:12:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart b/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart
deleted file mode 100644
index 51b2f06..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// 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.6
-
-class A {
-  final x = null;
-
-  const A.named1() sync* {}
-
-  const A.named2() : x = new Object();
-}
-
-external foo(String x) {
-  return x.length;
-}
-
-class B {}
-
-class C {
-  B b;
-}
-
-abstract class AbstractClass {
-  const AbstractClass.id();
-}
-
-m() {
-  const AbstractClass.id();
-  (new C()?.b ??= new B()).b;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.textual_outline.expect
deleted file mode 100644
index 29be0c2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-class A {
-  final x = null;
-  const A.named1() sync* {}
-  const A.named2() : x = new Object();
-}
-external foo(String x) {}
-class B {}
-class C {
-  B b;
-}
-abstract class AbstractClass {
-  const AbstractClass.id();
-}
-m() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.expect
deleted file mode 100644
index c4c2ced..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.expect
+++ /dev/null
@@ -1,144 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:10:3: Error: A const constructor can't have a body.
-// Try removing either the 'const' keyword or the body.
-//   const A.named1() sync* {}
-//   ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:15:1: Error: An external or native method can't have a body.
-// external foo(String x) {
-// ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:26: Error: New expression is not a constant expression.
-//   const A.named2() : x = new Object();
-//                          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: 'x' is a final instance variable that was initialized at the declaration.
-//   const A.named2() : x = new Object();
-//                        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:8:9: Context: 'x' was initialized here.
-//   final x = null;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-// Try using a constructor or factory that is 'const'.
-//   const A.named2() : x = new Object();
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:10:26: Error: Constructor bodies can't use 'async', 'async*', or 'sync*'.
-//   const A.named1() sync* {}
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:15:24: Error: An external or native method can't have a body.
-// external foo(String x) {
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:30:9: Error: The class 'AbstractClass' is abstract and can't be instantiated.
-//   const AbstractClass.id();
-//         ^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:30:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-// Try using a constructor or factory that is 'const'.
-//   const AbstractClass.id();
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:31:28: Error: The getter 'b' isn't defined for the class 'B'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
-//   (new C()?.b ??= new B()).b;
-//                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  final field dynamic x = null;
-  constructor named1() → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:10:26: Error: Constructor bodies can't use 'async', 'async*', or 'sync*'.
-  const A.named1() sync* {}
-                         ^" {}
-  const constructor named2() → self::A*
-    : final dynamic #t2 = throw invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-Try using a constructor or factory that is 'const'.
-  const A.named2() : x = new Object();
-                       ^", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field self::B* b = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class AbstractClass extends core::Object /*hasConstConstructor*/  {
-  const constructor id() → self::AbstractClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-external static method foo(core::String* x) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:15:24: Error: An external or native method can't have a body.
-external foo(String x) {
-                       ^";
-  {
-    return x.{core::String::length};
-  }
-}
-static method m() → dynamic {
-  throw invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:30:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-Try using a constructor or factory that is 'const'.
-  const AbstractClass.id();
-        ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:31:28: Error: The getter 'b' isn't defined for the class 'B'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
-  (new C()?.b ??= new B()).b;
-                           ^";
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.outline.expect
deleted file mode 100644
index 351b3b5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.outline.expect
+++ /dev/null
@@ -1,102 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:10:3: Error: A const constructor can't have a body.
-// Try removing either the 'const' keyword or the body.
-//   const A.named1() sync* {}
-//   ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:15:1: Error: An external or native method can't have a body.
-// external foo(String x) {
-// ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:26: Error: New expression is not a constant expression.
-//   const A.named2() : x = new Object();
-//                          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: 'x' is a final instance variable that was initialized at the declaration.
-//   const A.named2() : x = new Object();
-//                        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:8:9: Context: 'x' was initialized here.
-//   final x = null;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-// Try using a constructor or factory that is 'const'.
-//   const A.named2() : x = new Object();
-//                        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  final field dynamic x = null;
-  constructor named1() → self::A*
-    ;
-  const constructor named2() → self::A*
-    : final dynamic #t1 = throw invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-Try using a constructor or factory that is 'const'.
-  const A.named2() : x = new Object();
-                       ^", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field self::B* b;
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class AbstractClass extends core::Object /*hasConstConstructor*/  {
-  const constructor id() → self::AbstractClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-external static method foo(core::String* x) → dynamic;
-static method m() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.transformed.expect
deleted file mode 100644
index c4c2ced..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart.weak.transformed.expect
+++ /dev/null
@@ -1,144 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:10:3: Error: A const constructor can't have a body.
-// Try removing either the 'const' keyword or the body.
-//   const A.named1() sync* {}
-//   ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:15:1: Error: An external or native method can't have a body.
-// external foo(String x) {
-// ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:26: Error: New expression is not a constant expression.
-//   const A.named2() : x = new Object();
-//                          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: 'x' is a final instance variable that was initialized at the declaration.
-//   const A.named2() : x = new Object();
-//                        ^
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:8:9: Context: 'x' was initialized here.
-//   final x = null;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-// Try using a constructor or factory that is 'const'.
-//   const A.named2() : x = new Object();
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:10:26: Error: Constructor bodies can't use 'async', 'async*', or 'sync*'.
-//   const A.named1() sync* {}
-//                          ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:15:24: Error: An external or native method can't have a body.
-// external foo(String x) {
-//                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:30:9: Error: The class 'AbstractClass' is abstract and can't be instantiated.
-//   const AbstractClass.id();
-//         ^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:30:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-// Try using a constructor or factory that is 'const'.
-//   const AbstractClass.id();
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:31:28: Error: The getter 'b' isn't defined for the class 'B'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
-//   (new C()?.b ??= new B()).b;
-//                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  final field dynamic x = null;
-  constructor named1() → self::A*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:10:26: Error: Constructor bodies can't use 'async', 'async*', or 'sync*'.
-  const A.named1() sync* {}
-                         ^" {}
-  const constructor named2() → self::A*
-    : final dynamic #t2 = throw invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:12:24: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-Try using a constructor or factory that is 'const'.
-  const A.named2() : x = new Object();
-                       ^", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  field self::B* b = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class AbstractClass extends core::Object /*hasConstConstructor*/  {
-  const constructor id() → self::AbstractClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-external static method foo(core::String* x) → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:15:24: Error: An external or native method can't have a body.
-external foo(String x) {
-                       ^";
-  {
-    return x.{core::String::length};
-  }
-}
-static method m() → dynamic {
-  throw invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:30:9: Error: Cannot invoke a non-'const' constructor where a const expression is expected.
-Try using a constructor or factory that is 'const'.
-  const AbstractClass.id();
-        ^";
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart:31:28: Error: The getter 'b' isn't defined for the class 'B'.
- - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/many_errors.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'b'.
-  (new C()?.b ??= new B()).b;
-                           ^";
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart b/pkg/front_end/testcases/general_nnbd_opt_out/map.dart
deleted file mode 100644
index 8cd70df..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() {
-  print(new Map());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.expect
deleted file mode 100644
index c82d4a6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print(core::Map::•<dynamic, dynamic>());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.transformed.expect
deleted file mode 100644
index c82d4a6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/map.dart.weak.transformed.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::print(core::Map::•<dynamic, dynamic>());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart
deleted file mode 100644
index 498f4c1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-const a = null;
-
-@a
-enum E { E1, E2, E3 }
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.textual_outline.expect
deleted file mode 100644
index 0bccd4a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-const a = null;
-@a
-enum E { E1, E2, E3 }
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.textual_outline_modelled.expect
deleted file mode 100644
index 0bccd4a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-const a = null;
-@a
-enum E { E1, E2, E3 }
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.expect
deleted file mode 100644
index f409662..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-@#C1
-class E extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::E*>* values = #C11;
-  static const field self::E* E1 = #C4;
-  static const field self::E* E2 = #C7;
-  static const field self::E* E3 = #C10;
-  const constructor •(core::int* index, core::String* _name) → self::E*
-    : self::E::index = index, self::E::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::E::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field dynamic a = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-  #C2 = 0
-  #C3 = "E.E1"
-  #C4 = self::E {index:#C2, _name:#C3}
-  #C5 = 1
-  #C6 = "E.E2"
-  #C7 = self::E {index:#C5, _name:#C6}
-  #C8 = 2
-  #C9 = "E.E3"
-  #C10 = self::E {index:#C8, _name:#C9}
-  #C11 = <self::E*>[#C4, #C7, #C10]
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///metadata_enum.dart:
-- E. (from org-dartlang-testcase:///metadata_enum.dart:10:6)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.outline.expect
deleted file mode 100644
index 8befca8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.outline.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-@self::a
-class E extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::E*>* values = const <self::E*>[self::E::E1, self::E::E2, self::E::E3];
-  static const field self::E* E1 = const self::E::•(0, "E.E1");
-  static const field self::E* E2 = const self::E::•(1, "E.E2");
-  static const field self::E* E3 = const self::E::•(2, "E.E3");
-  const constructor •(core::int* index, core::String* _name) → self::E*
-    : self::E::index = index, self::E::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::E::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field dynamic a = null;
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///metadata_enum.dart:9:2 -> NullConstant(null)
-Evaluated: ListLiteral @ org-dartlang-testcase:///metadata_enum.dart:10:6 -> ListConstant(const <E*>[const E{E.index: 0, E._name: "E.E1"}, const E{E.index: 1, E._name: "E.E2"}, const E{E.index: 2, E._name: "E.E3"}])
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///metadata_enum.dart:10:10 -> InstanceConstant(const E{E.index: 0, E._name: "E.E1"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///metadata_enum.dart:10:14 -> InstanceConstant(const E{E.index: 1, E._name: "E.E2"})
-Evaluated: ConstructorInvocation @ org-dartlang-testcase:///metadata_enum.dart:10:18 -> InstanceConstant(const E{E.index: 2, E._name: "E.E3"})
-Extra constant evaluation: evaluated: 9, effectively constant: 5
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.transformed.expect
deleted file mode 100644
index f409662..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_enum.dart.weak.transformed.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-@#C1
-class E extends core::Object /*isEnum*/  {
-  final field core::int* index;
-  final field core::String* _name;
-  static const field core::List<self::E*>* values = #C11;
-  static const field self::E* E1 = #C4;
-  static const field self::E* E2 = #C7;
-  static const field self::E* E3 = #C10;
-  const constructor •(core::int* index, core::String* _name) → self::E*
-    : self::E::index = index, self::E::_name = _name, super core::Object::•()
-    ;
-  method toString() → core::String*
-    return this.{self::E::_name};
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field dynamic a = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-  #C2 = 0
-  #C3 = "E.E1"
-  #C4 = self::E {index:#C2, _name:#C3}
-  #C5 = 1
-  #C6 = "E.E2"
-  #C7 = self::E {index:#C5, _name:#C6}
-  #C8 = 2
-  #C9 = "E.E3"
-  #C10 = self::E {index:#C8, _name:#C9}
-  #C11 = <self::E*>[#C4, #C7, #C10]
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///metadata_enum.dart:
-- E. (from org-dartlang-testcase:///metadata_enum.dart:10:6)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart
deleted file mode 100644
index 5abbd8f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-const a = null;
-
-@a
-class C = D with E;
-
-class D {}
-
-class E {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.textual_outline.expect
deleted file mode 100644
index 73fde59..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-const a = null;
-@a
-class C = D with E;
-
-class D {}
-
-class E {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.textual_outline_modelled.expect
deleted file mode 100644
index 1c44ce7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-@a
-class C = D with E;
-
-class D {}
-
-class E {}
-
-const a = null;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.expect
deleted file mode 100644
index 02845a0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-@#C1
-class C = self::D with self::E {
-  synthetic constructor •() → self::C*
-    : super self::D::•()
-    ;
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E extends core::Object {
-  synthetic constructor •() → self::E*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field dynamic a = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.outline.expect
deleted file mode 100644
index d29c7fe..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.outline.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-@self::a
-class C = self::D with self::E {
-  synthetic constructor •() → self::C*
-    : super self::D::•()
-    ;
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E extends core::Object {
-  synthetic constructor •() → self::E*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field dynamic a = null;
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///metadata_named_mixin_application.dart:9:2 -> NullConstant(null)
-Extra constant evaluation: evaluated: 1, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.transformed.expect
deleted file mode 100644
index d677ee1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/metadata_named_mixin_application.dart.weak.transformed.expect
+++ /dev/null
@@ -1,56 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-@#C1
-class C extends self::D implements self::E /*isEliminatedMixin*/  {
-  synthetic constructor •() → self::C*
-    : super self::D::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends core::Object {
-  synthetic constructor •() → self::D*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E extends core::Object {
-  synthetic constructor •() → self::E*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field dynamic a = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart b/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart
deleted file mode 100644
index 7ce9df5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-staticMethod() {
-  return "sdfg";
-}
-
-class Foo {
-  instanceMethod() {
-    return 123;
-  }
-}
-
-external bool externalStatic();
-
-abstract class ExternalValue {}
-
-abstract class Bar {
-  ExternalValue externalInstanceMethod();
-}
-
-external Bar createBar();
-
-class Box {
-  var field;
-}
-
-stringArgument(x) {}
-
-intArgument(x) {}
-
-class FinalBox {
-  final finalField;
-  FinalBox(this.finalField);
-}
-
-class SubFinalBox extends FinalBox {
-  SubFinalBox(value) : super(value);
-}
-
-class DynamicReceiver1 {
-  dynamicallyCalled(x) {}
-}
-
-class DynamicReceiver2 {
-  dynamicallyCalled(x) {}
-}
-
-void makeDynamicCall(receiver) {
-  receiver.dynamicallyCalled("sdfg");
-}
-
-main() {
-  var x = staticMethod();
-  var y = new Foo().instanceMethod();
-  var z = externalStatic();
-  var w = createBar().externalInstanceMethod();
-
-  stringArgument("sdfg");
-  intArgument(42);
-
-  var box = new Box();
-  box.field = "sdfg";
-  var a = box.field;
-
-  var finalBox = new FinalBox("dfg");
-  var b = finalBox.finalField;
-
-  var subBox = new SubFinalBox("dfg");
-  var c = subBox.finalField;
-
-  makeDynamicCall(new DynamicReceiver1());
-  makeDynamicCall(new DynamicReceiver2());
-
-  var list = ["string"];
-  var d = list[0];
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.textual_outline.expect
deleted file mode 100644
index cb155f6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.textual_outline.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-// @dart = 2.6
-staticMethod() {}
-
-class Foo {
-  instanceMethod() {}
-}
-
-external bool externalStatic();
-
-abstract class ExternalValue {}
-
-abstract class Bar {
-  ExternalValue externalInstanceMethod();
-}
-
-external Bar createBar();
-
-class Box {
-  var field;
-}
-
-stringArgument(x) {}
-intArgument(x) {}
-
-class FinalBox {
-  final finalField;
-  FinalBox(this.finalField);
-}
-
-class SubFinalBox extends FinalBox {
-  SubFinalBox(value) : super(value);
-}
-
-class DynamicReceiver1 {
-  dynamicallyCalled(x) {}
-}
-
-class DynamicReceiver2 {
-  dynamicallyCalled(x) {}
-}
-
-void makeDynamicCall(receiver) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.textual_outline_modelled.expect
deleted file mode 100644
index a927605..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-// @dart = 2.6
-abstract class Bar {
-  ExternalValue externalInstanceMethod();
-}
-
-abstract class ExternalValue {}
-
-class Box {
-  var field;
-}
-
-class DynamicReceiver1 {
-  dynamicallyCalled(x) {}
-}
-
-class DynamicReceiver2 {
-  dynamicallyCalled(x) {}
-}
-
-class FinalBox {
-  FinalBox(this.finalField);
-  final finalField;
-}
-
-class Foo {
-  instanceMethod() {}
-}
-
-class SubFinalBox extends FinalBox {
-  SubFinalBox(value) : super(value);
-}
-
-external Bar createBar();
-external bool externalStatic();
-intArgument(x) {}
-main() {}
-staticMethod() {}
-stringArgument(x) {}
-void makeDynamicCall(receiver) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.expect
deleted file mode 100644
index 74e0279..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.expect
+++ /dev/null
@@ -1,151 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  method instanceMethod() → dynamic {
-    return 123;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class ExternalValue extends core::Object {
-  synthetic constructor •() → self::ExternalValue*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract method externalInstanceMethod() → self::ExternalValue*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Box extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::Box*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class FinalBox extends core::Object {
-  final field dynamic finalField;
-  constructor •(dynamic finalField) → self::FinalBox*
-    : self::FinalBox::finalField = finalField, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SubFinalBox extends self::FinalBox {
-  constructor •(dynamic value) → self::SubFinalBox*
-    : super self::FinalBox::•(value)
-    ;
-}
-class DynamicReceiver1 extends core::Object {
-  synthetic constructor •() → self::DynamicReceiver1*
-    : super core::Object::•()
-    ;
-  method dynamicallyCalled(dynamic x) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class DynamicReceiver2 extends core::Object {
-  synthetic constructor •() → self::DynamicReceiver2*
-    : super core::Object::•()
-    ;
-  method dynamicallyCalled(dynamic x) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method staticMethod() → dynamic {
-  return "sdfg";
-}
-external static method externalStatic() → core::bool*;
-external static method createBar() → self::Bar*;
-static method stringArgument(dynamic x) → dynamic {}
-static method intArgument(dynamic x) → dynamic {}
-static method makeDynamicCall(dynamic receiver) → void {
-  receiver.dynamicallyCalled("sdfg");
-}
-static method main() → dynamic {
-  dynamic x = self::staticMethod();
-  dynamic y = new self::Foo::•().{self::Foo::instanceMethod}();
-  core::bool* z = self::externalStatic();
-  self::ExternalValue* w = self::createBar().{self::Bar::externalInstanceMethod}();
-  self::stringArgument("sdfg");
-  self::intArgument(42);
-  self::Box* box = new self::Box::•();
-  box.{self::Box::field} = "sdfg";
-  dynamic a = box.{self::Box::field};
-  self::FinalBox* finalBox = new self::FinalBox::•("dfg");
-  dynamic b = finalBox.{self::FinalBox::finalField};
-  self::SubFinalBox* subBox = new self::SubFinalBox::•("dfg");
-  dynamic c = subBox.{self::FinalBox::finalField};
-  self::makeDynamicCall(new self::DynamicReceiver1::•());
-  self::makeDynamicCall(new self::DynamicReceiver2::•());
-  core::List<core::String*>* list = <core::String*>["string"];
-  core::String* d = list.{core::List::[]}(0);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.outline.expect
deleted file mode 100644
index 2d4939b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.outline.expect
+++ /dev/null
@@ -1,127 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    ;
-  method instanceMethod() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class ExternalValue extends core::Object {
-  synthetic constructor •() → self::ExternalValue*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    ;
-  abstract method externalInstanceMethod() → self::ExternalValue*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Box extends core::Object {
-  field dynamic field;
-  synthetic constructor •() → self::Box*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class FinalBox extends core::Object {
-  final field dynamic finalField;
-  constructor •(dynamic finalField) → self::FinalBox*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SubFinalBox extends self::FinalBox {
-  constructor •(dynamic value) → self::SubFinalBox*
-    ;
-}
-class DynamicReceiver1 extends core::Object {
-  synthetic constructor •() → self::DynamicReceiver1*
-    ;
-  method dynamicallyCalled(dynamic x) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class DynamicReceiver2 extends core::Object {
-  synthetic constructor •() → self::DynamicReceiver2*
-    ;
-  method dynamicallyCalled(dynamic x) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method staticMethod() → dynamic
-  ;
-external static method externalStatic() → core::bool*;
-external static method createBar() → self::Bar*;
-static method stringArgument(dynamic x) → dynamic
-  ;
-static method intArgument(dynamic x) → dynamic
-  ;
-static method makeDynamicCall(dynamic receiver) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.transformed.expect
deleted file mode 100644
index 30a9c46..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/micro.dart.weak.transformed.expect
+++ /dev/null
@@ -1,151 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  method instanceMethod() → dynamic {
-    return 123;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class ExternalValue extends core::Object {
-  synthetic constructor •() → self::ExternalValue*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract method externalInstanceMethod() → self::ExternalValue*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Box extends core::Object {
-  field dynamic field = null;
-  synthetic constructor •() → self::Box*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class FinalBox extends core::Object {
-  final field dynamic finalField;
-  constructor •(dynamic finalField) → self::FinalBox*
-    : self::FinalBox::finalField = finalField, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SubFinalBox extends self::FinalBox {
-  constructor •(dynamic value) → self::SubFinalBox*
-    : super self::FinalBox::•(value)
-    ;
-}
-class DynamicReceiver1 extends core::Object {
-  synthetic constructor •() → self::DynamicReceiver1*
-    : super core::Object::•()
-    ;
-  method dynamicallyCalled(dynamic x) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class DynamicReceiver2 extends core::Object {
-  synthetic constructor •() → self::DynamicReceiver2*
-    : super core::Object::•()
-    ;
-  method dynamicallyCalled(dynamic x) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method staticMethod() → dynamic {
-  return "sdfg";
-}
-external static method externalStatic() → core::bool*;
-external static method createBar() → self::Bar*;
-static method stringArgument(dynamic x) → dynamic {}
-static method intArgument(dynamic x) → dynamic {}
-static method makeDynamicCall(dynamic receiver) → void {
-  receiver.dynamicallyCalled("sdfg");
-}
-static method main() → dynamic {
-  dynamic x = self::staticMethod();
-  dynamic y = new self::Foo::•().{self::Foo::instanceMethod}();
-  core::bool* z = self::externalStatic();
-  self::ExternalValue* w = self::createBar().{self::Bar::externalInstanceMethod}();
-  self::stringArgument("sdfg");
-  self::intArgument(42);
-  self::Box* box = new self::Box::•();
-  box.{self::Box::field} = "sdfg";
-  dynamic a = box.{self::Box::field};
-  self::FinalBox* finalBox = new self::FinalBox::•("dfg");
-  dynamic b = finalBox.{self::FinalBox::finalField};
-  self::SubFinalBox* subBox = new self::SubFinalBox::•("dfg");
-  dynamic c = subBox.{self::FinalBox::finalField};
-  self::makeDynamicCall(new self::DynamicReceiver1::•());
-  self::makeDynamicCall(new self::DynamicReceiver2::•());
-  core::List<core::String*>* list = core::_GrowableList::_literal1<core::String*>("string");
-  core::String* d = list.{core::List::[]}(0);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart b/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart
deleted file mode 100644
index 4b5a61c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart
+++ /dev/null
@@ -1 +0,0 @@
-main() => print(-9223372036854775808);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.textual_outline.expect
deleted file mode 100644
index 4b5a61c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.textual_outline.expect
+++ /dev/null
@@ -1 +0,0 @@
-main() => print(-9223372036854775808);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.textual_outline_modelled.expect
deleted file mode 100644
index 4b5a61c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1 +0,0 @@
-main() => print(-9223372036854775808);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.expect
deleted file mode 100644
index d2f6483..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library /*isNonNullableByDefault*/;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic
-  return core::print(-9223372036854775808.{core::int::unary-}());
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.outline.expect
deleted file mode 100644
index e2cba6b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library /*isNonNullableByDefault*/;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.transformed.expect
deleted file mode 100644
index 88f46a2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/minimum_int.dart.weak.transformed.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-library /*isNonNullableByDefault*/;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic
-  return core::print(-9223372036854775808.{core::int::unary-}());
-
-
-Extra constant evaluation status:
-Evaluated: MethodInvocation @ org-dartlang-testcase:///minimum_int.dart:1:17 -> IntConstant(-9223372036854775808)
-Extra constant evaluation: evaluated: 2, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart b/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart
deleted file mode 100644
index 99207dc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class Super {
-  Super._();
-}
-
-class Sub extends Super {
-  Sub() : super();
-  Sub.foo() : super.foo();
-}
-
-class Bad {
-  Bad.foo() : this();
-  Bad.bar() : this.baz();
-}
-
-class M {}
-
-class MixinApplication extends Super with M {
-  MixinApplication() : super();
-  MixinApplication.foo() : super.foo();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.textual_outline.expect
deleted file mode 100644
index f2b9597..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.textual_outline.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-// @dart = 2.6
-class Super {
-  Super._();
-}
-
-class Sub extends Super {
-  Sub() : super();
-  Sub.foo() : super.foo();
-}
-
-class Bad {
-  Bad.foo() : this();
-  Bad.bar() : this.baz();
-}
-
-class M {}
-
-class MixinApplication extends Super with M {
-  MixinApplication() : super();
-  MixinApplication.foo() : super.foo();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.textual_outline_modelled.expect
deleted file mode 100644
index 06f8c69..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-// @dart = 2.6
-class Bad {
-  Bad.bar() : this.baz();
-  Bad.foo() : this();
-}
-
-class M {}
-
-class MixinApplication extends Super with M {
-  MixinApplication() : super();
-  MixinApplication.foo() : super.foo();
-}
-
-class Sub extends Super {
-  Sub() : super();
-  Sub.foo() : super.foo();
-}
-
-class Super {
-  Super._();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.expect
deleted file mode 100644
index 8b0c268..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.expect
+++ /dev/null
@@ -1,113 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:12:11: Error: Superclass has no constructor named 'Super'.
-//   Sub() : super();
-//           ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:13:15: Error: Superclass has no constructor named 'Super.foo'.
-//   Sub.foo() : super.foo();
-//               ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:17:15: Error: Couldn't find constructor 'Bad'.
-//   Bad.foo() : this();
-//               ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:18:15: Error: Couldn't find constructor 'Bad.baz'.
-//   Bad.bar() : this.baz();
-//               ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:24:24: Error: Superclass has no constructor named 'Super'.
-//   MixinApplication() : super();
-//                        ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:25:28: Error: Superclass has no constructor named 'Super.foo'.
-//   MixinApplication.foo() : super.foo();
-//                            ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Super extends core::Object {
-  constructor _() → self::Super*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends self::Super {
-  constructor •() → self::Sub*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:12:11: Error: Superclass has no constructor named 'Super'.
-  Sub() : super();
-          ^^^^^"
-    ;
-  constructor foo() → self::Sub*
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:13:15: Error: Superclass has no constructor named 'Super.foo'.
-  Sub.foo() : super.foo();
-              ^^^^^"
-    ;
-}
-class Bad extends core::Object {
-  constructor foo() → self::Bad*
-    : final dynamic #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:17:15: Error: Couldn't find constructor 'Bad'.
-  Bad.foo() : this();
-              ^^^^"
-    ;
-  constructor bar() → self::Bad*
-    : final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:18:15: Error: Couldn't find constructor 'Bad.baz'.
-  Bad.bar() : this.baz();
-              ^^^^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _MixinApplication&Super&M = self::Super with self::M /*isAnonymousMixin*/  {
-  synthetic constructor _() → self::_MixinApplication&Super&M*
-    : super self::Super::_()
-    ;
-}
-class MixinApplication extends self::_MixinApplication&Super&M {
-  constructor •() → self::MixinApplication*
-    : final dynamic #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:24:24: Error: Superclass has no constructor named 'Super'.
-  MixinApplication() : super();
-                       ^^^^^"
-    ;
-  constructor foo() → self::MixinApplication*
-    : final dynamic #t6 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:25:28: Error: Superclass has no constructor named 'Super.foo'.
-  MixinApplication.foo() : super.foo();
-                           ^^^^^"
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.outline.expect
deleted file mode 100644
index ec0437b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.outline.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Super extends core::Object {
-  constructor _() → self::Super*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends self::Super {
-  constructor •() → self::Sub*
-    ;
-  constructor foo() → self::Sub*
-    ;
-}
-class Bad extends core::Object {
-  constructor foo() → self::Bad*
-    ;
-  constructor bar() → self::Bad*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _MixinApplication&Super&M = self::Super with self::M /*isAnonymousMixin*/  {
-  synthetic constructor _() → self::_MixinApplication&Super&M*
-    : super self::Super::_()
-    ;
-}
-class MixinApplication extends self::_MixinApplication&Super&M {
-  constructor •() → self::MixinApplication*
-    ;
-  constructor foo() → self::MixinApplication*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.transformed.expect
deleted file mode 100644
index c98b6f9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart.weak.transformed.expect
+++ /dev/null
@@ -1,123 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:12:11: Error: Superclass has no constructor named 'Super'.
-//   Sub() : super();
-//           ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:13:15: Error: Superclass has no constructor named 'Super.foo'.
-//   Sub.foo() : super.foo();
-//               ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:17:15: Error: Couldn't find constructor 'Bad'.
-//   Bad.foo() : this();
-//               ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:18:15: Error: Couldn't find constructor 'Bad.baz'.
-//   Bad.bar() : this.baz();
-//               ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:24:24: Error: Superclass has no constructor named 'Super'.
-//   MixinApplication() : super();
-//                        ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:25:28: Error: Superclass has no constructor named 'Super.foo'.
-//   MixinApplication.foo() : super.foo();
-//                            ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Super extends core::Object {
-  constructor _() → self::Super*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends self::Super {
-  constructor •() → self::Sub*
-    : final dynamic #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:12:11: Error: Superclass has no constructor named 'Super'.
-  Sub() : super();
-          ^^^^^"
-    ;
-  constructor foo() → self::Sub*
-    : final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:13:15: Error: Superclass has no constructor named 'Super.foo'.
-  Sub.foo() : super.foo();
-              ^^^^^"
-    ;
-}
-class Bad extends core::Object {
-  constructor foo() → self::Bad*
-    : final dynamic #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:17:15: Error: Couldn't find constructor 'Bad'.
-  Bad.foo() : this();
-              ^^^^"
-    ;
-  constructor bar() → self::Bad*
-    : final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:18:15: Error: Couldn't find constructor 'Bad.baz'.
-  Bad.bar() : this.baz();
-              ^^^^"
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _MixinApplication&Super&M extends self::Super implements self::M /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor _() → self::_MixinApplication&Super&M*
-    : super self::Super::_()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MixinApplication extends self::_MixinApplication&Super&M {
-  constructor •() → self::MixinApplication*
-    : final dynamic #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:24:24: Error: Superclass has no constructor named 'Super'.
-  MixinApplication() : super();
-                       ^^^^^"
-    ;
-  constructor foo() → self::MixinApplication*
-    : final dynamic #t6 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_constructor.dart:25:28: Error: Superclass has no constructor named 'Super.foo'.
-  MixinApplication.foo() : super.foo();
-                           ^^^^^"
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart b/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart
deleted file mode 100644
index 191cdc4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// 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.6
-
-class EmptyClass {}
-
-var emptyClass = new EmptyClass();
-
-class ClassWithProperty {
-  EmptyClass property;
-}
-
-var classWithProperty = new ClassWithProperty();
-
-class ClassWithIndexSet {
-  operator []=(int index, int value) {}
-}
-
-var classWithIndexSet = new ClassWithIndexSet();
-
-class ClassWithIndexGet {
-  int operator [](int index) => 42;
-}
-
-var classWithIndexGet = new ClassWithIndexGet();
-
-var missingBinary = classWithProperty.property += 2;
-var missingIndexGet = classWithIndexSet[0] ??= 2;
-var missingIndexSet = classWithIndexGet[0] ??= 2;
-var missingPropertyGet = emptyClass.property;
-var missingPropertySet = emptyClass.property = 42;
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.textual_outline.expect
deleted file mode 100644
index c8b0fa8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.textual_outline.expect
+++ /dev/null
@@ -1,28 +0,0 @@
-// @dart = 2.6
-class EmptyClass {}
-
-var emptyClass = new EmptyClass();
-
-class ClassWithProperty {
-  EmptyClass property;
-}
-
-var classWithProperty = new ClassWithProperty();
-
-class ClassWithIndexSet {
-  operator []=(int index, int value) {}
-}
-
-var classWithIndexSet = new ClassWithIndexSet();
-
-class ClassWithIndexGet {
-  int operator [](int index) => 42;
-}
-
-var classWithIndexGet = new ClassWithIndexGet();
-var missingBinary = classWithProperty.property += 2;
-var missingIndexGet = classWithIndexSet[0] ??= 2;
-var missingIndexSet = classWithIndexGet[0] ??= 2;
-var missingPropertyGet = emptyClass.property;
-var missingPropertySet = emptyClass.property = 42;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.textual_outline_modelled.expect
deleted file mode 100644
index 16d597a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-// @dart = 2.6
-class ClassWithIndexGet {
-  int operator [](int index) => 42;
-}
-
-class ClassWithIndexSet {
-  operator []=(int index, int value) {}
-}
-
-class ClassWithProperty {
-  EmptyClass property;
-}
-
-class EmptyClass {}
-
-main() {}
-var classWithIndexGet = new ClassWithIndexGet();
-var classWithIndexSet = new ClassWithIndexSet();
-var classWithProperty = new ClassWithProperty();
-var emptyClass = new EmptyClass();
-var missingBinary = classWithProperty.property += 2;
-var missingIndexGet = classWithIndexSet[0] ??= 2;
-var missingIndexSet = classWithIndexGet[0] ??= 2;
-var missingPropertyGet = emptyClass.property;
-var missingPropertySet = emptyClass.property = 42;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.expect
deleted file mode 100644
index a04eb48..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.expect
+++ /dev/null
@@ -1,131 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:29:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
-//  - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the operator to an existing operator, or defining a '+' operator.
-// var missingBinary = classWithProperty.property += 2;
-//                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:30:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
-//  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]' operator.
-// var missingIndexGet = classWithIndexSet[0] ??= 2;
-//                                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:31:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
-//  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]=' operator.
-// var missingIndexSet = classWithIndexGet[0] ??= 2;
-//                                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:32:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
-//  - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
-// var missingPropertyGet = emptyClass.property;
-//                                     ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:33:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
-//  - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
-// var missingPropertySet = emptyClass.property = 42;
-//                                     ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class EmptyClass extends core::Object {
-  synthetic constructor •() → self::EmptyClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithProperty extends core::Object {
-  field self::EmptyClass* property = null;
-  synthetic constructor •() → self::ClassWithProperty*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithIndexSet extends core::Object {
-  synthetic constructor •() → self::ClassWithIndexSet*
-    : super core::Object::•()
-    ;
-  operator []=(core::int* index, core::int* value) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithIndexGet extends core::Object {
-  synthetic constructor •() → self::ClassWithIndexGet*
-    : super core::Object::•()
-    ;
-  operator [](core::int* index) → core::int*
-    return 42;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::EmptyClass* emptyClass = new self::EmptyClass::•();
-static field self::ClassWithProperty* classWithProperty = new self::ClassWithProperty::•();
-static field self::ClassWithIndexSet* classWithIndexSet = new self::ClassWithIndexSet::•();
-static field self::ClassWithIndexGet* classWithIndexGet = new self::ClassWithIndexGet::•();
-static field dynamic missingBinary = let final self::ClassWithProperty* #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:29:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
- - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the operator to an existing operator, or defining a '+' operator.
-var missingBinary = classWithProperty.property += 2;
-                                               ^" as{TypeError,ForDynamic} self::EmptyClass*;
-static field dynamic missingIndexGet = let final self::ClassWithIndexSet* #t2 = self::classWithIndexSet in let final core::int* #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:30:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
- - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the operator to an existing operator, or defining a '[]' operator.
-var missingIndexGet = classWithIndexSet[0] ??= 2;
-                                       ^" in #t4.{core::Object::==}(null) ?{dynamic} let final core::int* #t5 = 2 in let final void #t6 = #t2.{self::ClassWithIndexSet::[]=}(#t3, #t5) in #t5 : #t4;
-static field core::int* missingIndexSet = let final self::ClassWithIndexGet* #t7 = self::classWithIndexGet in let final core::int* #t8 = 0 in let final core::int* #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8) in #t9.{core::num::==}(null) ?{core::int*} let final core::int* #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:31:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
- - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the operator to an existing operator, or defining a '[]=' operator.
-var missingIndexSet = classWithIndexGet[0] ??= 2;
-                                       ^" in #t10 : #t9;
-static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:32:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
- - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
-var missingPropertyGet = emptyClass.property;
-                                    ^^^^^^^^";
-static field core::int* missingPropertySet = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:33:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
- - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
-var missingPropertySet = emptyClass.property = 42;
-                                    ^^^^^^^^";
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.outline.expect
deleted file mode 100644
index b92887e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.outline.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class EmptyClass extends core::Object {
-  synthetic constructor •() → self::EmptyClass*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithProperty extends core::Object {
-  field self::EmptyClass* property;
-  synthetic constructor •() → self::ClassWithProperty*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithIndexSet extends core::Object {
-  synthetic constructor •() → self::ClassWithIndexSet*
-    ;
-  operator []=(core::int* index, core::int* value) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithIndexGet extends core::Object {
-  synthetic constructor •() → self::ClassWithIndexGet*
-    ;
-  operator [](core::int* index) → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::EmptyClass* emptyClass;
-static field self::ClassWithProperty* classWithProperty;
-static field self::ClassWithIndexSet* classWithIndexSet;
-static field self::ClassWithIndexGet* classWithIndexGet;
-static field dynamic missingBinary;
-static field dynamic missingIndexGet;
-static field core::int* missingIndexSet;
-static field dynamic missingPropertyGet;
-static field core::int* missingPropertySet;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.transformed.expect
deleted file mode 100644
index 20f40c5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart.weak.transformed.expect
+++ /dev/null
@@ -1,140 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:29:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
-//  - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the operator to an existing operator, or defining a '+' operator.
-// var missingBinary = classWithProperty.property += 2;
-//                                                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:30:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
-//  - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]' operator.
-// var missingIndexGet = classWithIndexSet[0] ??= 2;
-//                                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:31:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
-//  - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]=' operator.
-// var missingIndexSet = classWithIndexGet[0] ??= 2;
-//                                        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:32:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
-//  - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
-// var missingPropertyGet = emptyClass.property;
-//                                     ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:33:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
-//  - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
-// var missingPropertySet = emptyClass.property = 42;
-//                                     ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class EmptyClass extends core::Object {
-  synthetic constructor •() → self::EmptyClass*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithProperty extends core::Object {
-  field self::EmptyClass* property = null;
-  synthetic constructor •() → self::ClassWithProperty*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithIndexSet extends core::Object {
-  synthetic constructor •() → self::ClassWithIndexSet*
-    : super core::Object::•()
-    ;
-  operator []=(core::int* index, core::int* value) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassWithIndexGet extends core::Object {
-  synthetic constructor •() → self::ClassWithIndexGet*
-    : super core::Object::•()
-    ;
-  operator [](core::int* index) → core::int*
-    return 42;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field self::EmptyClass* emptyClass = new self::EmptyClass::•();
-static field self::ClassWithProperty* classWithProperty = new self::ClassWithProperty::•();
-static field self::ClassWithIndexSet* classWithIndexSet = new self::ClassWithIndexSet::•();
-static field self::ClassWithIndexGet* classWithIndexGet = new self::ClassWithIndexGet::•();
-static field dynamic missingBinary = let final self::ClassWithProperty* #t1 = self::classWithProperty in #t1.{self::ClassWithProperty::property} = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:29:48: Error: The operator '+' isn't defined for the class 'EmptyClass'.
- - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the operator to an existing operator, or defining a '+' operator.
-var missingBinary = classWithProperty.property += 2;
-                                               ^";
-static field dynamic missingIndexGet = let final self::ClassWithIndexSet* #t2 = self::classWithIndexSet in let final core::int* #t3 = 0 in let final dynamic #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:30:40: Error: The operator '[]' isn't defined for the class 'ClassWithIndexSet'.
- - 'ClassWithIndexSet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the operator to an existing operator, or defining a '[]' operator.
-var missingIndexGet = classWithIndexSet[0] ??= 2;
-                                       ^" in #t4.{core::Object::==}(null) ?{dynamic} let final core::int* #t5 = 2 in let final void #t6 = #t2.{self::ClassWithIndexSet::[]=}(#t3, #t5) in #t5 : #t4;
-static field core::int* missingIndexSet = let final self::ClassWithIndexGet* #t7 = self::classWithIndexGet in let final core::int* #t8 = 0 in let final core::int* #t9 = #t7.{self::ClassWithIndexGet::[]}(#t8) in #t9.{core::num::==}(null) ?{core::int*} let final core::int* #t10 = 2 in let final void #t11 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:31:40: Error: The operator '[]=' isn't defined for the class 'ClassWithIndexGet'.
- - 'ClassWithIndexGet' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the operator to an existing operator, or defining a '[]=' operator.
-var missingIndexSet = classWithIndexGet[0] ??= 2;
-                                       ^" in #t10 : #t9;
-static field dynamic missingPropertyGet = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:32:37: Error: The getter 'property' isn't defined for the class 'EmptyClass'.
- - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'property'.
-var missingPropertyGet = emptyClass.property;
-                                    ^^^^^^^^";
-static field core::int* missingPropertySet = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart:33:37: Error: The setter 'property' isn't defined for the class 'EmptyClass'.
- - 'EmptyClass' is from 'pkg/front_end/testcases/general_nnbd_opt_out/missing_toplevel.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'property'.
-var missingPropertySet = emptyClass.property = 42;
-                                    ^^^^^^^^";
-static method main() → dynamic {}
-
-
-Extra constant evaluation status:
-Evaluated: VariableGet @ org-dartlang-testcase:///missing_toplevel.dart:30:41 -> IntConstant(0)
-Evaluated: VariableGet @ org-dartlang-testcase:///missing_toplevel.dart:30:48 -> IntConstant(2)
-Evaluated: VariableGet @ org-dartlang-testcase:///missing_toplevel.dart:30:48 -> IntConstant(2)
-Evaluated: VariableGet @ org-dartlang-testcase:///missing_toplevel.dart:31:41 -> IntConstant(0)
-Evaluated: VariableGet @ org-dartlang-testcase:///missing_toplevel.dart:31:48 -> IntConstant(2)
-Extra constant evaluation: evaluated: 37, effectively constant: 5
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart
deleted file mode 100644
index 27ba0ca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class B extends Object with M1, M2 {
-  B(value);
-}
-
-abstract class M1 {
-  m() => print("M1");
-}
-
-abstract class M2 {
-  m() => print("M2");
-}
-
-class C extends Object with M1, M2 {
-  C(value);
-}
-
-abstract class G1<T> {
-  m() => print(T);
-}
-
-class D<S> extends Object with G1<S> {}
-
-main() {
-  new B(null).m();
-  new C(null).m();
-  new D().m();
-  new D<int>().m();
-  new D<List<int>>().m();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.textual_outline.expect
deleted file mode 100644
index f50acc7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.textual_outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-class B extends Object with M1, M2 {
-  B(value);
-}
-
-abstract class M1 {
-  m() => print("M1");
-}
-
-abstract class M2 {
-  m() => print("M2");
-}
-
-class C extends Object with M1, M2 {
-  C(value);
-}
-
-abstract class G1<T> {
-  m() => print(T);
-}
-
-class D<S> extends Object with G1<S> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.textual_outline_modelled.expect
deleted file mode 100644
index efc6453..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-abstract class G1<T> {
-  m() => print(T);
-}
-
-abstract class M1 {
-  m() => print("M1");
-}
-
-abstract class M2 {
-  m() => print("M2");
-}
-
-class B extends Object with M1, M2 {
-  B(value);
-}
-
-class C extends Object with M1, M2 {
-  C(value);
-}
-
-class D<S> extends Object with G1<S> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.expect
deleted file mode 100644
index 1f1f19e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.expect
+++ /dev/null
@@ -1,142 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class _B&Object&M1 = core::Object with self::M1 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&M1*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M1::m}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&M1&M2 = self::_B&Object&M1 with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&M1&M2*
-    : super self::_B&Object&M1::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M2::m}();
-}
-class B extends self::_B&Object&M1&M2 {
-  constructor •(dynamic value) → self::B*
-    : super self::_B&Object&M1&M2::•()
-    ;
-}
-abstract class M1 extends core::Object {
-  synthetic constructor •() → self::M1*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print("M1");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class M2 extends core::Object {
-  synthetic constructor •() → self::M2*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print("M2");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&M1 = core::Object with self::M1 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&M1*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M1::m}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&M1&M2 = self::_C&Object&M1 with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&M1&M2*
-    : super self::_C&Object&M1::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M2::m}();
-}
-class C extends self::_C&Object&M1&M2 {
-  constructor •(dynamic value) → self::C*
-    : super self::_C&Object&M1&M2::•()
-    ;
-}
-abstract class G1<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::G1<self::G1::T*>*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print(self::G1::T*);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _D&Object&G1<S extends core::Object* = dynamic> = core::Object with self::G1<self::_D&Object&G1::S*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_D&Object&G1<self::_D&Object&G1::S*>*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::G1::m}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<S extends core::Object* = dynamic> extends self::_D&Object&G1<self::D::S*> {
-  synthetic constructor •() → self::D<self::D::S*>*
-    : super self::_D&Object&G1::•()
-    ;
-}
-static method main() → dynamic {
-  new self::B::•(null).{self::_B&Object&M1&M2::m}();
-  new self::C::•(null).{self::_C&Object&M1&M2::m}();
-  new self::D::•<dynamic>().{self::_D&Object&G1::m}();
-  new self::D::•<core::int*>().{self::_D&Object&G1::m}();
-  new self::D::•<core::List<core::int*>*>().{self::_D&Object&G1::m}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.outline.expect
deleted file mode 100644
index e09c2b0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.outline.expect
+++ /dev/null
@@ -1,131 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class _B&Object&M1 = core::Object with self::M1 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&M1*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M1::m}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&M1&M2 = self::_B&Object&M1 with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&M1&M2*
-    : super self::_B&Object&M1::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M2::m}();
-}
-class B extends self::_B&Object&M1&M2 {
-  constructor •(dynamic value) → self::B*
-    ;
-}
-abstract class M1 extends core::Object {
-  synthetic constructor •() → self::M1*
-    ;
-  method m() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class M2 extends core::Object {
-  synthetic constructor •() → self::M2*
-    ;
-  method m() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&M1 = core::Object with self::M1 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&M1*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M1::m}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&M1&M2 = self::_C&Object&M1 with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&M1&M2*
-    : super self::_C&Object&M1::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::M2::m}();
-}
-class C extends self::_C&Object&M1&M2 {
-  constructor •(dynamic value) → self::C*
-    ;
-}
-abstract class G1<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::G1<self::G1::T*>*
-    ;
-  method m() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _D&Object&G1<S extends core::Object* = dynamic> = core::Object with self::G1<self::_D&Object&G1::S*> /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_D&Object&G1<self::_D&Object&G1::S*>*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method m() → dynamic
-    return super.{self::G1::m}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<S extends core::Object* = dynamic> extends self::_D&Object&G1<self::D::S*> {
-  synthetic constructor •() → self::D<self::D::S*>*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.transformed.expect
deleted file mode 100644
index a6c21d2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin.dart.weak.transformed.expect
+++ /dev/null
@@ -1,162 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class _B&Object&M1 extends core::Object implements self::M1 /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&M1*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print("M1");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _B&Object&M1&M2 extends self::_B&Object&M1 implements self::M2 /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_B&Object&M1&M2*
-    : super self::_B&Object&M1::•()
-    ;
-  method m() → dynamic
-    return core::print("M2");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::_B&Object&M1&M2 {
-  constructor •(dynamic value) → self::B*
-    : super self::_B&Object&M1&M2::•()
-    ;
-}
-abstract class M1 extends core::Object {
-  synthetic constructor •() → self::M1*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print("M1");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class M2 extends core::Object {
-  synthetic constructor •() → self::M2*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print("M2");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&M1 extends core::Object implements self::M1 /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&M1*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print("M1");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&M1&M2 extends self::_C&Object&M1 implements self::M2 /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&M1&M2*
-    : super self::_C&Object&M1::•()
-    ;
-  method m() → dynamic
-    return core::print("M2");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::_C&Object&M1&M2 {
-  constructor •(dynamic value) → self::C*
-    : super self::_C&Object&M1&M2::•()
-    ;
-}
-abstract class G1<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::G1<self::G1::T*>*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print(self::G1::T*);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _D&Object&G1<S extends core::Object* = dynamic> extends core::Object implements self::G1<self::_D&Object&G1::S*> /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_D&Object&G1<self::_D&Object&G1::S*>*
-    : super core::Object::•()
-    ;
-  method m() → dynamic
-    return core::print(self::_D&Object&G1::S*);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D<S extends core::Object* = dynamic> extends self::_D&Object&G1<self::D::S*> {
-  synthetic constructor •() → self::D<self::D::S*>*
-    : super self::_D&Object&G1::•()
-    ;
-}
-static method main() → dynamic {
-  new self::B::•(null).{self::_B&Object&M1&M2::m}();
-  new self::C::•(null).{self::_C&Object&M1&M2::m}();
-  new self::D::•<dynamic>().{self::_D&Object&G1::m}();
-  new self::D::•<core::int*>().{self::_D&Object&G1::m}();
-  new self::D::•<core::List<core::int*>*>().{self::_D&Object&G1::m}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart
deleted file mode 100644
index eaec508..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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.6
-
-class Mixin {}
-
-class Super {
-  var field = 42;
-
-  Super(this.field);
-}
-
-class Class = Super with Mixin;
-
-main() {
-  new Class(0);
-}
-
-error() {
-  new Class('');
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.textual_outline.expect
deleted file mode 100644
index 977b29e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class Mixin {}
-
-class Super {
-  var field = 42;
-  Super(this.field);
-}
-
-class Class = Super with Mixin;
-main() {}
-error() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.textual_outline_modelled.expect
deleted file mode 100644
index 3bf8eb1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class Class = Super with Mixin;
-
-class Mixin {}
-
-class Super {
-  Super(this.field);
-  var field = 42;
-}
-
-error() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.expect
deleted file mode 100644
index d6f49f2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart:22:13: Error: The argument type 'String' can't be assigned to the parameter type 'int'.
-//   new Class('');
-//             ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Mixin extends core::Object {
-  synthetic constructor •() → self::Mixin*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Super extends core::Object {
-  field core::int* field = 42;
-  constructor •(core::int* field) → self::Super*
-    : self::Super::field = field, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Class = self::Super with self::Mixin {
-  synthetic constructor •(core::int* field) → self::Class*
-    : super self::Super::•(field)
-    ;
-}
-static method main() → dynamic {
-  new self::Class::•(0);
-}
-static method error() → dynamic {
-  new self::Class::•(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart:22:13: Error: The argument type 'String' can't be assigned to the parameter type 'int'.
-  new Class('');
-            ^" in "" as{TypeError} core::int*);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.outline.expect
deleted file mode 100644
index 1a998b0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.outline.expect
+++ /dev/null
@@ -1,42 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Mixin extends core::Object {
-  synthetic constructor •() → self::Mixin*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Super extends core::Object {
-  field core::int* field;
-  constructor •(core::int* field) → self::Super*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Class = self::Super with self::Mixin {
-  synthetic constructor •(core::int* field) → self::Class*
-    : super self::Super::•(field)
-    ;
-}
-static method main() → dynamic
-  ;
-static method error() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.transformed.expect
deleted file mode 100644
index 44c3911..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart.weak.transformed.expect
+++ /dev/null
@@ -1,65 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart:22:13: Error: The argument type 'String' can't be assigned to the parameter type 'int'.
-//   new Class('');
-//             ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Mixin extends core::Object {
-  synthetic constructor •() → self::Mixin*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Super extends core::Object {
-  field core::int* field = 42;
-  constructor •(core::int* field) → self::Super*
-    : self::Super::field = field, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Class extends self::Super implements self::Mixin /*isEliminatedMixin*/  {
-  synthetic constructor •(core::int* field) → self::Class*
-    : super self::Super::•(field)
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::Class::•(0);
-}
-static method error() → dynamic {
-  new self::Class::•(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_inferred_parameter_type.dart:22:13: Error: The argument type 'String' can't be assigned to the parameter type 'int'.
-  new Class('');
-            ^" in "" as{TypeError} core::int*);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart
deleted file mode 100644
index 0a3522a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// Test error messages for invalid override in a mixin application.
-
-class S {
-  foo([x]) {}
-}
-
-class M {
-  foo() {}
-}
-
-class M1 {}
-
-class M2 {}
-
-class MX {}
-
-class A0 = S with M;
-class A1 = S with M1, M;
-class A2 = S with M1, M2, M;
-
-class A0X = S with M, MX;
-class A1X = S with M1, M, MX;
-class A2X = S with M1, M2, M, MX;
-
-class B0 extends S with M {}
-
-class B1 extends S with M1, M {}
-
-class B2 extends S with M1, M2, M {}
-
-class B0X extends S with M, MX {}
-
-class B1X extends S with M1, M, MX {}
-
-class B2X extends S with M1, M2, M, MX {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.textual_outline.expect
deleted file mode 100644
index ad2f273..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.textual_outline.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-// @dart = 2.6
-class S {
-  foo([x]) {}
-}
-
-class M {
-  foo() {}
-}
-
-class M1 {}
-
-class M2 {}
-
-class MX {}
-
-class A0 = S with M;
-class A1 = S with M1, M;
-class A2 = S with M1, M2, M;
-class A0X = S with M, MX;
-class A1X = S with M1, M, MX;
-class A2X = S with M1, M2, M, MX;
-
-class B0 extends S with M {}
-
-class B1 extends S with M1, M {}
-
-class B2 extends S with M1, M2, M {}
-
-class B0X extends S with M, MX {}
-
-class B1X extends S with M1, M, MX {}
-
-class B2X extends S with M1, M2, M, MX {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.textual_outline_modelled.expect
deleted file mode 100644
index f6c44fb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-// @dart = 2.6
-class A0 = S with M;
-class A0X = S with M, MX;
-class A1 = S with M1, M;
-class A1X = S with M1, M, MX;
-class A2 = S with M1, M2, M;
-class A2X = S with M1, M2, M, MX;
-
-class B0 extends S with M {}
-
-class B0X extends S with M, MX {}
-
-class B1 extends S with M1, M {}
-
-class B1X extends S with M1, M, MX {}
-
-class B2 extends S with M1, M2, M {}
-
-class B2X extends S with M1, M2, M, MX {}
-
-class M {
-  foo() {}
-}
-
-class M1 {}
-
-class M2 {}
-
-class MX {}
-
-class S {
-  foo([x]) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.weak.expect
deleted file mode 100644
index 9bddb8c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.weak.expect
+++ /dev/null
@@ -1,413 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:23:7: Error: The mixin application class 'A0' introduces an erroneous override of 'foo'.
-// class A0 = S with M;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:24:7: Error: The mixin application class 'A1' introduces an erroneous override of 'foo'.
-// class A1 = S with M1, M;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:25:7: Error: The mixin application class 'A2' introduces an erroneous override of 'foo'.
-// class A2 = S with M1, M2, M;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:27:7: Error: Applying the mixin 'M' to 'S' introduces an erroneous override of 'foo'.
-// class A0X = S with M, MX;
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:28:7: Error: Applying the mixin 'M' to 'S with M1' introduces an erroneous override of 'foo'.
-// class A1X = S with M1, M, MX;
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:29:7: Error: Applying the mixin 'M' to 'S with M1, M2' introduces an erroneous override of 'foo'.
-// class A2X = S with M1, M2, M, MX;
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:31:7: Error: Applying the mixin 'M' to 'S' introduces an erroneous override of 'foo'.
-// class B0 extends S with M {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:33:7: Error: Applying the mixin 'M' to 'S with M1' introduces an erroneous override of 'foo'.
-// class B1 extends S with M1, M {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:35:7: Error: Applying the mixin 'M' to 'S with M1, M2' introduces an erroneous override of 'foo'.
-// class B2 extends S with M1, M2, M {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:37:7: Error: Applying the mixin 'M' to 'S' introduces an erroneous override of 'foo'.
-// class B0X extends S with M, MX {}
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:39:7: Error: Applying the mixin 'M' to 'S with M1' introduces an erroneous override of 'foo'.
-// class B1X extends S with M1, M, MX {}
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:41:7: Error: Applying the mixin 'M' to 'S with M1, M2' introduces an erroneous override of 'foo'.
-// class B2X extends S with M1, M2, M, MX {}
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-import self as self;
-import "dart:core" as core;
-
-class S extends core::Object {
-  synthetic constructor •() → self::S*
-    : super core::Object::•()
-    ;
-  method foo([dynamic x = #C1]) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M1 extends core::Object {
-  synthetic constructor •() → self::M1*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M2 extends core::Object {
-  synthetic constructor •() → self::M2*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MX extends core::Object {
-  synthetic constructor •() → self::MX*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A0 = self::S with self::M {
-  synthetic constructor •() → self::A0*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _A1&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A1&S&M1*
-    : super self::S::•()
-    ;
-}
-class A1 = self::_A1&S&M1 with self::M {
-  synthetic constructor •() → self::A1*
-    : super self::_A1&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _A2&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _A2&S&M1&M2 = self::_A2&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2&S&M1&M2*
-    : super self::_A2&S&M1::•()
-    ;
-}
-class A2 = self::_A2&S&M1&M2 with self::M {
-  synthetic constructor •() → self::A2*
-    : super self::_A2&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _A0X&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A0X&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class A0X = self::_A0X&S&M with self::MX {
-  synthetic constructor •() → self::A0X*
-    : super self::_A0X&S&M::•()
-    ;
-}
-abstract class _A1X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A1X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _A1X&S&M1&M = self::_A1X&S&M1 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A1X&S&M1&M*
-    : super self::_A1X&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class A1X = self::_A1X&S&M1&M with self::MX {
-  synthetic constructor •() → self::A1X*
-    : super self::_A1X&S&M1&M::•()
-    ;
-}
-abstract class _A2X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _A2X&S&M1&M2 = self::_A2X&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2X&S&M1&M2*
-    : super self::_A2X&S&M1::•()
-    ;
-}
-abstract class _A2X&S&M1&M2&M = self::_A2X&S&M1&M2 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2X&S&M1&M2&M*
-    : super self::_A2X&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class A2X = self::_A2X&S&M1&M2&M with self::MX {
-  synthetic constructor •() → self::A2X*
-    : super self::_A2X&S&M1&M2&M::•()
-    ;
-}
-abstract class _B0&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B0&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class B0 extends self::_B0&S&M {
-  synthetic constructor •() → self::B0*
-    : super self::_B0&S&M::•()
-    ;
-}
-abstract class _B1&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B1&S&M1&M = self::_B1&S&M1 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1&S&M1&M*
-    : super self::_B1&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class B1 extends self::_B1&S&M1&M {
-  synthetic constructor •() → self::B1*
-    : super self::_B1&S&M1&M::•()
-    ;
-}
-abstract class _B2&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B2&S&M1&M2 = self::_B2&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2&S&M1&M2*
-    : super self::_B2&S&M1::•()
-    ;
-}
-abstract class _B2&S&M1&M2&M = self::_B2&S&M1&M2 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2&S&M1&M2&M*
-    : super self::_B2&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class B2 extends self::_B2&S&M1&M2&M {
-  synthetic constructor •() → self::B2*
-    : super self::_B2&S&M1&M2&M::•()
-    ;
-}
-abstract class _B0X&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B0X&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _B0X&S&M&MX = self::_B0X&S&M with self::MX /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B0X&S&M&MX*
-    : super self::_B0X&S&M::•()
-    ;
-}
-class B0X extends self::_B0X&S&M&MX {
-  synthetic constructor •() → self::B0X*
-    : super self::_B0X&S&M&MX::•()
-    ;
-}
-abstract class _B1X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B1X&S&M1&M = self::_B1X&S&M1 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1X&S&M1&M*
-    : super self::_B1X&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _B1X&S&M1&M&MX = self::_B1X&S&M1&M with self::MX /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1X&S&M1&M&MX*
-    : super self::_B1X&S&M1&M::•()
-    ;
-}
-class B1X extends self::_B1X&S&M1&M&MX {
-  synthetic constructor •() → self::B1X*
-    : super self::_B1X&S&M1&M&MX::•()
-    ;
-}
-abstract class _B2X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B2X&S&M1&M2 = self::_B2X&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1&M2*
-    : super self::_B2X&S&M1::•()
-    ;
-}
-abstract class _B2X&S&M1&M2&M = self::_B2X&S&M1&M2 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1&M2&M*
-    : super self::_B2X&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _B2X&S&M1&M2&M&MX = self::_B2X&S&M1&M2&M with self::MX /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1&M2&M&MX*
-    : super self::_B2X&S&M1&M2&M::•()
-    ;
-}
-class B2X extends self::_B2X&S&M1&M2&M&MX {
-  synthetic constructor •() → self::B2X*
-    : super self::_B2X&S&M1&M2&M&MX::•()
-    ;
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.weak.outline.expect
deleted file mode 100644
index e157652..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart.weak.outline.expect
+++ /dev/null
@@ -1,401 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:23:7: Error: The mixin application class 'A0' introduces an erroneous override of 'foo'.
-// class A0 = S with M;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:24:7: Error: The mixin application class 'A1' introduces an erroneous override of 'foo'.
-// class A1 = S with M1, M;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:25:7: Error: The mixin application class 'A2' introduces an erroneous override of 'foo'.
-// class A2 = S with M1, M2, M;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:27:7: Error: Applying the mixin 'M' to 'S' introduces an erroneous override of 'foo'.
-// class A0X = S with M, MX;
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:28:7: Error: Applying the mixin 'M' to 'S with M1' introduces an erroneous override of 'foo'.
-// class A1X = S with M1, M, MX;
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:29:7: Error: Applying the mixin 'M' to 'S with M1, M2' introduces an erroneous override of 'foo'.
-// class A2X = S with M1, M2, M, MX;
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:31:7: Error: Applying the mixin 'M' to 'S' introduces an erroneous override of 'foo'.
-// class B0 extends S with M {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:33:7: Error: Applying the mixin 'M' to 'S with M1' introduces an erroneous override of 'foo'.
-// class B1 extends S with M1, M {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:35:7: Error: Applying the mixin 'M' to 'S with M1, M2' introduces an erroneous override of 'foo'.
-// class B2 extends S with M1, M2, M {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:37:7: Error: Applying the mixin 'M' to 'S' introduces an erroneous override of 'foo'.
-// class B0X extends S with M, MX {}
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:39:7: Error: Applying the mixin 'M' to 'S with M1' introduces an erroneous override of 'foo'.
-// class B1X extends S with M1, M, MX {}
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:41:7: Error: Applying the mixin 'M' to 'S with M1, M2' introduces an erroneous override of 'foo'.
-// class B2X extends S with M1, M2, M, MX {}
-//       ^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:14:3: Context: The method 'M.foo' has fewer positional arguments than those of overridden method 'S.foo'.
-//   foo() {}
-//   ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_application_override.dart:10:3: Context: This is the overridden method ('foo').
-//   foo([x]) {}
-//   ^
-//
-import self as self;
-import "dart:core" as core;
-
-class S extends core::Object {
-  synthetic constructor •() → self::S*
-    ;
-  method foo([dynamic x]) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    ;
-  method foo() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M1 extends core::Object {
-  synthetic constructor •() → self::M1*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M2 extends core::Object {
-  synthetic constructor •() → self::M2*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class MX extends core::Object {
-  synthetic constructor •() → self::MX*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A0 = self::S with self::M {
-  synthetic constructor •() → self::A0*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _A1&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A1&S&M1*
-    : super self::S::•()
-    ;
-}
-class A1 = self::_A1&S&M1 with self::M {
-  synthetic constructor •() → self::A1*
-    : super self::_A1&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _A2&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _A2&S&M1&M2 = self::_A2&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2&S&M1&M2*
-    : super self::_A2&S&M1::•()
-    ;
-}
-class A2 = self::_A2&S&M1&M2 with self::M {
-  synthetic constructor •() → self::A2*
-    : super self::_A2&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _A0X&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A0X&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class A0X = self::_A0X&S&M with self::MX {
-  synthetic constructor •() → self::A0X*
-    : super self::_A0X&S&M::•()
-    ;
-}
-abstract class _A1X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A1X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _A1X&S&M1&M = self::_A1X&S&M1 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A1X&S&M1&M*
-    : super self::_A1X&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class A1X = self::_A1X&S&M1&M with self::MX {
-  synthetic constructor •() → self::A1X*
-    : super self::_A1X&S&M1&M::•()
-    ;
-}
-abstract class _A2X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _A2X&S&M1&M2 = self::_A2X&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2X&S&M1&M2*
-    : super self::_A2X&S&M1::•()
-    ;
-}
-abstract class _A2X&S&M1&M2&M = self::_A2X&S&M1&M2 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A2X&S&M1&M2&M*
-    : super self::_A2X&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class A2X = self::_A2X&S&M1&M2&M with self::MX {
-  synthetic constructor •() → self::A2X*
-    : super self::_A2X&S&M1&M2&M::•()
-    ;
-}
-abstract class _B0&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B0&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class B0 extends self::_B0&S&M {
-  synthetic constructor •() → self::B0*
-    ;
-}
-abstract class _B1&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B1&S&M1&M = self::_B1&S&M1 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1&S&M1&M*
-    : super self::_B1&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class B1 extends self::_B1&S&M1&M {
-  synthetic constructor •() → self::B1*
-    ;
-}
-abstract class _B2&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B2&S&M1&M2 = self::_B2&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2&S&M1&M2*
-    : super self::_B2&S&M1::•()
-    ;
-}
-abstract class _B2&S&M1&M2&M = self::_B2&S&M1&M2 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2&S&M1&M2&M*
-    : super self::_B2&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-class B2 extends self::_B2&S&M1&M2&M {
-  synthetic constructor •() → self::B2*
-    ;
-}
-abstract class _B0X&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B0X&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _B0X&S&M&MX = self::_B0X&S&M with self::MX /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B0X&S&M&MX*
-    : super self::_B0X&S&M::•()
-    ;
-}
-class B0X extends self::_B0X&S&M&MX {
-  synthetic constructor •() → self::B0X*
-    ;
-}
-abstract class _B1X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B1X&S&M1&M = self::_B1X&S&M1 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1X&S&M1&M*
-    : super self::_B1X&S&M1::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _B1X&S&M1&M&MX = self::_B1X&S&M1&M with self::MX /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B1X&S&M1&M&MX*
-    : super self::_B1X&S&M1&M::•()
-    ;
-}
-class B1X extends self::_B1X&S&M1&M&MX {
-  synthetic constructor •() → self::B1X*
-    ;
-}
-abstract class _B2X&S&M1 = self::S with self::M1 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1*
-    : super self::S::•()
-    ;
-}
-abstract class _B2X&S&M1&M2 = self::_B2X&S&M1 with self::M2 /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1&M2*
-    : super self::_B2X&S&M1::•()
-    ;
-}
-abstract class _B2X&S&M1&M2&M = self::_B2X&S&M1&M2 with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1&M2&M*
-    : super self::_B2X&S&M1&M2::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-}
-abstract class _B2X&S&M1&M2&M&MX = self::_B2X&S&M1&M2&M with self::MX /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_B2X&S&M1&M2&M&MX*
-    : super self::_B2X&S&M1&M2&M::•()
-    ;
-}
-class B2X extends self::_B2X&S&M1&M2&M&MX {
-  synthetic constructor •() → self::B2X*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart
deleted file mode 100644
index 9e7bb69..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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.6
-
-// This class has no problems.
-class M {
-  foo() {}
-}
-
-// This class has no problems.
-class N = Object with M;
-
-// This class has no problems.
-class C extends Object with N {}
-
-// This class has no problems.
-abstract class M2 implements M {
-  bar() {}
-}
-
-// This class has an error as it lacks an implementation of M.foo.
-class N2 = Object with M2;
-
-// This class lacks an implementation of M.foo, but it is abstract so there's
-// no error.
-abstract class N3 = Object with M2;
-
-// This class has an error as it lacks an implementation of M.foo.
-class C2 extends Object with M2 {}
-
-// This class lacks an implementation of M.foo, but it is abstract so there's
-// no error.
-abstract class C3 extends Object with M2 {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.textual_outline.expect
deleted file mode 100644
index 65b69bb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.textual_outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-class M {
-  foo() {}
-}
-
-class N = Object with M;
-
-class C extends Object with N {}
-
-abstract class M2 implements M {
-  bar() {}
-}
-
-class N2 = Object with M2;
-abstract class N3 = Object with M2;
-
-class C2 extends Object with M2 {}
-
-abstract class C3 extends Object with M2 {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.textual_outline_modelled.expect
deleted file mode 100644
index 325a963..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-// @dart = 2.6
-abstract class C3 extends Object with M2 {}
-
-abstract class M2 implements M {
-  bar() {}
-}
-
-abstract class N3 = Object with M2;
-
-class C extends Object with N {}
-
-class C2 extends Object with M2 {}
-
-class M {
-  foo() {}
-}
-
-class N = Object with M;
-class N2 = Object with M2;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.expect
deleted file mode 100644
index dc46359..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.expect
+++ /dev/null
@@ -1,185 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:24:7: Error: The non-abstract class 'N2' is missing implementations for these members:
-//  - M.foo
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class N2 = Object with M2;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:9:3: Context: 'M.foo' is defined here.
-//   foo() {}
-//   ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:31:7: Error: The non-abstract class 'C2' is missing implementations for these members:
-//  - M.foo
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class C2 extends Object with M2 {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:9:3: Context: 'M.foo' is defined here.
-//   foo() {}
-//   ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class N = core::Object with self::M /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::N*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&N = core::Object with self::N /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&N*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::_C&Object&N {
-  synthetic constructor •() → self::C*
-    : super self::_C&Object&N::•()
-    ;
-}
-abstract class M2 extends core::Object implements self::M {
-  synthetic constructor •() → self::M2*
-    : super core::Object::•()
-    ;
-  method bar() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class N2 = core::Object with self::M2 /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::N2*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class N3 = core::Object with self::M2 /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::N3*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C2&Object&M2 = core::Object with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C2&Object&M2*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C2 extends self::_C2&Object&M2 {
-  synthetic constructor •() → self::C2*
-    : super self::_C2&Object&M2::•()
-    ;
-}
-abstract class _C3&Object&M2 = core::Object with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C3&Object&M2*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C3 extends self::_C3&Object&M2 {
-  synthetic constructor •() → self::C3*
-    : super self::_C3&Object&M2::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.outline.expect
deleted file mode 100644
index 204d91c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.outline.expect
+++ /dev/null
@@ -1,183 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:24:7: Error: The non-abstract class 'N2' is missing implementations for these members:
-//  - M.foo
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class N2 = Object with M2;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:9:3: Context: 'M.foo' is defined here.
-//   foo() {}
-//   ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:31:7: Error: The non-abstract class 'C2' is missing implementations for these members:
-//  - M.foo
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class C2 extends Object with M2 {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:9:3: Context: 'M.foo' is defined here.
-//   foo() {}
-//   ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    ;
-  method foo() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class N = core::Object with self::M /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::N*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&N = core::Object with self::N /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&N*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{self::M::foo}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::_C&Object&N {
-  synthetic constructor •() → self::C*
-    ;
-}
-abstract class M2 extends core::Object implements self::M {
-  synthetic constructor •() → self::M2*
-    ;
-  method bar() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class N2 = core::Object with self::M2 /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::N2*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class N3 = core::Object with self::M2 /*hasConstConstructor*/  {
-  const synthetic constructor •() → self::N3*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C2&Object&M2 = core::Object with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C2&Object&M2*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C2 extends self::_C2&Object&M2 {
-  synthetic constructor •() → self::C2*
-    ;
-}
-abstract class _C3&Object&M2 = core::Object with self::M2 /*isAnonymousMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C3&Object&M2*
-    : super core::Object::•()
-    ;
-  mixin-super-stub method bar() → dynamic
-    return super.{self::M2::bar}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C3 extends self::_C3&Object&M2 {
-  synthetic constructor •() → self::C3*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.transformed.expect
deleted file mode 100644
index ad31c58..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart.weak.transformed.expect
+++ /dev/null
@@ -1,179 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:24:7: Error: The non-abstract class 'N2' is missing implementations for these members:
-//  - M.foo
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class N2 = Object with M2;
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:9:3: Context: 'M.foo' is defined here.
-//   foo() {}
-//   ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:31:7: Error: The non-abstract class 'C2' is missing implementations for these members:
-//  - M.foo
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class C2 extends Object with M2 {}
-//       ^^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_conflicts.dart:9:3: Context: 'M.foo' is defined here.
-//   foo() {}
-//   ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class N extends core::Object implements self::M /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::N*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C&Object&N extends core::Object implements self::N /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C&Object&N*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::_C&Object&N {
-  synthetic constructor •() → self::C*
-    : super self::_C&Object&N::•()
-    ;
-}
-abstract class M2 extends core::Object implements self::M {
-  synthetic constructor •() → self::M2*
-    : super core::Object::•()
-    ;
-  method bar() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class N2 extends core::Object implements self::M2 /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::N2*
-    : super core::Object::•()
-    ;
-  method bar() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class N3 extends core::Object implements self::M2 /*isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::N3*
-    : super core::Object::•()
-    ;
-  method bar() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _C2&Object&M2 extends core::Object implements self::M2 /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C2&Object&M2*
-    : super core::Object::•()
-    ;
-  method bar() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C2 extends self::_C2&Object&M2 {
-  synthetic constructor •() → self::C2*
-    : super self::_C2&Object&M2::•()
-    ;
-}
-abstract class _C3&Object&M2 extends core::Object implements self::M2 /*isAnonymousMixin,isEliminatedMixin,hasConstConstructor*/  {
-  const synthetic constructor •() → self::_C3&Object&M2*
-    : super core::Object::•()
-    ;
-  method bar() → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class C3 extends self::_C3&Object&M2 {
-  synthetic constructor •() → self::C3*
-    : super self::_C3&Object&M2::•()
-    ;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart
deleted file mode 100644
index fe66234..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import "package:expect/expect.dart";
-
-class C<T> {
-  String trace;
-  C({a: 0, b: T}) : trace = "a: $a, b: $b";
-}
-
-class M {}
-
-class D = C<String> with M;
-
-class E extends D {}
-
-class F extends C<int> with M {}
-
-main() {
-  Expect.stringEquals(
-      // TODO(ahe): This is wrong, it should be "a: 0, b: Object" or an error.
-      "a: 0, b: T",
-      new C<Object>().trace);
-  Expect.stringEquals(
-      // TODO(ahe): This is wrong, it should be "a: 0, b: Object" or an error.
-      "a: 0, b: T",
-      new C().trace);
-  Expect.stringEquals("a: 0, b: String", new D().trace);
-  Expect.stringEquals("a: 0, b: String", new E().trace);
-  Expect.stringEquals("a: 0, b: int", new F().trace);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.textual_outline.expect
deleted file mode 100644
index e5cb16d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.textual_outline.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart";
-
-class C<T> {
-  String trace;
-  C({a: 0, b: T}) : trace = "a: $a, b: $b";
-}
-
-class M {}
-
-class D = C<String> with M;
-
-class E extends D {}
-
-class F extends C<int> with M {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.textual_outline_modelled.expect
deleted file mode 100644
index 185434e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-import "package:expect/expect.dart";
-
-class C<T> {
-  C({a: 0, b: T}) : trace = "a: $a, b: $b";
-  String trace;
-}
-
-class D = C<String> with M;
-
-class E extends D {}
-
-class F extends C<int> with M {}
-
-class M {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.expect
deleted file mode 100644
index b2d2a0f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.expect
+++ /dev/null
@@ -1,84 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart:11:15: Error: Constant evaluation error:
-//   C({a: 0, b: T}) : trace = "a: $a, b: $b";
-//               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart:11:15: Context: The type 'T' is not a constant because it depends on a type parameter, only instantiated types are allowed.
-//   C({a: 0, b: T}) : trace = "a: $a, b: $b";
-//               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart:11:12: Context: While analyzing:
-//   C({a: 0, b: T}) : trace = "a: $a, b: $b";
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  field core::String* trace;
-  constructor •({dynamic a = #C1, dynamic b = invalid-expression "The type 'T' is not a constant because it depends on a type parameter, only instantiated types are allowed."}) → self::C<self::C::T*>*
-    : self::C::trace = "a: ${a}, b: ${b}", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D = self::C<core::String*> with self::M {
-  synthetic constructor •({dynamic a = #C1, dynamic b = #C2}) → self::D*
-    : super self::C::•(a: a, b: b)
-    ;
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-}
-abstract class _F&C&M = self::C<core::int*> with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •({dynamic a = #C1, dynamic b = #C3}) → self::_F&C&M*
-    : super self::C::•(a: a, b: b)
-    ;
-}
-class F extends self::_F&C&M {
-  synthetic constructor •() → self::F*
-    : super self::_F&C&M::•()
-    ;
-}
-static method main() → dynamic {
-  exp::Expect::stringEquals("a: 0, b: T", new self::C::•<core::Object*>().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: T", new self::C::•<dynamic>().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: String", new self::D::•().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: String", new self::E::•().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: int", new self::F::•().{self::C::trace});
-}
-
-constants  {
-  #C1 = 0
-  #C2 = TypeLiteralConstant(core::String*)
-  #C3 = TypeLiteralConstant(core::int*)
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.outline.expect
deleted file mode 100644
index 1b5d000..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.outline.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  field core::String* trace;
-  constructor •({dynamic a, dynamic b}) → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D = self::C<core::String*> with self::M {
-  synthetic constructor •({dynamic a, dynamic b}) → self::D*
-    : super self::C::•(a: a, b: b)
-    ;
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    ;
-}
-abstract class _F&C&M = self::C<core::int*> with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •({dynamic a, dynamic b}) → self::_F&C&M*
-    : super self::C::•(a: a, b: b)
-    ;
-}
-class F extends self::_F&C&M {
-  synthetic constructor •() → self::F*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.transformed.expect
deleted file mode 100644
index d0d4423..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart.weak.transformed.expect
+++ /dev/null
@@ -1,104 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart:11:15: Error: Constant evaluation error:
-//   C({a: 0, b: T}) : trace = "a: $a, b: $b";
-//               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart:11:15: Context: The type 'T' is not a constant because it depends on a type parameter, only instantiated types are allowed.
-//   C({a: 0, b: T}) : trace = "a: $a, b: $b";
-//               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/mixin_constructors_with_default_values.dart:11:12: Context: While analyzing:
-//   C({a: 0, b: T}) : trace = "a: $a, b: $b";
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  field core::String* trace;
-  constructor •({dynamic a = #C1, dynamic b = invalid-expression "The type 'T' is not a constant because it depends on a type parameter, only instantiated types are allowed."}) → self::C<self::C::T*>*
-    : self::C::trace = "a: ${a}, b: ${b}", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C<core::String*> implements self::M /*isEliminatedMixin*/  {
-  synthetic constructor •({dynamic a = #C1, dynamic b = #C2}) → self::D*
-    : super self::C::•(a: a, b: b)
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-}
-abstract class _F&C&M extends self::C<core::int*> implements self::M /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •({dynamic a = #C1, dynamic b = #C3}) → self::_F&C&M*
-    : super self::C::•(a: a, b: b)
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class F extends self::_F&C&M {
-  synthetic constructor •() → self::F*
-    : super self::_F&C&M::•()
-    ;
-}
-static method main() → dynamic {
-  exp::Expect::stringEquals("a: 0, b: T", new self::C::•<core::Object*>().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: T", new self::C::•<dynamic>().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: String", new self::D::•().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: String", new self::E::•().{self::C::trace});
-  exp::Expect::stringEquals("a: 0, b: int", new self::F::•().{self::C::trace});
-}
-
-constants  {
-  #C1 = 0
-  #C2 = TypeLiteralConstant(core::String*)
-  #C3 = TypeLiteralConstant(core::int*)
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart
deleted file mode 100644
index eedbd58..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-class A {}
-
-class C<T extends A> {
-  T _field;
-
-  foo(T x) {
-    _field = x;
-  }
-}
-
-class D extends C<B> {}
-
-class Foo extends Object with C<B> {}
-
-class B extends A {}
-
-main() {
-  var foo = new Foo();
-  foo.foo(new B());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.textual_outline.expect
deleted file mode 100644
index 5c4acda..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.textual_outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class C<T extends A> {
-  T _field;
-  foo(T x) {}
-}
-
-class D extends C<B> {}
-
-class Foo extends Object with C<B> {}
-
-class B extends A {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.textual_outline_modelled.expect
deleted file mode 100644
index c765f3a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C<T extends A> {
-  T _field;
-  foo(T x) {}
-}
-
-class D extends C<B> {}
-
-class Foo extends Object with C<B> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.expect
deleted file mode 100644
index 5465909..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.expect
+++ /dev/null
@@ -1,78 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends self::A* = self::A*> extends core::Object {
-  generic-covariant-impl field self::C::T* _field = null;
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  method foo(generic-covariant-impl self::C::T* x) → dynamic {
-    this.{self::C::_field} = x;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C<self::B*> {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-abstract class _Foo&Object&C = core::Object with self::C<self::B*> /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Foo&Object&C*
-    : super core::Object::•()
-    ;
-  mixin-super-stub get _field() → self::B*
-    return super.{self::C::_field};
-  mixin-super-stub set _field(generic-covariant-impl self::B* value) → void
-    return super.{self::C::_field} = value;
-  mixin-super-stub method foo(generic-covariant-impl self::B* x) → dynamic
-    return super.{self::C::foo}(x);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends self::_Foo&Object&C {
-  synthetic constructor •() → self::Foo*
-    : super self::_Foo&Object&C::•()
-    ;
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  foo.{self::_Foo&Object&C::foo}(new self::B::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.outline.expect
deleted file mode 100644
index 4366b2f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.outline.expect
+++ /dev/null
@@ -1,70 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends self::A* = self::A*> extends core::Object {
-  generic-covariant-impl field self::C::T* _field;
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  method foo(generic-covariant-impl self::C::T* x) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C<self::B*> {
-  synthetic constructor •() → self::D*
-    ;
-}
-abstract class _Foo&Object&C = core::Object with self::C<self::B*> /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Foo&Object&C*
-    : super core::Object::•()
-    ;
-  mixin-super-stub get _field() → self::B*
-    return super.{self::C::_field};
-  mixin-super-stub set _field(generic-covariant-impl self::B* value) → void
-    return super.{self::C::_field} = value;
-  mixin-super-stub method foo(generic-covariant-impl self::B* x) → dynamic
-    return super.{self::C::foo}(x);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends self::_Foo&Object&C {
-  synthetic constructor •() → self::Foo*
-    ;
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.transformed.expect
deleted file mode 100644
index 9828c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_inherited_setter_for_mixed_in_field.dart.weak.transformed.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends self::A* = self::A*> extends core::Object {
-  generic-covariant-impl field self::C::T* _field = null;
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  method foo(generic-covariant-impl self::C::T* x) → dynamic {
-    this.{self::C::_field} = x;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C<self::B*> {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-}
-abstract class _Foo&Object&C extends core::Object implements self::C<self::B*> /*isAnonymousMixin,isEliminatedMixin*/  {
-  generic-covariant-impl field self::B* _field = null;
-  synthetic constructor •() → self::_Foo&Object&C*
-    : super core::Object::•()
-    ;
-  method foo(generic-covariant-impl self::B* x) → dynamic {
-    this.{self::C::_field} = x;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo extends self::_Foo&Object&C {
-  synthetic constructor •() → self::Foo*
-    : super self::_Foo&Object&C::•()
-    ;
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  foo.{self::_Foo&Object&C::foo}(new self::B::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart
deleted file mode 100644
index 017b36b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-abstract class M {
-  var m;
-}
-
-abstract class N extends M {
-  void set superM(value) {
-    super.m = value;
-  }
-
-  get superM => super.m;
-}
-
-class S {}
-
-class Named = S with M, N, M;
-
-main() {
-  Named named = new Named();
-  named.m = 42;
-  named.superM = 87;
-  if (named.m != 42) {
-    throw "Bad mixin translation of set:superM";
-  }
-  if (named.superM != 87) {
-    throw "Bad mixin translation of get:superM";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.textual_outline.expect
deleted file mode 100644
index 0a4bcf8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-abstract class M {
-  var m;
-}
-
-abstract class N extends M {
-  void set superM(value) {}
-  get superM => super.m;
-}
-
-class S {}
-
-class Named = S with M, N, M;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5c804c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-abstract class M {
-  var m;
-}
-
-abstract class N extends M {
-  get superM => super.m;
-  void set superM(value) {}
-}
-
-class Named = S with M, N, M;
-
-class S {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.expect
deleted file mode 100644
index e9d4ae3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.expect
+++ /dev/null
@@ -1,83 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class M extends core::Object {
-  field dynamic m = null;
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class N extends self::M {
-  synthetic constructor •() → self::N*
-    : super self::M::•()
-    ;
-  set superM(dynamic value) → void {
-    super.{self::M::m} = value;
-  }
-  get superM() → dynamic
-    return super.{self::M::m};
-}
-class S extends core::Object {
-  synthetic constructor •() → self::S*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Named&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Named&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub get m() → dynamic
-    return super.{self::M::m};
-  mixin-super-stub set m(dynamic value) → void
-    return super.{self::M::m} = value;
-}
-abstract class _Named&S&M&N = self::_Named&S&M with self::N /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Named&S&M&N*
-    : super self::_Named&S&M::•()
-    ;
-  mixin-super-stub get superM() → dynamic
-    return super.{self::N::superM};
-  mixin-super-stub set superM(dynamic value) → void
-    return super.{self::N::superM} = value;
-}
-class Named = self::_Named&S&M&N with self::M {
-  synthetic constructor •() → self::Named*
-    : super self::_Named&S&M&N::•()
-    ;
-  mixin-super-stub get m() → dynamic
-    return super.{self::M::m};
-  mixin-super-stub set m(dynamic value) → void
-    return super.{self::M::m} = value;
-}
-static method main() → dynamic {
-  self::Named* named = new self::Named::•();
-  named.{self::Named::m} = 42;
-  named.{self::_Named&S&M&N::superM} = 87;
-  if(!named.{self::Named::m}.{core::Object::==}(42)) {
-    throw "Bad mixin translation of set:superM";
-  }
-  if(!named.{self::_Named&S&M&N::superM}.{core::Object::==}(87)) {
-    throw "Bad mixin translation of get:superM";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.outline.expect
deleted file mode 100644
index 1a4626c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.outline.expect
+++ /dev/null
@@ -1,70 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class M extends core::Object {
-  field dynamic m;
-  synthetic constructor •() → self::M*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class N extends self::M {
-  synthetic constructor •() → self::N*
-    ;
-  set superM(dynamic value) → void
-    ;
-  get superM() → dynamic
-    ;
-}
-class S extends core::Object {
-  synthetic constructor •() → self::S*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Named&S&M = self::S with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Named&S&M*
-    : super self::S::•()
-    ;
-  mixin-super-stub get m() → dynamic
-    return super.{self::M::m};
-  mixin-super-stub set m(dynamic value) → void
-    return super.{self::M::m} = value;
-}
-abstract class _Named&S&M&N = self::_Named&S&M with self::N /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_Named&S&M&N*
-    : super self::_Named&S&M::•()
-    ;
-  mixin-super-stub get superM() → dynamic
-    return super.{self::N::superM};
-  mixin-super-stub set superM(dynamic value) → void
-    return super.{self::N::superM} = value;
-}
-class Named = self::_Named&S&M&N with self::M {
-  synthetic constructor •() → self::Named*
-    : super self::_Named&S&M&N::•()
-    ;
-  mixin-super-stub get m() → dynamic
-    return super.{self::M::m};
-  mixin-super-stub set m(dynamic value) → void
-    return super.{self::M::m} = value;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.transformed.expect
deleted file mode 100644
index 94ee731..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_super_repeated.dart.weak.transformed.expect
+++ /dev/null
@@ -1,98 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class M extends core::Object {
-  field dynamic m = null;
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class N extends self::M {
-  synthetic constructor •() → self::N*
-    : super self::M::•()
-    ;
-  set superM(dynamic value) → void {
-    super.{self::M::m} = value;
-  }
-  get superM() → dynamic
-    return super.{self::M::m};
-}
-class S extends core::Object {
-  synthetic constructor •() → self::S*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Named&S&M extends self::S implements self::M /*isAnonymousMixin,isEliminatedMixin*/  {
-  field dynamic m = null;
-  synthetic constructor •() → self::_Named&S&M*
-    : super self::S::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _Named&S&M&N extends self::_Named&S&M implements self::N /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_Named&S&M&N*
-    : super self::_Named&S&M::•()
-    ;
-  get superM() → dynamic
-    return super.{self::M::m};
-  set superM(dynamic value) → void {
-    super.{self::M::m} = value;
-  }
-}
-class Named extends self::_Named&S&M&N implements self::M /*isEliminatedMixin*/  {
-  field dynamic m = null;
-  synthetic constructor •() → self::Named*
-    : super self::_Named&S&M&N::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Named* named = new self::Named::•();
-  named.{self::Named::m} = 42;
-  named.{self::_Named&S&M&N::superM} = 87;
-  if(!named.{self::Named::m}.{core::Object::==}(42)) {
-    throw "Bad mixin translation of set:superM";
-  }
-  if(!named.{self::_Named&S&M&N::superM}.{core::Object::==}(87)) {
-    throw "Bad mixin translation of get:superM";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart
deleted file mode 100644
index f7d0b31..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// 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.6
-
-class A extends B with M {}
-
-class B {
-  final Object m = null;
-}
-
-class M {
-  static Object m() => null;
-}
-
-main() {
-  new A();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.textual_outline.expect
deleted file mode 100644
index 8cbf995..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class A extends B with M {}
-
-class B {
-  final Object m = null;
-}
-
-class M {
-  static Object m() => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.textual_outline_modelled.expect
deleted file mode 100644
index 8cbf995..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class A extends B with M {}
-
-class B {
-  final Object m = null;
-}
-
-class M {
-  static Object m() => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.expect
deleted file mode 100644
index e89e537..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class _A&B&M = self::B with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A&B&M*
-    : super self::B::•()
-    ;
-}
-class A extends self::_A&B&M {
-  synthetic constructor •() → self::A*
-    : super self::_A&B&M::•()
-    ;
-}
-class B extends core::Object {
-  final field core::Object* m = null;
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  static method m() → core::Object*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.outline.expect
deleted file mode 100644
index 8799c3a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.outline.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class _A&B&M = self::B with self::M /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_A&B&M*
-    : super self::B::•()
-    ;
-}
-class A extends self::_A&B&M {
-  synthetic constructor •() → self::A*
-    ;
-}
-class B extends core::Object {
-  final field core::Object* m;
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    ;
-  static method m() → core::Object*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.transformed.expect
deleted file mode 100644
index 73ff777..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/mixin_with_static_member.dart.weak.transformed.expect
+++ /dev/null
@@ -1,62 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class _A&B&M extends self::B implements self::M /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_A&B&M*
-    : super self::B::•()
-    ;
-  static method m() → core::Object*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends self::_A&B&M {
-  synthetic constructor •() → self::A*
-    : super self::_A&B&M::•()
-    ;
-}
-class B extends core::Object {
-  final field core::Object* m = null;
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class M extends core::Object {
-  synthetic constructor •() → self::M*
-    : super core::Object::•()
-    ;
-  static method m() → core::Object*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart b/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart
deleted file mode 100644
index b6c526d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class T {}
-
-class V {}
-
-test() {
-  T t;
-  V v;
-  {
-    // This doesn't cause an error as the previous use of T is in an enclosing
-    // scope.
-    T() {}
-  }
-  {
-    // This doesn't cause an error as the previous use of V is in an enclosing
-    // scope.
-    var v;
-  }
-  {
-    T t;
-    // This doesn't cause a scope error as the named function expression has
-    // its own scope.
-    var x = T() {};
-  }
-  {
-    V v;
-    // This causes an error, V is already used in this scope.
-    var V;
-  }
-  {
-    V v;
-    // This causes an error, V is already used in this scope.
-    var V = null;
-  }
-  {
-    // This causes a scope error as T is already used in the function-type
-    // scope (the return type).
-    var x = T T() {};
-  }
-  {
-    // This causes a scope error: using the outer definition of `V` as a type
-    // when defining `V`.
-
-    V V;
-  }
-  {
-    // This causes a scope error as T is already defined as a type variable in
-    // the function-type scope.
-    var x = T<T>() {};
-  }
-  {
-    T t;
-    T T() {}
-  }
-  {
-    T T() {}
-  }
-  {
-    T t;
-    T T(T t) {}
-  }
-  {
-    T T(T t) {}
-  }
-  {
-    void T(T t) {}
-  }
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.textual_outline.expect
deleted file mode 100644
index 2cdd1a7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class T {}
-
-class V {}
-
-test() {}
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.textual_outline_modelled.expect
deleted file mode 100644
index 2cdd1a7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class T {}
-
-class V {}
-
-test() {}
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.expect
deleted file mode 100644
index 06487ac..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.expect
+++ /dev/null
@@ -1,195 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:28:13: Error: A function expression can't have a name.
-//     var x = T() {};
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:33:9: Error: Can't declare 'V' because it was already used in this scope.
-//     var V;
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:31:5: Context: Previous use of 'V'.
-//     V v;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:38:9: Error: Can't declare 'V' because it was already used in this scope.
-//     var V = null;
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:36:5: Context: Previous use of 'V'.
-//     V v;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:15: Error: A function expression can't have a name.
-//     var x = T T() {};
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:15: Error: Can't declare 'T' because it was already used in this scope.
-//     var x = T T() {};
-//               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:13: Context: Previous use of 'T'.
-//     var x = T T() {};
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:49:7: Error: Can't declare 'V' because it was already used in this scope.
-//     V V;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:49:5: Context: Previous use of 'V'.
-//     V V;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:13: Error: A function expression can't have a name.
-//     var x = T<T>() {};
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:13: Error: 'T' is already declared in this scope.
-//     var x = T<T>() {};
-//             ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:15: Context: Previous declaration of 'T'.
-//     var x = T<T>() {};
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:58:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T() {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:57:5: Context: Previous use of 'T'.
-//     T t;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:61:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T() {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:61:5: Context: Previous use of 'T'.
-//     T T() {}
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:65:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T(T t) {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:64:5: Context: Previous use of 'T'.
-//     T t;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:68:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T(T t) {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:68:5: Context: Previous use of 'T'.
-//     T T(T t) {}
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:71:12: Error: 'T' isn't a type.
-//     void T(T t) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class T extends core::Object {
-  synthetic constructor •() → self::T*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class V extends core::Object {
-  synthetic constructor •() → self::V*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  self::T* t;
-  self::V* v;
-  {
-    function T() → Null {}
-  }
-  {
-    dynamic v;
-  }
-  {
-    self::T* t;
-    () →* Null x = let final () →* Null T = () → Null {} in T;
-  }
-  {
-    self::V* v;
-    dynamic V = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:33:9: Error: Can't declare 'V' because it was already used in this scope.
-    var V;
-        ^";
-  }
-  {
-    self::V* v;
-    dynamic V = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:38:9: Error: Can't declare 'V' because it was already used in this scope.
-    var V = null;
-        ^" in null;
-  }
-  {
-    () →* Null x = let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:15: Error: Can't declare 'T' because it was already used in this scope.
-    var x = T T() {};
-              ^" in let final () →* Null T = () → Null {} in T;
-  }
-  {
-    self::V* V = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:49:7: Error: Can't declare 'V' because it was already used in this scope.
-    V V;
-      ^" as{TypeError,ForDynamic} self::V*;
-  }
-  {
-    <T extends core::Object* = dynamic>() →* Null x = let final dynamic #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:13: Error: 'T' is already declared in this scope.
-    var x = T<T>() {};
-            ^" in let final <T extends core::Object* = dynamic>() →* Null T = <T extends core::Object* = dynamic>() → Null {} in T;
-  }
-  {
-    self::T* t;
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:58:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T() {}
-      ^";
-      function T() → self::T* {}
-    }
-  }
-  {
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:61:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T() {}
-      ^";
-      function T() → self::T* {}
-    }
-  }
-  {
-    self::T* t;
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:65:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T(T t) {}
-      ^";
-      function T(self::T* t) → self::T* {}
-    }
-  }
-  {
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:68:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T(T t) {}
-      ^";
-      function T(self::T* t) → self::T* {}
-    }
-  }
-  {
-    function T(invalid-type t) → void {}
-  }
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.outline.expect
deleted file mode 100644
index 7d88d26..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.outline.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class T extends core::Object {
-  synthetic constructor •() → self::T*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class V extends core::Object {
-  synthetic constructor •() → self::V*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic
-  ;
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.transformed.expect
deleted file mode 100644
index 2f063fe..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart.weak.transformed.expect
+++ /dev/null
@@ -1,195 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:28:13: Error: A function expression can't have a name.
-//     var x = T() {};
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:33:9: Error: Can't declare 'V' because it was already used in this scope.
-//     var V;
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:31:5: Context: Previous use of 'V'.
-//     V v;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:38:9: Error: Can't declare 'V' because it was already used in this scope.
-//     var V = null;
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:36:5: Context: Previous use of 'V'.
-//     V v;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:15: Error: A function expression can't have a name.
-//     var x = T T() {};
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:15: Error: Can't declare 'T' because it was already used in this scope.
-//     var x = T T() {};
-//               ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:13: Context: Previous use of 'T'.
-//     var x = T T() {};
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:49:7: Error: Can't declare 'V' because it was already used in this scope.
-//     V V;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:49:5: Context: Previous use of 'V'.
-//     V V;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:13: Error: A function expression can't have a name.
-//     var x = T<T>() {};
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:13: Error: 'T' is already declared in this scope.
-//     var x = T<T>() {};
-//             ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:15: Context: Previous declaration of 'T'.
-//     var x = T<T>() {};
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:58:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T() {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:57:5: Context: Previous use of 'T'.
-//     T t;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:61:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T() {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:61:5: Context: Previous use of 'T'.
-//     T T() {}
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:65:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T(T t) {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:64:5: Context: Previous use of 'T'.
-//     T t;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:68:7: Error: Can't declare 'T' because it was already used in this scope.
-//     T T(T t) {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:68:5: Context: Previous use of 'T'.
-//     T T(T t) {}
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:71:12: Error: 'T' isn't a type.
-//     void T(T t) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class T extends core::Object {
-  synthetic constructor •() → self::T*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class V extends core::Object {
-  synthetic constructor •() → self::V*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test() → dynamic {
-  self::T* t;
-  self::V* v;
-  {
-    function T() → Null {}
-  }
-  {
-    dynamic v;
-  }
-  {
-    self::T* t;
-    () →* Null x = let final () →* Null T = () → Null {} in T;
-  }
-  {
-    self::V* v;
-    dynamic V = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:33:9: Error: Can't declare 'V' because it was already used in this scope.
-    var V;
-        ^";
-  }
-  {
-    self::V* v;
-    dynamic V = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:38:9: Error: Can't declare 'V' because it was already used in this scope.
-    var V = null;
-        ^" in null;
-  }
-  {
-    () →* Null x = let final dynamic #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:43:15: Error: Can't declare 'T' because it was already used in this scope.
-    var x = T T() {};
-              ^" in let final () →* Null T = () → Null {} in T;
-  }
-  {
-    self::V* V = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:49:7: Error: Can't declare 'V' because it was already used in this scope.
-    V V;
-      ^";
-  }
-  {
-    <T extends core::Object* = dynamic>() →* Null x = let final dynamic #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:54:13: Error: 'T' is already declared in this scope.
-    var x = T<T>() {};
-            ^" in let final <T extends core::Object* = dynamic>() →* Null T = <T extends core::Object* = dynamic>() → Null {} in T;
-  }
-  {
-    self::T* t;
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:58:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T() {}
-      ^";
-      function T() → self::T* {}
-    }
-  }
-  {
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:61:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T() {}
-      ^";
-      function T() → self::T* {}
-    }
-  }
-  {
-    self::T* t;
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:65:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T(T t) {}
-      ^";
-      function T(self::T* t) → self::T* {}
-    }
-  }
-  {
-    {
-      invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/named_function_scope.dart:68:7: Error: Can't declare 'T' because it was already used in this scope.
-    T T(T t) {}
-      ^";
-      function T(self::T* t) → self::T* {}
-    }
-  }
-  {
-    function T(invalid-type t) → void {}
-  }
-}
-static method main() → void {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart b/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart
deleted file mode 100644
index d916ddc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class Superclass {
-  foo({alpha, beta}) {}
-  bar({beta, alpha}) {}
-
-  namedCallback(callback({String alpha, int beta})) {
-    callback(alpha: 'one', beta: 2);
-    callback(beta: 1, alpha: 'two');
-  }
-}
-
-class Subclass extends Superclass {
-  foo({beta, alpha}) {}
-  bar({alpha, beta}) {}
-
-  namedCallback(callback({int beta, String alpha})) {}
-}
-
-topLevelNamed(beta, alpha, {gamma, delta}) {}
-topLevelOptional(beta, alpha, [gamma, delta]) {}
-
-main() {
-  new Subclass().foo(beta: 1, alpha: 2);
-  new Subclass().foo(alpha: 1, beta: 2);
-  topLevelNamed(1, 2, gamma: 3, delta: 4);
-  topLevelNamed(1, 2, delta: 3, gamma: 4);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.textual_outline.expect
deleted file mode 100644
index c269fb4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-class Superclass {
-  foo({alpha, beta}) {}
-  bar({beta, alpha}) {}
-  namedCallback(callback({String alpha, int beta})) {}
-}
-
-class Subclass extends Superclass {
-  foo({beta, alpha}) {}
-  bar({alpha, beta}) {}
-  namedCallback(callback({int beta, String alpha})) {}
-}
-
-topLevelNamed(beta, alpha, {gamma, delta}) {}
-topLevelOptional(beta, alpha, [gamma, delta]) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.textual_outline_modelled.expect
deleted file mode 100644
index 07b9e96..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-class Subclass extends Superclass {
-  bar({alpha, beta}) {}
-  foo({beta, alpha}) {}
-  namedCallback(callback({int beta, String alpha})) {}
-}
-
-class Superclass {
-  bar({beta, alpha}) {}
-  foo({alpha, beta}) {}
-  namedCallback(callback({String alpha, int beta})) {}
-}
-
-main() {}
-topLevelNamed(beta, alpha, {gamma, delta}) {}
-topLevelOptional(beta, alpha, [gamma, delta]) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.expect
deleted file mode 100644
index 1aa5f44..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Superclass extends core::Object {
-  synthetic constructor •() → self::Superclass*
-    : super core::Object::•()
-    ;
-  method foo({dynamic alpha = #C1, dynamic beta = #C1}) → dynamic {}
-  method bar({dynamic beta = #C1, dynamic alpha = #C1}) → dynamic {}
-  method namedCallback(({alpha: core::String*, beta: core::int*}) →* dynamic callback) → dynamic {
-    callback.call(alpha: "one", beta: 2);
-    callback.call(beta: 1, alpha: "two");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Subclass extends self::Superclass {
-  synthetic constructor •() → self::Subclass*
-    : super self::Superclass::•()
-    ;
-  method foo({dynamic beta = #C1, dynamic alpha = #C1}) → dynamic {}
-  method bar({dynamic alpha = #C1, dynamic beta = #C1}) → dynamic {}
-  method namedCallback(({alpha: core::String*, beta: core::int*}) →* dynamic callback) → dynamic {}
-}
-static method topLevelNamed(dynamic beta, dynamic alpha, {dynamic gamma = #C1, dynamic delta = #C1}) → dynamic {}
-static method topLevelOptional(dynamic beta, dynamic alpha, [dynamic gamma = #C1, dynamic delta = #C1]) → dynamic {}
-static method main() → dynamic {
-  new self::Subclass::•().{self::Subclass::foo}(beta: 1, alpha: 2);
-  new self::Subclass::•().{self::Subclass::foo}(alpha: 1, beta: 2);
-  self::topLevelNamed(1, 2, gamma: 3, delta: 4);
-  self::topLevelNamed(1, 2, delta: 3, gamma: 4);
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.outline.expect
deleted file mode 100644
index 2acc570..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.outline.expect
+++ /dev/null
@@ -1,40 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Superclass extends core::Object {
-  synthetic constructor •() → self::Superclass*
-    ;
-  method foo({dynamic alpha, dynamic beta}) → dynamic
-    ;
-  method bar({dynamic beta, dynamic alpha}) → dynamic
-    ;
-  method namedCallback(({alpha: core::String*, beta: core::int*}) →* dynamic callback) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Subclass extends self::Superclass {
-  synthetic constructor •() → self::Subclass*
-    ;
-  method foo({dynamic beta, dynamic alpha}) → dynamic
-    ;
-  method bar({dynamic alpha, dynamic beta}) → dynamic
-    ;
-  method namedCallback(({alpha: core::String*, beta: core::int*}) →* dynamic callback) → dynamic
-    ;
-}
-static method topLevelNamed(dynamic beta, dynamic alpha, {dynamic gamma, dynamic delta}) → dynamic
-  ;
-static method topLevelOptional(dynamic beta, dynamic alpha, [dynamic gamma, dynamic delta]) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.transformed.expect
deleted file mode 100644
index 1aa5f44..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/named_parameters.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Superclass extends core::Object {
-  synthetic constructor •() → self::Superclass*
-    : super core::Object::•()
-    ;
-  method foo({dynamic alpha = #C1, dynamic beta = #C1}) → dynamic {}
-  method bar({dynamic beta = #C1, dynamic alpha = #C1}) → dynamic {}
-  method namedCallback(({alpha: core::String*, beta: core::int*}) →* dynamic callback) → dynamic {
-    callback.call(alpha: "one", beta: 2);
-    callback.call(beta: 1, alpha: "two");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Subclass extends self::Superclass {
-  synthetic constructor •() → self::Subclass*
-    : super self::Superclass::•()
-    ;
-  method foo({dynamic beta = #C1, dynamic alpha = #C1}) → dynamic {}
-  method bar({dynamic alpha = #C1, dynamic beta = #C1}) → dynamic {}
-  method namedCallback(({alpha: core::String*, beta: core::int*}) →* dynamic callback) → dynamic {}
-}
-static method topLevelNamed(dynamic beta, dynamic alpha, {dynamic gamma = #C1, dynamic delta = #C1}) → dynamic {}
-static method topLevelOptional(dynamic beta, dynamic alpha, [dynamic gamma = #C1, dynamic delta = #C1]) → dynamic {}
-static method main() → dynamic {
-  new self::Subclass::•().{self::Subclass::foo}(beta: 1, alpha: 2);
-  new self::Subclass::•().{self::Subclass::foo}(alpha: 1, beta: 2);
-  self::topLevelNamed(1, 2, gamma: 3, delta: 4);
-  self::topLevelNamed(1, 2, delta: 3, gamma: 4);
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart b/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart
deleted file mode 100644
index d0eefa6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-main() {
-  print(new W().native);
-  print(new X().native());
-  print(new Y2().native);
-  print((new Z()..native = "setter").f);
-}
-
-class W {
-  String native;
-  W() : native = "field";
-}
-
-class X {
-  String native() => "method";
-}
-
-abstract class Y1 {
-  String get native;
-}
-
-class Y2 extends Y1 {
-  @override
-  String get native => "getter";
-}
-
-class Z {
-  set native(String s) => f = s;
-  String f;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.textual_outline.expect
deleted file mode 100644
index f9ea52b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.textual_outline.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-// @dart = 2.6
-main() {}
-
-class W {
-  String native;
-  W() : native = "field";
-}
-
-class X {
-  String native() => "method";
-}
-
-abstract class Y1 {
-  String get native;
-}
-
-class Y2 extends Y1 {
-  @override
-  String get native => "getter";
-}
-
-class Z {
-  set native(String s) => f = s;
-  String f;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.textual_outline_modelled.expect
deleted file mode 100644
index dea0ab9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-// @dart = 2.6
-abstract class Y1 {
-  String get native;
-}
-
-class W {
-  String native;
-  W() : native = "field";
-}
-
-class X {
-  String native() => "method";
-}
-
-class Y2 extends Y1 {
-  @override
-  String get native => "getter";
-}
-
-class Z {
-  String f;
-  set native(String s) => f = s;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.expect
deleted file mode 100644
index 1262765..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.expect
+++ /dev/null
@@ -1,91 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class W extends core::Object {
-  field core::String* native;
-  constructor •() → self::W*
-    : self::W::native = "field", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  method native() → core::String*
-    return "method";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Y1 extends core::Object {
-  synthetic constructor •() → self::Y1*
-    : super core::Object::•()
-    ;
-  abstract get native() → core::String*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y2 extends self::Y1 {
-  synthetic constructor •() → self::Y2*
-    : super self::Y1::•()
-    ;
-  @#C1
-  get native() → core::String*
-    return "getter";
-}
-class Z extends core::Object {
-  field core::String* f = null;
-  synthetic constructor •() → self::Z*
-    : super core::Object::•()
-    ;
-  set native(core::String* s) → void
-    return this.{self::Z::f} = s;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::print(new self::W::•().{self::W::native});
-  core::print(new self::X::•().{self::X::native}());
-  core::print(new self::Y2::•().{self::Y2::native});
-  core::print((let final self::Z* #t1 = new self::Z::•() in block {
-    #t1.{self::Z::native} = "setter";
-  } =>#t1).{self::Z::f});
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.outline.expect
deleted file mode 100644
index d96a8b6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.outline.expect
+++ /dev/null
@@ -1,81 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class W extends core::Object {
-  field core::String* native;
-  constructor •() → self::W*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    ;
-  method native() → core::String*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Y1 extends core::Object {
-  synthetic constructor •() → self::Y1*
-    ;
-  abstract get native() → core::String*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y2 extends self::Y1 {
-  synthetic constructor •() → self::Y2*
-    ;
-  @core::override
-  get native() → core::String*
-    ;
-}
-class Z extends core::Object {
-  field core::String* f;
-  synthetic constructor •() → self::Z*
-    ;
-  set native(core::String* s) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///native_as_name.dart:28:4 -> InstanceConstant(const _Override{})
-Extra constant evaluation: evaluated: 1, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.transformed.expect
deleted file mode 100644
index 1262765..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/native_as_name.dart.weak.transformed.expect
+++ /dev/null
@@ -1,91 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class W extends core::Object {
-  field core::String* native;
-  constructor •() → self::W*
-    : self::W::native = "field", super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  method native() → core::String*
-    return "method";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Y1 extends core::Object {
-  synthetic constructor •() → self::Y1*
-    : super core::Object::•()
-    ;
-  abstract get native() → core::String*;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y2 extends self::Y1 {
-  synthetic constructor •() → self::Y2*
-    : super self::Y1::•()
-    ;
-  @#C1
-  get native() → core::String*
-    return "getter";
-}
-class Z extends core::Object {
-  field core::String* f = null;
-  synthetic constructor •() → self::Z*
-    : super core::Object::•()
-    ;
-  set native(core::String* s) → void
-    return this.{self::Z::f} = s;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::print(new self::W::•().{self::W::native});
-  core::print(new self::X::•().{self::X::native}());
-  core::print(new self::Y2::•().{self::Y2::native});
-  core::print((let final self::Z* #t1 = new self::Z::•() in block {
-    #t1.{self::Z::native} = "setter";
-  } =>#t1).{self::Z::f});
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart b/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart
deleted file mode 100644
index a9c3e76..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-const int foo = const int.fromEnvironment("fisk");
-
-class A {
-  final int bar;
-  const A(this.bar);
-}
-
-class B {
-  final A baz;
-  const B(this.baz);
-}
-
-class C {
-  fun() {
-    B(A(foo));
-  }
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.textual_outline.expect
deleted file mode 100644
index f881723..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.textual_outline.expect
+++ /dev/null
@@ -1,18 +0,0 @@
-// @dart = 2.6
-const int foo = const int.fromEnvironment("fisk");
-
-class A {
-  final int bar;
-  const A(this.bar);
-}
-
-class B {
-  final A baz;
-  const B(this.baz);
-}
-
-class C {
-  fun() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.textual_outline_modelled.expect
deleted file mode 100644
index f951d0e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-class A {
-  const A(this.bar);
-  final int bar;
-}
-
-class B {
-  const B(this.baz);
-  final A baz;
-}
-
-class C {
-  fun() {}
-}
-
-const int foo = const int.fromEnvironment("fisk");
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.expect
deleted file mode 100644
index ddcf830..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  final field core::int* bar;
-  const constructor •(core::int* bar) → self::A*
-    : self::A::bar = bar, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object /*hasConstConstructor*/  {
-  final field self::A* baz;
-  const constructor •(self::A* baz) → self::B*
-    : self::B::baz = baz, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method fun() → dynamic {
-    new self::B::•(new self::A::•(#C1));
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* foo = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.outline.expect
deleted file mode 100644
index a698e84..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.outline.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  final field core::int* bar;
-  const constructor •(core::int* bar) → self::A*
-    : self::A::bar = bar, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object /*hasConstConstructor*/  {
-  final field self::A* baz;
-  const constructor •(self::A* baz) → self::B*
-    : self::B::baz = baz, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method fun() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* foo = const core::int::fromEnvironment("fisk");
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: FactoryConstructorInvocationJudgment @ org-dartlang-testcase:///nested_implicit_const_with_env_var.dart:7:23 -> IntConstant(0)
-Extra constant evaluation: evaluated: 3, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.transformed.expect
deleted file mode 100644
index ddcf830..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_implicit_const_with_env_var.dart.weak.transformed.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  final field core::int* bar;
-  const constructor •(core::int* bar) → self::A*
-    : self::A::bar = bar, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object /*hasConstConstructor*/  {
-  final field self::A* baz;
-  const constructor •(self::A* baz) → self::B*
-    : self::B::baz = baz, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method fun() → dynamic {
-    new self::B::•(new self::A::•(#C1));
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* foo = #C1;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 0
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart b/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart
deleted file mode 100644
index 7c5c3a41..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// 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.6
-
-class NumField {
-  num field;
-}
-
-class IntField {
-  int field;
-}
-
-class DoubleField {
-  double field;
-}
-
-main() {
-  IntField intField1 = new IntField();
-  IntField intField2 = new IntField();
-  NumField numField = new NumField();
-  DoubleField doubleField = new DoubleField();
-
-  intField1.field = intField2.field = numField.field;
-  intField1.field = numField.field = intField2.field;
-  try {
-    numField.field = 0.5;
-    intField1.field = doubleField.field = numField.field;
-    throw 'Should fail';
-  } catch (_) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.textual_outline.expect
deleted file mode 100644
index 7feca64..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class NumField {
-  num field;
-}
-
-class IntField {
-  int field;
-}
-
-class DoubleField {
-  double field;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6053fe8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class DoubleField {
-  double field;
-}
-
-class IntField {
-  int field;
-}
-
-class NumField {
-  num field;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.expect
deleted file mode 100644
index 7283345..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class NumField extends core::Object {
-  field core::num* field = null;
-  synthetic constructor •() → self::NumField*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class IntField extends core::Object {
-  field core::int* field = null;
-  synthetic constructor •() → self::IntField*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class DoubleField extends core::Object {
-  field core::double* field = null;
-  synthetic constructor •() → self::DoubleField*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::IntField* intField1 = new self::IntField::•();
-  self::IntField* intField2 = new self::IntField::•();
-  self::NumField* numField = new self::NumField::•();
-  self::DoubleField* doubleField = new self::DoubleField::•();
-  intField1.{self::IntField::field} = (intField2.{self::IntField::field} = numField.{self::NumField::field} as{TypeError} core::int*) as{TypeError} core::int*;
-  intField1.{self::IntField::field} = numField.{self::NumField::field} = intField2.{self::IntField::field};
-  try {
-    numField.{self::NumField::field} = 0.5;
-    intField1.{self::IntField::field} = (doubleField.{self::DoubleField::field} = numField.{self::NumField::field} as{TypeError} core::double*) as{TypeError} core::int*;
-    throw "Should fail";
-  }
-  on dynamic catch(final dynamic _) {
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.outline.expect
deleted file mode 100644
index f6c61bd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.outline.expect
+++ /dev/null
@@ -1,51 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class NumField extends core::Object {
-  field core::num* field;
-  synthetic constructor •() → self::NumField*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class IntField extends core::Object {
-  field core::int* field;
-  synthetic constructor •() → self::IntField*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class DoubleField extends core::Object {
-  field core::double* field;
-  synthetic constructor •() → self::DoubleField*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.transformed.expect
deleted file mode 100644
index 61ef9de..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_property_set.dart.weak.transformed.expect
+++ /dev/null
@@ -1,67 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class NumField extends core::Object {
-  field core::num* field = null;
-  synthetic constructor •() → self::NumField*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class IntField extends core::Object {
-  field core::int* field = null;
-  synthetic constructor •() → self::IntField*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class DoubleField extends core::Object {
-  field core::double* field = null;
-  synthetic constructor •() → self::DoubleField*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::IntField* intField1 = new self::IntField::•();
-  self::IntField* intField2 = new self::IntField::•();
-  self::NumField* numField = new self::NumField::•();
-  self::DoubleField* doubleField = new self::DoubleField::•();
-  intField1.{self::IntField::field} = intField2.{self::IntField::field} = numField.{self::NumField::field} as{TypeError} core::int*;
-  intField1.{self::IntField::field} = numField.{self::NumField::field} = intField2.{self::IntField::field};
-  try {
-    numField.{self::NumField::field} = 0.5;
-    intField1.{self::IntField::field} = (doubleField.{self::DoubleField::field} = numField.{self::NumField::field} as{TypeError} core::double*) as{TypeError} core::int*;
-    throw "Should fail";
-  }
-  on dynamic catch(final dynamic _) {
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart
deleted file mode 100644
index 790aaaf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// 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.6
-
-main() {
-  int intLocal1;
-  int intLocal2;
-  num numLocal;
-  double doubleLocal;
-
-  intLocal1 = intLocal2 = numLocal;
-  intLocal1 = numLocal = intLocal2;
-  numLocal = 0.5;
-  try {
-    intLocal1 = doubleLocal = numLocal;
-    throw 'Should fail';
-  } catch (_) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.expect
deleted file mode 100644
index 7e193c1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::int* intLocal1;
-  core::int* intLocal2;
-  core::num* numLocal;
-  core::double* doubleLocal;
-  intLocal1 = (intLocal2 = numLocal as{TypeError} core::int*) as{TypeError} core::int*;
-  intLocal1 = numLocal = intLocal2;
-  numLocal = 0.5;
-  try {
-    intLocal1 = (doubleLocal = numLocal as{TypeError} core::double*) as{TypeError} core::int*;
-    throw "Should fail";
-  }
-  on dynamic catch(final dynamic _) {
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.transformed.expect
deleted file mode 100644
index 18a252a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variable_set.dart.weak.transformed.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method main() → dynamic {
-  core::int* intLocal1;
-  core::int* intLocal2;
-  core::num* numLocal;
-  core::double* doubleLocal;
-  intLocal1 = intLocal2 = numLocal as{TypeError} core::int*;
-  intLocal1 = numLocal = intLocal2;
-  numLocal = 0.5;
-  try {
-    intLocal1 = (doubleLocal = numLocal as{TypeError} core::double*) as{TypeError} core::int*;
-    throw "Should fail";
-  }
-  on dynamic catch(final dynamic _) {
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart
deleted file mode 100644
index 6153da9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart
+++ /dev/null
@@ -1,245 +0,0 @@
-// 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.6
-
-// Testing that i2b and checks for correct super-boundedness are applied
-// to type arguments, taking the variance of type parameters into account.
-
-// Standard type comparison support.
-
-typedef F<X> = void Function<Y extends X>();
-F<X> toF<X>(X x) => null;
-
-// Material specific to this test.
-
-typedef Fcov<X> = X Function();
-typedef Fcon<X> = Function(X);
-typedef Finv<X> = X Function(X);
-
-class Acov<X extends Fcov<Y>, Y> {}
-
-class Acon<X extends Fcon<Y>, Y> {}
-
-class Ainv<X extends Finv<Y>, Y> {}
-
-typedef FcovBound<X extends num> = X Function();
-typedef FconBound<X extends num> = Function(X);
-typedef FinvBound<X extends num> = X Function(X);
-
-class AcovBound<X extends FcovBound<Y>, Y extends num> {}
-
-class AconBound<X extends FconBound<Y>, Y extends num> {}
-
-class AinvBound<X extends FinvBound<Y>, Y extends num> {}
-
-class A<X> {}
-
-typedef FcovCyclicBound<X extends A<X>> = X Function();
-typedef FconCyclicBound<X extends A<X>> = Function(X);
-typedef FinvCyclicBound<X extends A<X>> = X Function(X);
-
-class AcovCyclicBound<X extends FcovCyclicBound<Y>, Y extends A<Y>> {}
-
-class AconCyclicBound<X extends FconCyclicBound<Y>, Y extends A<Y>> {}
-
-class AinvCyclicBound<X extends FinvCyclicBound<Y>, Y extends A<Y>> {}
-
-typedef FcovCyclicCoBound<X extends Function(X)> = X Function();
-typedef FconCyclicCoBound<X extends Function(X)> = Function(X);
-typedef FinvCyclicCoBound<X extends Function(X)> = X Function(X);
-
-class AcovCyclicCoBound<X extends FcovCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class AconCyclicCoBound<X extends FconCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class AinvCyclicCoBound<X extends FinvCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class B<X> {}
-
-void testTypeAliasAsTypeArgument() {
-  // I2b: Use bounds (Fcov<Y>, dynamic), then replace covariant occurrence
-  // (of `Y` in `Acov<Fcov<Y>, _>`) by `Y`s value `dynamic`. Resulting type
-  // `Acov<Fcov<dynamic>, dynamic>` is regular-bounded.
-  Acov source1;
-  var fsource1 = toF(source1);
-  F<Acov<Fcov<dynamic>, dynamic>> target1 = fsource1;
-
-  // I2b: Use bounds (Fcon<Y>, dynamic), then replace contravariant occurrence
-  // (of `Y` in `Acon<Fcon<Y>, _>`) by `Null`. Resulting type
-  // is super-bounded: Acon<Fcon<Object>, Null> is regular-bounded.
-  Acon source2;
-  var fsource2 = toF(source2);
-  F<Acon<Fcon<Null>, dynamic>> target2 = fsource2;
-
-  // I2b: Use bounds (Finv<Y>, dynamic) then replace invariant occurrence
-  // (of `Y` in `Ainv<Finv<Y>, _>`) by `Y`s value `dynamic`. Resulting type
-  // `Ainv<Finv<dynamic>, dynamic>` is regular-bounded.
-  Ainv source3;
-  var fsource3 = toF(source3);
-  F<Ainv<Finv<dynamic>, dynamic>> target3 = fsource3;
-
-  // I2b: Use bounds (FcovBound<Y>, num), then replace covariant occurrence
-  // (of `Y` in `AcovBound<FcovBound<Y>, _>`) by `Y`s value `num`.
-  // Resulting type `AcovBound<FcovBound<num>, num>` is regular-bounded.
-  AcovBound source4;
-  var fsource4 = toF(source4);
-  F<AcovBound<FcovBound<num>, num>> target4 = fsource4;
-
-  // I2b: Use bounds (FconBound<Y>, num), then replace contravariant occurrence
-  // of `Y` in `AconBound<FconBound<Y>, _>` by `Null`. Resulting type is
-  // super-bounded: AconBound<FconBound<Object>, num> is regular-bounded.
-  AconBound source5;
-  var fsource5 = toF(source5);
-  F<AconBound<FconBound<Null>, num>> target5 = fsource5;
-
-  // I2b: Use bounds (FinvBound<Y>, num), then replace invariant occurrence
-  // of `Y` in `AinvBound<FinvBound<Y>, _>` by `Y`s value `num`. Resulting
-  // type `AinvBound<FinvBound<num>, num>` is regular-bounded.
-  AinvBound source6;
-  var fsource6 = toF(source6);
-  F<AinvBound<FinvBound<num>, num>> target6 = fsource6;
-
-  // I2b: Use bounds (FcovCyclicBound<Y>, A<Y>), then break cycle {Y} by
-  // replacing covariant occurrence of `Y` in `AcovCyclicBound<_, A<Y>>`
-  // by `dynamic`; then replace covariant occurrence of `Y` in
-  // `AcovCyclicBound<FcovCyclicBound<Y>, _>` by `Y`s value `A<dynamic>`.
-  // Resulting type `AcovCyclicBound<FcovCyclicBound<A<dynamic>>, A<dynamic>>>`
-  // is regular-bounded.
-  AcovCyclicBound source7;
-  var fsource7 = toF(source7);
-  F<AcovCyclicBound<FcovCyclicBound<A<dynamic>>, A<dynamic>>> target7 =
-      fsource7;
-
-  // I2b: Use bounds (FconCyclicBound<Y>, A<Y>), then break cycle {Y} by
-  // replacing covariant occurrence of `Y` in `AconCyclicBound<_, A<Y>>`
-  // by `dynamic`; then replace contravariant occurrence of `Y` in
-  // `AconCyclicBound<FconCyclicBound<Y>, _>` by `Null`.
-  // Resulting type `AconCyclicBound<FconCyclicBound<Null>, A<dynamic>>>` is
-  // super-bounded because `AconCyclicBound<FconCyclicBound<Object>, A<Null>>>`
-  // is regular-bounded.
-  AconCyclicBound source8;
-  var fsource8 = toF(source8);
-  F<AconCyclicBound<FconCyclicBound<Null>, A<dynamic>>> target8 = fsource8;
-
-  // I2b: Use bounds (FinvCyclicBound<Y>, A<Y>), then break cycle {Y} by
-  // replacing covariant occurrence of `Y` in `AinvCyclicBound<_, A<Y>>`
-  // by `dynamic`; then replace invariant occurrence of `Y` in
-  // `AinvCyclicBound<FinvCyclicBound<Y>, _>` by `Y`s value `A<dynamic>`.
-  // Resulting type `AinvCyclicBound<FinvCyclicBound<A<dynamic>>, A<dynamic>>>`
-  // looks regular-bounded, but contains `FinvCyclicBound<A<dynamic>>` which
-  // is not well-bounded.
-  AinvCyclicBound source9; //# 01: compile-time error
-  // var fsource9 = toF(source9);
-  // F<AinvCyclicBound<FinvCyclicBound<A<dynamic>>, A<dynamic>>> target9 =
-  //     fsource9;
-
-  // I2b: Use bounds (FcovCyclicCoBound<Y>, Function(Y)), then break cycle {Y}
-  // by replacing contravariant occurrence of `Y` in
-  // `AcovCyclicCoBound<_, Function(Y)>` by `Null`; then replace covariant
-  // occurrence of `Y` in `AcovCyclicCoBound<FcovCyclicCoBound<Y>, _>` by `Y`s
-  // value `Function(Null)`. Resulting type
-  // `AcovCyclicCoBound<FcovCyclicCoBound<Function(Null)>, Function(Null)>`
-  // is regular-bounded, with subterm `FcovCyclicCoBound<Function(Null)>` which
-  // is super-bounded because `FcovCyclicCoBound<Function(Object)>` is
-  // regular-bounded.
-  AcovCyclicCoBound source10;
-  var fsource10 = toF(source10);
-  F<AcovCyclicCoBound<FcovCyclicCoBound<Function(Null)>, Function(Null)>>
-      target10 = fsource10;
-
-  // I2b: Use bounds (FconCyclicCoBound<Y>, Function(Y)), then break cycle {Y}
-  // by replacing contravariant occurrence of `Y` in
-  // `AconCyclicCoBound<_, Function(Y)>` by `Null`; then replace contravariant
-  // occurrence of `Y` in `AconCyclicCoBound<FconCyclicCoBound<Y>, _>` by
-  // `Null`. Resulting type
-  // `AconCyclicCoBound<FconCyclicCoBound<Null>, Function(Null)>` is
-  // super-bounded because
-  // `AconCyclicCoBound<FconCyclicCoBound<Object>, Function(Object)>` is
-  // regular-bounded.
-  AconCyclicCoBound source11;
-  var fsource11 = toF(source11);
-  F<AconCyclicCoBound<FconCyclicCoBound<Null>, Function(Null)>> target11 =
-      fsource11;
-
-  // I2b: Use bounds (FinvCyclicCoBound<Y>, Function(Y)), then break cycle {Y}
-  // by replacing contravariant occurrence of `Y` in
-  // `AinvCyclicCoBound<_, Function(Y)>` by `Null`; then replace invariant
-  // occurrence of `Y` in `AinvCyclicCoBound<FinvCyclicCoBound<Y>, _>` by `Y`s
-  // value `Function(Null)`.
-  // Resulting type
-  // `AinvCyclicCoBound<FinvCyclicCoBound<Function(Null)>, Function(Null)>>`
-  // looks regular-bounded, but contains `FinvCyclicCoBound<Function(Null)>`
-  // which is not well-bounded.
-  AinvCyclicCoBound source12; //# 02: compile-time error
-  // var fsource12 = toF(source12);
-  // F<AinvCyclicCoBound<FinvCyclicCoBound<Function(Null)>, Function(Null)>>
-  //     target12 = fsource12;
-}
-
-void testNested() {
-  // Everything gets the same treatment when the cases from `testTopLevel`
-  // are duplicated at the nested level in a covariant position.
-
-  B<Acov> source1;
-  var fsource1 = toF(source1);
-  F<B<Acov<Fcov<dynamic>, dynamic>>> target1 = fsource1;
-
-  B<Acon> source2;
-  var fsource2 = toF(source2);
-  F<B<Acon<Fcon<Null>, dynamic>>> target2 = fsource2;
-
-  B<Ainv> source3;
-  var fsource3 = toF(source3);
-  F<B<Ainv<Finv<dynamic>, dynamic>>> target3 = fsource3;
-
-  B<AcovBound> source4;
-  var fsource4 = toF(source4);
-  F<B<AcovBound<FcovBound<num>, num>>> target4 = fsource4;
-
-  B<AconBound> source5;
-  var fsource5 = toF(source5);
-  F<B<AconBound<FconBound<Null>, num>>> target5 = fsource5;
-
-  B<AinvBound> source6;
-  var fsource6 = toF(source6);
-  F<B<AinvBound<FinvBound<num>, num>>> target6 = fsource6;
-
-  B<AcovCyclicBound> source7;
-  var fsource7 = toF(source7);
-  F<B<AcovCyclicBound<FcovCyclicBound<A<dynamic>>, A<dynamic>>>> target7 =
-      fsource7;
-
-  B<AconCyclicBound> source8;
-  var fsource8 = toF(source8);
-  F<B<AconCyclicBound<FconCyclicBound<Null>, A<dynamic>>>> target8 = fsource8;
-
-  B<AinvCyclicBound> source9; //# 03: compile-time error
-  // var fsource9 = toF(source9);
-  // F<B<AinvCyclicBound<FinvCyclicBound<A<dynamic>>, A<dynamic>>>> target9 =
-  //    fsource9;
-
-  B<AcovCyclicCoBound> source10;
-  var fsource10 = toF(source10);
-  F<B<AcovCyclicCoBound<FcovCyclicCoBound<Function(Null)>, Function(Null)>>>
-      target10 = fsource10;
-
-  B<AconCyclicCoBound> source11;
-  var fsource11 = toF(source11);
-  F<B<AconCyclicCoBound<FconCyclicCoBound<Null>, Function(Null)>>> target11 =
-      fsource11;
-
-  B<AinvCyclicCoBound> source12; //# 04: compile-time error
-  // var fsource12 = toF(source12);
-  // F<B<AinvCyclicCoBound<FinvCyclicCoBound<Function(Null)>, Function(Null)>>>
-  //     target12 = fsource12;
-}
-
-main() {
-  testTypeAliasAsTypeArgument();
-  testNested();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.textual_outline.expect
deleted file mode 100644
index f6f8d28..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.textual_outline.expect
+++ /dev/null
@@ -1,53 +0,0 @@
-// @dart = 2.6
-typedef F<X> = void Function<Y extends X>();
-F<X> toF<X>(X x) => null;
-typedef Fcov<X> = X Function();
-typedef Fcon<X> = Function(X);
-typedef Finv<X> = X Function(X);
-
-class Acov<X extends Fcov<Y>, Y> {}
-
-class Acon<X extends Fcon<Y>, Y> {}
-
-class Ainv<X extends Finv<Y>, Y> {}
-
-typedef FcovBound<X extends num> = X Function();
-typedef FconBound<X extends num> = Function(X);
-typedef FinvBound<X extends num> = X Function(X);
-
-class AcovBound<X extends FcovBound<Y>, Y extends num> {}
-
-class AconBound<X extends FconBound<Y>, Y extends num> {}
-
-class AinvBound<X extends FinvBound<Y>, Y extends num> {}
-
-class A<X> {}
-
-typedef FcovCyclicBound<X extends A<X>> = X Function();
-typedef FconCyclicBound<X extends A<X>> = Function(X);
-typedef FinvCyclicBound<X extends A<X>> = X Function(X);
-
-class AcovCyclicBound<X extends FcovCyclicBound<Y>, Y extends A<Y>> {}
-
-class AconCyclicBound<X extends FconCyclicBound<Y>, Y extends A<Y>> {}
-
-class AinvCyclicBound<X extends FinvCyclicBound<Y>, Y extends A<Y>> {}
-
-typedef FcovCyclicCoBound<X extends Function(X)> = X Function();
-typedef FconCyclicCoBound<X extends Function(X)> = Function(X);
-typedef FinvCyclicCoBound<X extends Function(X)> = X Function(X);
-
-class AcovCyclicCoBound<X extends FcovCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class AconCyclicCoBound<X extends FconCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class AinvCyclicCoBound<X extends FinvCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class B<X> {}
-
-void testTypeAliasAsTypeArgument() {}
-void testNested() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.textual_outline_modelled.expect
deleted file mode 100644
index 402b4d5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-// @dart = 2.6
-F<X> toF<X>(X x) => null;
-
-class A<X> {}
-
-class Acon<X extends Fcon<Y>, Y> {}
-
-class AconBound<X extends FconBound<Y>, Y extends num> {}
-
-class AconCyclicBound<X extends FconCyclicBound<Y>, Y extends A<Y>> {}
-
-class AconCyclicCoBound<X extends FconCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class Acov<X extends Fcov<Y>, Y> {}
-
-class AcovBound<X extends FcovBound<Y>, Y extends num> {}
-
-class AcovCyclicBound<X extends FcovCyclicBound<Y>, Y extends A<Y>> {}
-
-class AcovCyclicCoBound<X extends FcovCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class Ainv<X extends Finv<Y>, Y> {}
-
-class AinvBound<X extends FinvBound<Y>, Y extends num> {}
-
-class AinvCyclicBound<X extends FinvCyclicBound<Y>, Y extends A<Y>> {}
-
-class AinvCyclicCoBound<X extends FinvCyclicCoBound<Y>, Y extends Function(Y)> {
-}
-
-class B<X> {}
-
-main() {}
-typedef F<X> = void Function<Y extends X>();
-typedef Fcon<X> = Function(X);
-typedef FconBound<X extends num> = Function(X);
-typedef FconCyclicBound<X extends A<X>> = Function(X);
-typedef FconCyclicCoBound<X extends Function(X)> = Function(X);
-typedef Fcov<X> = X Function();
-typedef FcovBound<X extends num> = X Function();
-typedef FcovCyclicBound<X extends A<X>> = X Function();
-typedef FcovCyclicCoBound<X extends Function(X)> = X Function();
-typedef Finv<X> = X Function(X);
-typedef FinvBound<X extends num> = X Function(X);
-typedef FinvCyclicBound<X extends A<X>> = X Function(X);
-typedef FinvCyclicCoBound<X extends Function(X)> = X Function(X);
-void testNested() {}
-void testTypeAliasAsTypeArgument() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.expect
deleted file mode 100644
index e1dd3c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.expect
+++ /dev/null
@@ -1,301 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F<invariant X extends core::Object* = dynamic> = <Y extends X* = dynamic>() →* void;
-typedef Fcov<X extends core::Object* = dynamic> = () →* X*;
-typedef Fcon<contravariant X extends core::Object* = dynamic> = (X*) →* dynamic;
-typedef Finv<invariant X extends core::Object* = dynamic> = (X*) →* X*;
-typedef FcovBound<X extends core::num* = core::num*> = () →* X*;
-typedef FconBound<contravariant X extends core::num* = core::num*> = (X*) →* dynamic;
-typedef FinvBound<invariant X extends core::num* = core::num*> = (X*) →* X*;
-typedef FcovCyclicBound<X extends self::A<X*>* = self::A<dynamic>*> = () →* X*;
-typedef FconCyclicBound<contravariant X extends self::A<X*>* = self::A<Null>*> = (X*) →* dynamic;
-typedef FinvCyclicBound<invariant X extends self::A<X*>* = self::A<dynamic>*> = (X*) →* X*;
-typedef FcovCyclicCoBound<X extends (X*) →* dynamic = (Null) →* dynamic> = () →* X*;
-typedef FconCyclicCoBound<contravariant X extends (X*) →* dynamic = (dynamic) →* dynamic> = (X*) →* dynamic;
-typedef FinvCyclicCoBound<invariant X extends (X*) →* dynamic = (dynamic) →* dynamic> = (X*) →* X*;
-class Acov<X extends () →* self::Acov::Y* = () →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Acov<self::Acov::X*, self::Acov::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Acon<X extends (self::Acon::Y*) →* dynamic = (Null) →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Acon<self::Acon::X*, self::Acon::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ainv<X extends (self::Ainv::Y*) →* self::Ainv::Y* = (dynamic) →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Ainv<self::Ainv::X*, self::Ainv::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovBound<X extends () →* self::AcovBound::Y* = () →* core::num*, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AcovBound<self::AcovBound::X*, self::AcovBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconBound<X extends (self::AconBound::Y*) →* dynamic = (Null) →* dynamic, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AconBound<self::AconBound::X*, self::AconBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvBound<X extends (self::AinvBound::Y*) →* self::AinvBound::Y* = (core::num*) →* core::num*, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AinvBound<self::AinvBound::X*, self::AinvBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovCyclicBound<X extends () →* self::AcovCyclicBound::Y* = () →* self::A<dynamic>*, Y extends self::A<self::AcovCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AcovCyclicBound<self::AcovCyclicBound::X*, self::AcovCyclicBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconCyclicBound<X extends (self::AconCyclicBound::Y*) →* dynamic = (Null) →* dynamic, Y extends self::A<self::AconCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AconCyclicBound<self::AconCyclicBound::X*, self::AconCyclicBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvCyclicBound<X extends (self::AinvCyclicBound::Y*) →* self::AinvCyclicBound::Y* = (self::A<dynamic>*) →* self::A<dynamic>*, Y extends self::A<self::AinvCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AinvCyclicBound<self::AinvCyclicBound::X*, self::AinvCyclicBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovCyclicCoBound<X extends () →* self::AcovCyclicCoBound::Y* = () →* (Null) →* dynamic, Y extends (self::AcovCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AcovCyclicCoBound<self::AcovCyclicCoBound::X*, self::AcovCyclicCoBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconCyclicCoBound<X extends (self::AconCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic, Y extends (self::AconCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AconCyclicCoBound<self::AconCyclicCoBound::X*, self::AconCyclicCoBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvCyclicCoBound<X extends (self::AinvCyclicCoBound::Y*) →* self::AinvCyclicCoBound::Y* = ((Null) →* dynamic) →* (Null) →* dynamic, Y extends (self::AinvCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AinvCyclicCoBound<self::AinvCyclicCoBound::X*, self::AinvCyclicCoBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method toF<X extends core::Object* = dynamic>(self::toF::X* x) → <Y extends self::toF::X* = dynamic>() →* void
-  return null;
-static method testTypeAliasAsTypeArgument() → void {
-  self::Acov<() →* dynamic, dynamic>* source1;
-  <Y extends self::Acov<() →* dynamic, dynamic>* = dynamic>() →* void fsource1 = self::toF<self::Acov<() →* dynamic, dynamic>*>(source1);
-  <Y extends self::Acov<() →* dynamic, dynamic>* = dynamic>() →* void target1 = fsource1;
-  self::Acon<(Null) →* dynamic, dynamic>* source2;
-  <Y extends self::Acon<(Null) →* dynamic, dynamic>* = dynamic>() →* void fsource2 = self::toF<self::Acon<(Null) →* dynamic, dynamic>*>(source2);
-  <Y extends self::Acon<(Null) →* dynamic, dynamic>* = dynamic>() →* void target2 = fsource2;
-  self::Ainv<(dynamic) →* dynamic, dynamic>* source3;
-  <Y extends self::Ainv<(dynamic) →* dynamic, dynamic>* = dynamic>() →* void fsource3 = self::toF<self::Ainv<(dynamic) →* dynamic, dynamic>*>(source3);
-  <Y extends self::Ainv<(dynamic) →* dynamic, dynamic>* = dynamic>() →* void target3 = fsource3;
-  self::AcovBound<() →* core::num*, core::num*>* source4;
-  <Y extends self::AcovBound<() →* core::num*, core::num*>* = dynamic>() →* void fsource4 = self::toF<self::AcovBound<() →* core::num*, core::num*>*>(source4);
-  <Y extends self::AcovBound<() →* core::num*, core::num*>* = dynamic>() →* void target4 = fsource4;
-  self::AconBound<(Null) →* dynamic, core::num*>* source5;
-  <Y extends self::AconBound<(Null) →* dynamic, core::num*>* = dynamic>() →* void fsource5 = self::toF<self::AconBound<(Null) →* dynamic, core::num*>*>(source5);
-  <Y extends self::AconBound<(Null) →* dynamic, core::num*>* = dynamic>() →* void target5 = fsource5;
-  self::AinvBound<(core::num*) →* core::num*, core::num*>* source6;
-  <Y extends self::AinvBound<(core::num*) →* core::num*, core::num*>* = dynamic>() →* void fsource6 = self::toF<self::AinvBound<(core::num*) →* core::num*, core::num*>*>(source6);
-  <Y extends self::AinvBound<(core::num*) →* core::num*, core::num*>* = dynamic>() →* void target6 = fsource6;
-  self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>* source7;
-  <Y extends self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>* = dynamic>() →* void fsource7 = self::toF<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>(source7);
-  <Y extends self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>* = dynamic>() →* void target7 = fsource7;
-  self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>* source8;
-  <Y extends self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>* = dynamic>() →* void fsource8 = self::toF<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>(source8);
-  <Y extends self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>* = dynamic>() →* void target8 = fsource8;
-  self::AinvCyclicBound<(self::A<dynamic>*) →* self::A<dynamic>*, self::A<dynamic>*>* source9;
-  self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>* source10;
-  <Y extends self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void fsource10 = self::toF<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>(source10);
-  <Y extends self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void target10 = fsource10;
-  self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>* source11;
-  <Y extends self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void fsource11 = self::toF<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>(source11);
-  <Y extends self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void target11 = fsource11;
-  self::AinvCyclicCoBound<((Null) →* dynamic) →* (Null) →* dynamic, (Null) →* dynamic>* source12;
-}
-static method testNested() → void {
-  self::B<self::Acov<() →* dynamic, dynamic>*>* source1;
-  <Y extends self::B<self::Acov<() →* dynamic, dynamic>*>* = dynamic>() →* void fsource1 = self::toF<self::B<self::Acov<() →* dynamic, dynamic>*>*>(source1);
-  <Y extends self::B<self::Acov<() →* dynamic, dynamic>*>* = dynamic>() →* void target1 = fsource1;
-  self::B<self::Acon<(Null) →* dynamic, dynamic>*>* source2;
-  <Y extends self::B<self::Acon<(Null) →* dynamic, dynamic>*>* = dynamic>() →* void fsource2 = self::toF<self::B<self::Acon<(Null) →* dynamic, dynamic>*>*>(source2);
-  <Y extends self::B<self::Acon<(Null) →* dynamic, dynamic>*>* = dynamic>() →* void target2 = fsource2;
-  self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>* source3;
-  <Y extends self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>* = dynamic>() →* void fsource3 = self::toF<self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>*>(source3);
-  <Y extends self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>* = dynamic>() →* void target3 = fsource3;
-  self::B<self::AcovBound<() →* core::num*, core::num*>*>* source4;
-  <Y extends self::B<self::AcovBound<() →* core::num*, core::num*>*>* = dynamic>() →* void fsource4 = self::toF<self::B<self::AcovBound<() →* core::num*, core::num*>*>*>(source4);
-  <Y extends self::B<self::AcovBound<() →* core::num*, core::num*>*>* = dynamic>() →* void target4 = fsource4;
-  self::B<self::AconBound<(Null) →* dynamic, core::num*>*>* source5;
-  <Y extends self::B<self::AconBound<(Null) →* dynamic, core::num*>*>* = dynamic>() →* void fsource5 = self::toF<self::B<self::AconBound<(Null) →* dynamic, core::num*>*>*>(source5);
-  <Y extends self::B<self::AconBound<(Null) →* dynamic, core::num*>*>* = dynamic>() →* void target5 = fsource5;
-  self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>* source6;
-  <Y extends self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>* = dynamic>() →* void fsource6 = self::toF<self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>*>(source6);
-  <Y extends self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>* = dynamic>() →* void target6 = fsource6;
-  self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>* source7;
-  <Y extends self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>* = dynamic>() →* void fsource7 = self::toF<self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>*>(source7);
-  <Y extends self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>* = dynamic>() →* void target7 = fsource7;
-  self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>* source8;
-  <Y extends self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>* = dynamic>() →* void fsource8 = self::toF<self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>*>(source8);
-  <Y extends self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>* = dynamic>() →* void target8 = fsource8;
-  self::B<self::AinvCyclicBound<(self::A<dynamic>*) →* self::A<dynamic>*, self::A<dynamic>*>*>* source9;
-  self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>* source10;
-  <Y extends self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void fsource10 = self::toF<self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>*>(source10);
-  <Y extends self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void target10 = fsource10;
-  self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>* source11;
-  <Y extends self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void fsource11 = self::toF<self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>*>(source11);
-  <Y extends self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void target11 = fsource11;
-  self::B<self::AinvCyclicCoBound<((Null) →* dynamic) →* (Null) →* dynamic, (Null) →* dynamic>*>* source12;
-}
-static method main() → dynamic {
-  self::testTypeAliasAsTypeArgument();
-  self::testNested();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.outline.expect
deleted file mode 100644
index 1172b5e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.outline.expect
+++ /dev/null
@@ -1,221 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F<invariant X extends core::Object* = dynamic> = <Y extends X* = dynamic>() →* void;
-typedef Fcov<X extends core::Object* = dynamic> = () →* X*;
-typedef Fcon<contravariant X extends core::Object* = dynamic> = (X*) →* dynamic;
-typedef Finv<invariant X extends core::Object* = dynamic> = (X*) →* X*;
-typedef FcovBound<X extends core::num* = core::num*> = () →* X*;
-typedef FconBound<contravariant X extends core::num* = core::num*> = (X*) →* dynamic;
-typedef FinvBound<invariant X extends core::num* = core::num*> = (X*) →* X*;
-typedef FcovCyclicBound<X extends self::A<X*>* = self::A<dynamic>*> = () →* X*;
-typedef FconCyclicBound<contravariant X extends self::A<X*>* = self::A<Null>*> = (X*) →* dynamic;
-typedef FinvCyclicBound<invariant X extends self::A<X*>* = self::A<dynamic>*> = (X*) →* X*;
-typedef FcovCyclicCoBound<X extends (X*) →* dynamic = (Null) →* dynamic> = () →* X*;
-typedef FconCyclicCoBound<contravariant X extends (X*) →* dynamic = (dynamic) →* dynamic> = (X*) →* dynamic;
-typedef FinvCyclicCoBound<invariant X extends (X*) →* dynamic = (dynamic) →* dynamic> = (X*) →* X*;
-class Acov<X extends () →* self::Acov::Y* = () →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Acov<self::Acov::X*, self::Acov::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Acon<X extends (self::Acon::Y*) →* dynamic = (Null) →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Acon<self::Acon::X*, self::Acon::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ainv<X extends (self::Ainv::Y*) →* self::Ainv::Y* = (dynamic) →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Ainv<self::Ainv::X*, self::Ainv::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovBound<X extends () →* self::AcovBound::Y* = () →* core::num*, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AcovBound<self::AcovBound::X*, self::AcovBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconBound<X extends (self::AconBound::Y*) →* dynamic = (Null) →* dynamic, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AconBound<self::AconBound::X*, self::AconBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvBound<X extends (self::AinvBound::Y*) →* self::AinvBound::Y* = (core::num*) →* core::num*, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AinvBound<self::AinvBound::X*, self::AinvBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovCyclicBound<X extends () →* self::AcovCyclicBound::Y* = () →* self::A<dynamic>*, Y extends self::A<self::AcovCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AcovCyclicBound<self::AcovCyclicBound::X*, self::AcovCyclicBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconCyclicBound<X extends (self::AconCyclicBound::Y*) →* dynamic = (Null) →* dynamic, Y extends self::A<self::AconCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AconCyclicBound<self::AconCyclicBound::X*, self::AconCyclicBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvCyclicBound<X extends (self::AinvCyclicBound::Y*) →* self::AinvCyclicBound::Y* = (self::A<dynamic>*) →* self::A<dynamic>*, Y extends self::A<self::AinvCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AinvCyclicBound<self::AinvCyclicBound::X*, self::AinvCyclicBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovCyclicCoBound<X extends () →* self::AcovCyclicCoBound::Y* = () →* (Null) →* dynamic, Y extends (self::AcovCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AcovCyclicCoBound<self::AcovCyclicCoBound::X*, self::AcovCyclicCoBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconCyclicCoBound<X extends (self::AconCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic, Y extends (self::AconCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AconCyclicCoBound<self::AconCyclicCoBound::X*, self::AconCyclicCoBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvCyclicCoBound<X extends (self::AinvCyclicCoBound::Y*) →* self::AinvCyclicCoBound::Y* = ((Null) →* dynamic) →* (Null) →* dynamic, Y extends (self::AinvCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AinvCyclicCoBound<self::AinvCyclicCoBound::X*, self::AinvCyclicCoBound::Y*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::X*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method toF<X extends core::Object* = dynamic>(self::toF::X* x) → <Y extends self::toF::X* = dynamic>() →* void
-  ;
-static method testTypeAliasAsTypeArgument() → void
-  ;
-static method testNested() → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.transformed.expect
deleted file mode 100644
index e1dd3c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/nested_variance.dart.weak.transformed.expect
+++ /dev/null
@@ -1,301 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef F<invariant X extends core::Object* = dynamic> = <Y extends X* = dynamic>() →* void;
-typedef Fcov<X extends core::Object* = dynamic> = () →* X*;
-typedef Fcon<contravariant X extends core::Object* = dynamic> = (X*) →* dynamic;
-typedef Finv<invariant X extends core::Object* = dynamic> = (X*) →* X*;
-typedef FcovBound<X extends core::num* = core::num*> = () →* X*;
-typedef FconBound<contravariant X extends core::num* = core::num*> = (X*) →* dynamic;
-typedef FinvBound<invariant X extends core::num* = core::num*> = (X*) →* X*;
-typedef FcovCyclicBound<X extends self::A<X*>* = self::A<dynamic>*> = () →* X*;
-typedef FconCyclicBound<contravariant X extends self::A<X*>* = self::A<Null>*> = (X*) →* dynamic;
-typedef FinvCyclicBound<invariant X extends self::A<X*>* = self::A<dynamic>*> = (X*) →* X*;
-typedef FcovCyclicCoBound<X extends (X*) →* dynamic = (Null) →* dynamic> = () →* X*;
-typedef FconCyclicCoBound<contravariant X extends (X*) →* dynamic = (dynamic) →* dynamic> = (X*) →* dynamic;
-typedef FinvCyclicCoBound<invariant X extends (X*) →* dynamic = (dynamic) →* dynamic> = (X*) →* X*;
-class Acov<X extends () →* self::Acov::Y* = () →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Acov<self::Acov::X*, self::Acov::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Acon<X extends (self::Acon::Y*) →* dynamic = (Null) →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Acon<self::Acon::X*, self::Acon::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Ainv<X extends (self::Ainv::Y*) →* self::Ainv::Y* = (dynamic) →* dynamic, Y extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Ainv<self::Ainv::X*, self::Ainv::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovBound<X extends () →* self::AcovBound::Y* = () →* core::num*, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AcovBound<self::AcovBound::X*, self::AcovBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconBound<X extends (self::AconBound::Y*) →* dynamic = (Null) →* dynamic, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AconBound<self::AconBound::X*, self::AconBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvBound<X extends (self::AinvBound::Y*) →* self::AinvBound::Y* = (core::num*) →* core::num*, Y extends core::num* = core::num*> extends core::Object {
-  synthetic constructor •() → self::AinvBound<self::AinvBound::X*, self::AinvBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovCyclicBound<X extends () →* self::AcovCyclicBound::Y* = () →* self::A<dynamic>*, Y extends self::A<self::AcovCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AcovCyclicBound<self::AcovCyclicBound::X*, self::AcovCyclicBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconCyclicBound<X extends (self::AconCyclicBound::Y*) →* dynamic = (Null) →* dynamic, Y extends self::A<self::AconCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AconCyclicBound<self::AconCyclicBound::X*, self::AconCyclicBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvCyclicBound<X extends (self::AinvCyclicBound::Y*) →* self::AinvCyclicBound::Y* = (self::A<dynamic>*) →* self::A<dynamic>*, Y extends self::A<self::AinvCyclicBound::Y*>* = self::A<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::AinvCyclicBound<self::AinvCyclicBound::X*, self::AinvCyclicBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AcovCyclicCoBound<X extends () →* self::AcovCyclicCoBound::Y* = () →* (Null) →* dynamic, Y extends (self::AcovCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AcovCyclicCoBound<self::AcovCyclicCoBound::X*, self::AcovCyclicCoBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AconCyclicCoBound<X extends (self::AconCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic, Y extends (self::AconCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AconCyclicCoBound<self::AconCyclicCoBound::X*, self::AconCyclicCoBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AinvCyclicCoBound<X extends (self::AinvCyclicCoBound::Y*) →* self::AinvCyclicCoBound::Y* = ((Null) →* dynamic) →* (Null) →* dynamic, Y extends (self::AinvCyclicCoBound::Y*) →* dynamic = (Null) →* dynamic> extends core::Object {
-  synthetic constructor •() → self::AinvCyclicCoBound<self::AinvCyclicCoBound::X*, self::AinvCyclicCoBound::Y*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::B<self::B::X*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method toF<X extends core::Object* = dynamic>(self::toF::X* x) → <Y extends self::toF::X* = dynamic>() →* void
-  return null;
-static method testTypeAliasAsTypeArgument() → void {
-  self::Acov<() →* dynamic, dynamic>* source1;
-  <Y extends self::Acov<() →* dynamic, dynamic>* = dynamic>() →* void fsource1 = self::toF<self::Acov<() →* dynamic, dynamic>*>(source1);
-  <Y extends self::Acov<() →* dynamic, dynamic>* = dynamic>() →* void target1 = fsource1;
-  self::Acon<(Null) →* dynamic, dynamic>* source2;
-  <Y extends self::Acon<(Null) →* dynamic, dynamic>* = dynamic>() →* void fsource2 = self::toF<self::Acon<(Null) →* dynamic, dynamic>*>(source2);
-  <Y extends self::Acon<(Null) →* dynamic, dynamic>* = dynamic>() →* void target2 = fsource2;
-  self::Ainv<(dynamic) →* dynamic, dynamic>* source3;
-  <Y extends self::Ainv<(dynamic) →* dynamic, dynamic>* = dynamic>() →* void fsource3 = self::toF<self::Ainv<(dynamic) →* dynamic, dynamic>*>(source3);
-  <Y extends self::Ainv<(dynamic) →* dynamic, dynamic>* = dynamic>() →* void target3 = fsource3;
-  self::AcovBound<() →* core::num*, core::num*>* source4;
-  <Y extends self::AcovBound<() →* core::num*, core::num*>* = dynamic>() →* void fsource4 = self::toF<self::AcovBound<() →* core::num*, core::num*>*>(source4);
-  <Y extends self::AcovBound<() →* core::num*, core::num*>* = dynamic>() →* void target4 = fsource4;
-  self::AconBound<(Null) →* dynamic, core::num*>* source5;
-  <Y extends self::AconBound<(Null) →* dynamic, core::num*>* = dynamic>() →* void fsource5 = self::toF<self::AconBound<(Null) →* dynamic, core::num*>*>(source5);
-  <Y extends self::AconBound<(Null) →* dynamic, core::num*>* = dynamic>() →* void target5 = fsource5;
-  self::AinvBound<(core::num*) →* core::num*, core::num*>* source6;
-  <Y extends self::AinvBound<(core::num*) →* core::num*, core::num*>* = dynamic>() →* void fsource6 = self::toF<self::AinvBound<(core::num*) →* core::num*, core::num*>*>(source6);
-  <Y extends self::AinvBound<(core::num*) →* core::num*, core::num*>* = dynamic>() →* void target6 = fsource6;
-  self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>* source7;
-  <Y extends self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>* = dynamic>() →* void fsource7 = self::toF<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>(source7);
-  <Y extends self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>* = dynamic>() →* void target7 = fsource7;
-  self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>* source8;
-  <Y extends self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>* = dynamic>() →* void fsource8 = self::toF<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>(source8);
-  <Y extends self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>* = dynamic>() →* void target8 = fsource8;
-  self::AinvCyclicBound<(self::A<dynamic>*) →* self::A<dynamic>*, self::A<dynamic>*>* source9;
-  self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>* source10;
-  <Y extends self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void fsource10 = self::toF<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>(source10);
-  <Y extends self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void target10 = fsource10;
-  self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>* source11;
-  <Y extends self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void fsource11 = self::toF<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>(source11);
-  <Y extends self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>* = dynamic>() →* void target11 = fsource11;
-  self::AinvCyclicCoBound<((Null) →* dynamic) →* (Null) →* dynamic, (Null) →* dynamic>* source12;
-}
-static method testNested() → void {
-  self::B<self::Acov<() →* dynamic, dynamic>*>* source1;
-  <Y extends self::B<self::Acov<() →* dynamic, dynamic>*>* = dynamic>() →* void fsource1 = self::toF<self::B<self::Acov<() →* dynamic, dynamic>*>*>(source1);
-  <Y extends self::B<self::Acov<() →* dynamic, dynamic>*>* = dynamic>() →* void target1 = fsource1;
-  self::B<self::Acon<(Null) →* dynamic, dynamic>*>* source2;
-  <Y extends self::B<self::Acon<(Null) →* dynamic, dynamic>*>* = dynamic>() →* void fsource2 = self::toF<self::B<self::Acon<(Null) →* dynamic, dynamic>*>*>(source2);
-  <Y extends self::B<self::Acon<(Null) →* dynamic, dynamic>*>* = dynamic>() →* void target2 = fsource2;
-  self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>* source3;
-  <Y extends self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>* = dynamic>() →* void fsource3 = self::toF<self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>*>(source3);
-  <Y extends self::B<self::Ainv<(dynamic) →* dynamic, dynamic>*>* = dynamic>() →* void target3 = fsource3;
-  self::B<self::AcovBound<() →* core::num*, core::num*>*>* source4;
-  <Y extends self::B<self::AcovBound<() →* core::num*, core::num*>*>* = dynamic>() →* void fsource4 = self::toF<self::B<self::AcovBound<() →* core::num*, core::num*>*>*>(source4);
-  <Y extends self::B<self::AcovBound<() →* core::num*, core::num*>*>* = dynamic>() →* void target4 = fsource4;
-  self::B<self::AconBound<(Null) →* dynamic, core::num*>*>* source5;
-  <Y extends self::B<self::AconBound<(Null) →* dynamic, core::num*>*>* = dynamic>() →* void fsource5 = self::toF<self::B<self::AconBound<(Null) →* dynamic, core::num*>*>*>(source5);
-  <Y extends self::B<self::AconBound<(Null) →* dynamic, core::num*>*>* = dynamic>() →* void target5 = fsource5;
-  self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>* source6;
-  <Y extends self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>* = dynamic>() →* void fsource6 = self::toF<self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>*>(source6);
-  <Y extends self::B<self::AinvBound<(core::num*) →* core::num*, core::num*>*>* = dynamic>() →* void target6 = fsource6;
-  self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>* source7;
-  <Y extends self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>* = dynamic>() →* void fsource7 = self::toF<self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>*>(source7);
-  <Y extends self::B<self::AcovCyclicBound<() →* self::A<dynamic>*, self::A<dynamic>*>*>* = dynamic>() →* void target7 = fsource7;
-  self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>* source8;
-  <Y extends self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>* = dynamic>() →* void fsource8 = self::toF<self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>*>(source8);
-  <Y extends self::B<self::AconCyclicBound<(Null) →* dynamic, self::A<dynamic>*>*>* = dynamic>() →* void target8 = fsource8;
-  self::B<self::AinvCyclicBound<(self::A<dynamic>*) →* self::A<dynamic>*, self::A<dynamic>*>*>* source9;
-  self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>* source10;
-  <Y extends self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void fsource10 = self::toF<self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>*>(source10);
-  <Y extends self::B<self::AcovCyclicCoBound<() →* (Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void target10 = fsource10;
-  self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>* source11;
-  <Y extends self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void fsource11 = self::toF<self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>*>(source11);
-  <Y extends self::B<self::AconCyclicCoBound<(Null) →* dynamic, (Null) →* dynamic>*>* = dynamic>() →* void target11 = fsource11;
-  self::B<self::AinvCyclicCoBound<((Null) →* dynamic) →* (Null) →* dynamic, (Null) →* dynamic>*>* source12;
-}
-static method main() → dynamic {
-  self::testTypeAliasAsTypeArgument();
-  self::testNested();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart b/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart
deleted file mode 100644
index 2493b60..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import './no_such_method_private_setter_lib.dart';
-
-// `Bar' contains a private setter `_x'. The generated Kernel code for `Foo'
-// should contain a no such method forwarder for `_x'.
-
-class Foo implements Bar {}
-
-main() {
-  baz(new Foo());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.textual_outline.expect
deleted file mode 100644
index 65d942d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import './no_such_method_private_setter_lib.dart';
-
-class Foo implements Bar {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.textual_outline_modelled.expect
deleted file mode 100644
index 65d942d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import './no_such_method_private_setter_lib.dart';
-
-class Foo implements Bar {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.expect
deleted file mode 100644
index ddb32d6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.expect
+++ /dev/null
@@ -1,61 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "no_such_method_private_setter_lib.dart" as no_;
-
-import "org-dartlang-testcase:///no_such_method_private_setter_lib.dart";
-
-class Foo extends core::Object implements no_::Bar {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder get /* from org-dartlang-testcase:///no_such_method_private_setter_lib.dart */ _x() → core::int*
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4))) as{TypeError,ForDynamic} core::int*;
-  no-such-method-forwarder set /* from org-dartlang-testcase:///no_such_method_private_setter_lib.dart */ _x(core::int* value) → void
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-}
-static method main() → dynamic {
-  no_::baz(new self::Foo::•());
-}
-
-library;
-import self as no_;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  field core::int* _x = null;
-  synthetic constructor •() → no_::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(no_::Bar* bar) → void {
-  return;
-}
-
-constants  {
-  #C1 = #org-dartlang-testcase:///no_such_method_private_setter.dart::_x
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-  #C5 = #org-dartlang-testcase:///no_such_method_private_setter.dart::_x=
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.outline.expect
deleted file mode 100644
index c86a630..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.outline.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "no_such_method_private_setter_lib.dart" as no_;
-
-import "org-dartlang-testcase:///no_such_method_private_setter_lib.dart";
-
-class Foo extends core::Object implements no_::Bar {
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder get /* from org-dartlang-testcase:///no_such_method_private_setter_lib.dart */ _x() → core::int*
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#_x, 1, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{}))) as{TypeError,ForDynamic} core::int*;
-  no-such-method-forwarder set /* from org-dartlang-testcase:///no_such_method_private_setter_lib.dart */ _x(core::int* value) → void
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#_x=, 2, const <core::Type*>[], core::List::unmodifiable<dynamic>(<dynamic>[value]), core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-}
-static method main() → dynamic
-  ;
-
-library;
-import self as no_;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  field core::int* _x;
-  synthetic constructor •() → no_::Bar*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(no_::Bar* bar) → void
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///no_such_method_private_setter_lib.dart:10:7 -> SymbolConstant(#_x)
-Evaluated: ListLiteral @ org-dartlang-testcase:///no_such_method_private_setter_lib.dart:10:7 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///no_such_method_private_setter_lib.dart:10:7 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///no_such_method_private_setter_lib.dart:10:7 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///no_such_method_private_setter_lib.dart:10:7 -> SymbolConstant(#_x=)
-Evaluated: ListLiteral @ org-dartlang-testcase:///no_such_method_private_setter_lib.dart:10:7 -> ListConstant(const <Type*>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///no_such_method_private_setter_lib.dart:10:7 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Extra constant evaluation: evaluated: 19, effectively constant: 7
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.transformed.expect
deleted file mode 100644
index 3e79735..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter.dart.weak.transformed.expect
+++ /dev/null
@@ -1,61 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "no_such_method_private_setter_lib.dart" as no_;
-
-import "org-dartlang-testcase:///no_such_method_private_setter_lib.dart";
-
-class Foo extends core::Object implements no_::Bar {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder get /* from org-dartlang-testcase:///no_such_method_private_setter_lib.dart */ _x() → core::int*
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 1, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4))) as{TypeError,ForDynamic} core::int*;
-  no-such-method-forwarder set /* from org-dartlang-testcase:///no_such_method_private_setter_lib.dart */ _x(core::int* value) → void
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#C5, 2, #C2, core::List::unmodifiable<dynamic>(core::_GrowableList::_literal1<dynamic>(value)), core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-}
-static method main() → dynamic {
-  no_::baz(new self::Foo::•());
-}
-
-library;
-import self as no_;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  field core::int* _x = null;
-  synthetic constructor •() → no_::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(no_::Bar* bar) → void {
-  return;
-}
-
-constants  {
-  #C1 = #org-dartlang-testcase:///no_such_method_private_setter.dart::_x
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-  #C5 = #org-dartlang-testcase:///no_such_method_private_setter.dart::_x=
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter_lib.dart
deleted file mode 100644
index 6faa272..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/no_such_method_private_setter_lib.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// Companion library to no_such_method_private_setter.dart.
-
-class Bar {
-  int _x;
-}
-
-void baz(Bar bar) {
-  return;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart b/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart
deleted file mode 100644
index 40e92ca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart
+++ /dev/null
@@ -1,480 +0,0 @@
-// 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.6
-
-/*@testedFeatures=checks*/
-
-class C<T> {
-  C(this.field1)
-      : field2 = (() => field1),
-        field3 = ((T t) {}),
-        field4 = ((T t) => t),
-        field5 = (() => () => field1),
-        field6 = ((T Function() f) {}),
-        field7 = ((T Function() f) => field1),
-        field8 = ((void Function(T) f) {}),
-        field9 = ((void Function(T) f) => field1),
-        field10 = ((T Function(T) f) {}),
-        field11 = ((T Function(T) f) => field1),
-        field12 = <S extends T>() => null,
-        field13 = <S extends T>(S s) {},
-        field14 = <S extends T>(S s) => s,
-        field15 = ((S Function<S extends T>() f) {});
-
-  T field1;
-  T Function() field2;
-  void Function(/*contravariant*/ T) field3;
-  T Function(/*contravariant*/ T) field4;
-  T Function() Function() field5;
-  void Function(/*contravariant*/ T Function()) field6;
-  T Function(/*contravariant*/ T Function()) field7;
-  void Function(void Function(T)) field8;
-  T Function(void Function(T)) field9;
-  void Function(/*contravariant*/ T Function(T)) field10;
-  T Function(/*contravariant*/ T Function(T)) field11;
-
-  S Function<S extends /*invariant*/ T>() field12;
-  void Function<S extends /*invariant*/ T>(S) field13;
-  S Function<S extends /*invariant*/ T>(S) field14;
-  void Function(S Function<S extends /*invariant*/ T>()) field15;
-
-  T get getter1 => field1;
-  T Function() get getter2 => field2;
-  void Function(/*contravariant*/ T) get getter3 => field3;
-  T Function(/*contravariant*/ T) get getter4 => field4;
-  T Function() Function() get getter5 => field5;
-  void Function(/*contravariant*/ T Function()) get getter6 => field6;
-  T Function(/*contravariant*/ T Function()) get getter7 => field7;
-  void Function(void Function(T)) get getter8 => field8;
-  T Function(void Function(T)) get getter9 => field9;
-  void Function(/*contravariant*/ T Function(T)) get getter10 => field10;
-  T Function(/*contravariant*/ T Function(T)) get getter11 => field11;
-
-  S Function<S extends /*invariant*/ T>() get getter12 => field12;
-  void Function<S extends /*invariant*/ T>(S) get getter13 => field13;
-  S Function<S extends /*invariant*/ T>(S) get getter14 => field14;
-  void Function(S Function<S extends /*invariant*/ T>()) get getter15 =>
-      field15;
-
-  void set setter1(/*covariant*/ T value) {
-    field1 = value;
-  }
-
-  void set setter2(/*covariant*/ T Function() value) {
-    field2 = value;
-  }
-
-  void set setter3(void Function(T) value) {
-    field3 = value;
-  }
-
-  void set setter4(/*covariant*/ T Function(T) value) {
-    field4 = value;
-  }
-
-  void set setter5(/*covariant*/ T Function() Function() value) {
-    field5 = value;
-  }
-
-  void set setter6(void Function(T Function()) value) {
-    field6 = value;
-  }
-
-  void set setter7(/*covariant*/ T Function(T Function()) value) {
-    field7 = value;
-  }
-
-  void set setter8(void Function(void Function(/*covariant*/ T)) value) {
-    field8 = value;
-  }
-
-  void set setter9(
-      /*covariant*/ T Function(void Function(/*covariant*/ T)) value) {
-    field9 = value;
-  }
-
-  void set setter10(void Function(T Function(/*covariant*/ T)) value) {
-    field10 = value;
-  }
-
-  void set setter11(
-      /*covariant*/ T Function(T Function(/*covariant*/ T)) value) {
-    field11 = value;
-  }
-
-  void set setter12(S Function<S extends /*invariant*/ T>() value) {
-    field12 = value;
-  }
-
-  void set setter13(void Function<S extends /*invariant*/ T>(S) value) {
-    field13 = value;
-  }
-
-  void set setter14(S Function<S extends /*invariant*/ T>(S) value) {
-    field14 = value;
-  }
-
-  void set setter15(
-      void Function(S Function<S extends /*invariant*/ T>()) value) {
-    field15 = value;
-  }
-
-  void method1(/*covariant*/ T value) {
-    field1 = value;
-  }
-
-  void method2(/*covariant*/ T Function() value) {
-    field2 = value;
-  }
-
-  void method3(void Function(T) value) {
-    field3 = value;
-  }
-
-  void method4(/*covariant*/ T Function(T) value) {
-    field4 = value;
-  }
-
-  void method5(/*covariant*/ T Function() Function() value) {
-    field5 = value;
-  }
-
-  void method6(void Function(T Function()) value) {
-    field6 = value;
-  }
-
-  void method7(/*covariant*/ T Function(T Function()) value) {
-    field7 = value;
-  }
-
-  void method8(void Function(void Function(/*covariant*/ T)) value) {
-    field8 = value;
-  }
-
-  void method9(/*covariant*/ T Function(void Function(/*covariant*/ T)) value) {
-    field9 = value;
-  }
-
-  void method10(void Function(T Function(/*covariant*/ T)) value) {
-    field10 = value;
-  }
-
-  void method11(/*covariant*/ T Function(T Function(/*covariant*/ T)) value) {
-    field11 = value;
-  }
-
-  void method12(S Function<S extends /*invariant*/ T>() value) {
-    field12 = value;
-  }
-
-  void method13(void Function<S extends /*invariant*/ T>(S) value) {
-    field13 = value;
-  }
-
-  void method14(S Function<S extends /*invariant*/ T>(S) value) {
-    field14 = value;
-  }
-
-  void method15(void Function(S Function<S extends /*invariant*/ T>()) value) {
-    field15 = value;
-  }
-}
-
-main() {
-  C<num> c = new C<int>(0);
-  c.field1;
-  c.field2;
-  try {
-    c. /*@ checkReturn=(num*) ->* void */ field3;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=(num*) ->* num* */ field4;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.field5;
-  try {
-    c. /*@ checkReturn=(() ->* num*) ->* void */ field6;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=(() ->* num*) ->* num* */ field7;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.field8;
-  c.field9;
-  try {
-    c. /*@ checkReturn=((num*) ->* num*) ->* void */ field10;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=((num*) ->* num*) ->* num* */ field11;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=<S extends num* = dynamic>() ->* S* */ field12;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=<S extends num* = dynamic>(S*) ->* void */ field13;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=<S extends num* = dynamic>(S*) ->* S* */ field14;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=(<S extends num* = dynamic>() ->* S*) ->* void */ field15;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-
-  c.getter1;
-  c.getter2;
-  try {
-    c. /*@ checkReturn=(num*) ->* void */ getter3;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=(num*) ->* num* */ getter4;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.getter5;
-  try {
-    c. /*@ checkReturn=(() ->* num*) ->* void */ getter6;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=(() ->* num*) ->* num* */ getter7;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.getter8;
-  c.getter9;
-  try {
-    c. /*@ checkReturn=((num*) ->* num*) ->* void */ getter10;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=((num*) ->* num*) ->* num* */ getter11;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=<S extends num* = dynamic>() ->* S* */ getter12;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=<S extends num* = dynamic>(S*) ->* void */ getter13;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=<S extends num* = dynamic>(S*) ->* S* */ getter14;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c. /*@ checkReturn=(<S extends num* = dynamic>() ->* S*) ->* void */ getter15;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-
-  try {
-    c.setter1 = 0.5;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter2 = () => 0.5;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.setter3 = (num n) {};
-  try {
-    c.setter4 = (num n) => 0.5;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter5 = () => () => 0.5;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.setter6 = (num Function() f) {};
-  try {
-    c.setter7 = (num Function() f) => 0.5;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter8 = (void Function(double) f) {};
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter9 = (void Function(double) f) => 0.5;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter10 = (num Function(double) f) {};
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter11 = (num Function(double) f) => 0.5;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter12 = <S extends num>() => null;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter13 = <S extends num>(S s) {};
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter14 = <S extends num>(S s) => s;
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.setter15 = (S Function<S extends num>() f) {};
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-
-  try {
-    c.method1(0.5);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method2(() => 0.5);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.method3((num n) {});
-  try {
-    c.method4((num n) => 0.5);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method5(() => () => 0.5);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  c.method6((num Function() f) {});
-  try {
-    c.method7((num Function() f) => 0.5);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method8((void Function(double) f) {});
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method9((void Function(double) f) => 0.5);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method10((num Function(double) f) {});
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method11((num Function(double) f) => 0.5);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method12(<S extends num>() => null);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method13(<S extends num>(S s) {});
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method14(<S extends num>(S s) => s);
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-  try {
-    c.method15((S Function<S extends num>() f) {});
-    throw 'TypeError expected';
-  } on TypeError catch (e) {
-    print(e);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.textual_outline.expect
deleted file mode 100644
index 4184ffb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.textual_outline.expect
+++ /dev/null
@@ -1,80 +0,0 @@
-// @dart = 2.6
-class C<T> {
-  C(this.field1)
-      : field2 = (() => field1),
-        field3 = ((T t) {}),
-        field4 = ((T t) => t),
-        field5 = (() => () => field1),
-        field6 = ((T Function() f) {}),
-        field7 = ((T Function() f) => field1),
-        field8 = ((void Function(T) f) {}),
-        field9 = ((void Function(T) f) => field1),
-        field10 = ((T Function(T) f) {}),
-        field11 = ((T Function(T) f) => field1),
-        field12 = <S extends T>() => null,
-        field13 = <S extends T>(S s) {},
-        field14 = <S extends T>(S s) => s,
-        field15 = ((S Function<S extends T>() f) {});
-  T field1;
-  T Function() field2;
-  void Function(T) field3;
-  T Function(T) field4;
-  T Function() Function() field5;
-  void Function(T Function()) field6;
-  T Function(T Function()) field7;
-  void Function(void Function(T)) field8;
-  T Function(void Function(T)) field9;
-  void Function(T Function(T)) field10;
-  T Function(T Function(T)) field11;
-  S Function<S extends T>() field12;
-  void Function<S extends T>(S) field13;
-  S Function<S extends T>(S) field14;
-  void Function(S Function<S extends T>()) field15;
-  T get getter1 => field1;
-  T Function() get getter2 => field2;
-  void Function(T) get getter3 => field3;
-  T Function(T) get getter4 => field4;
-  T Function() Function() get getter5 => field5;
-  void Function(T Function()) get getter6 => field6;
-  T Function(T Function()) get getter7 => field7;
-  void Function(void Function(T)) get getter8 => field8;
-  T Function(void Function(T)) get getter9 => field9;
-  void Function(T Function(T)) get getter10 => field10;
-  T Function(T Function(T)) get getter11 => field11;
-  S Function<S extends T>() get getter12 => field12;
-  void Function<S extends T>(S) get getter13 => field13;
-  S Function<S extends T>(S) get getter14 => field14;
-  void Function(S Function<S extends T>()) get getter15 => field15;
-  void set setter1(T value) {}
-  void set setter2(T Function() value) {}
-  void set setter3(void Function(T) value) {}
-  void set setter4(T Function(T) value) {}
-  void set setter5(T Function() Function() value) {}
-  void set setter6(void Function(T Function()) value) {}
-  void set setter7(T Function(T Function()) value) {}
-  void set setter8(void Function(void Function(T)) value) {}
-  void set setter9(T Function(void Function(T)) value) {}
-  void set setter10(void Function(T Function(T)) value) {}
-  void set setter11(T Function(T Function(T)) value) {}
-  void set setter12(S Function<S extends T>() value) {}
-  void set setter13(void Function<S extends T>(S) value) {}
-  void set setter14(S Function<S extends T>(S) value) {}
-  void set setter15(void Function(S Function<S extends T>()) value) {}
-  void method1(T value) {}
-  void method2(T Function() value) {}
-  void method3(void Function(T) value) {}
-  void method4(T Function(T) value) {}
-  void method5(T Function() Function() value) {}
-  void method6(void Function(T Function()) value) {}
-  void method7(T Function(T Function()) value) {}
-  void method8(void Function(void Function(T)) value) {}
-  void method9(T Function(void Function(T)) value) {}
-  void method10(void Function(T Function(T)) value) {}
-  void method11(T Function(T Function(T)) value) {}
-  void method12(S Function<S extends T>() value) {}
-  void method13(void Function<S extends T>(S) value) {}
-  void method14(S Function<S extends T>(S) value) {}
-  void method15(void Function(S Function<S extends T>()) value) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.textual_outline_modelled.expect
deleted file mode 100644
index d3208cf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,80 +0,0 @@
-// @dart = 2.6
-class C<T> {
-  C(this.field1)
-      : field2 = (() => field1),
-        field3 = ((T t) {}),
-        field4 = ((T t) => t),
-        field5 = (() => () => field1),
-        field6 = ((T Function() f) {}),
-        field7 = ((T Function() f) => field1),
-        field8 = ((void Function(T) f) {}),
-        field9 = ((void Function(T) f) => field1),
-        field10 = ((T Function(T) f) {}),
-        field11 = ((T Function(T) f) => field1),
-        field12 = <S extends T>() => null,
-        field13 = <S extends T>(S s) {},
-        field14 = <S extends T>(S s) => s,
-        field15 = ((S Function<S extends T>() f) {});
-  S Function<S extends T>() field12;
-  S Function<S extends T>() get getter12 => field12;
-  S Function<S extends T>(S) field14;
-  S Function<S extends T>(S) get getter14 => field14;
-  T Function() Function() field5;
-  T Function() Function() get getter5 => field5;
-  T Function() field2;
-  T Function() get getter2 => field2;
-  T Function(T) field4;
-  T Function(T) get getter4 => field4;
-  T Function(T Function()) field7;
-  T Function(T Function()) get getter7 => field7;
-  T Function(T Function(T)) field11;
-  T Function(T Function(T)) get getter11 => field11;
-  T Function(void Function(T)) field9;
-  T Function(void Function(T)) get getter9 => field9;
-  T field1;
-  T get getter1 => field1;
-  void Function(S Function<S extends T>()) field15;
-  void Function(S Function<S extends T>()) get getter15 => field15;
-  void Function(T) field3;
-  void Function(T) get getter3 => field3;
-  void Function(T Function()) field6;
-  void Function(T Function()) get getter6 => field6;
-  void Function(T Function(T)) field10;
-  void Function(T Function(T)) get getter10 => field10;
-  void Function(void Function(T)) field8;
-  void Function(void Function(T)) get getter8 => field8;
-  void Function<S extends T>(S) field13;
-  void Function<S extends T>(S) get getter13 => field13;
-  void method1(T value) {}
-  void method10(void Function(T Function(T)) value) {}
-  void method11(T Function(T Function(T)) value) {}
-  void method12(S Function<S extends T>() value) {}
-  void method13(void Function<S extends T>(S) value) {}
-  void method14(S Function<S extends T>(S) value) {}
-  void method15(void Function(S Function<S extends T>()) value) {}
-  void method2(T Function() value) {}
-  void method3(void Function(T) value) {}
-  void method4(T Function(T) value) {}
-  void method5(T Function() Function() value) {}
-  void method6(void Function(T Function()) value) {}
-  void method7(T Function(T Function()) value) {}
-  void method8(void Function(void Function(T)) value) {}
-  void method9(T Function(void Function(T)) value) {}
-  void set setter1(T value) {}
-  void set setter10(void Function(T Function(T)) value) {}
-  void set setter11(T Function(T Function(T)) value) {}
-  void set setter12(S Function<S extends T>() value) {}
-  void set setter13(void Function<S extends T>(S) value) {}
-  void set setter14(S Function<S extends T>(S) value) {}
-  void set setter15(void Function(S Function<S extends T>()) value) {}
-  void set setter2(T Function() value) {}
-  void set setter3(void Function(T) value) {}
-  void set setter4(T Function(T) value) {}
-  void set setter5(T Function() Function() value) {}
-  void set setter6(void Function(T Function()) value) {}
-  void set setter7(T Function(T Function()) value) {}
-  void set setter8(void Function(void Function(T)) value) {}
-  void set setter9(T Function(void Function(T)) value) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.expect
deleted file mode 100644
index 39064e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.expect
+++ /dev/null
@@ -1,493 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::C::T* field1;
-  generic-covariant-impl field () →* self::C::T* field2;
-  field (self::C::T*) →* void field3;
-  generic-covariant-impl field (self::C::T*) →* self::C::T* field4;
-  generic-covariant-impl field () →* () →* self::C::T* field5;
-  field (() →* self::C::T*) →* void field6;
-  generic-covariant-impl field (() →* self::C::T*) →* self::C::T* field7;
-  generic-covariant-impl field ((self::C::T*) →* void) →* void field8;
-  generic-covariant-impl field ((self::C::T*) →* void) →* self::C::T* field9;
-  generic-covariant-impl field ((self::C::T*) →* self::C::T*) →* void field10;
-  generic-covariant-impl field ((self::C::T*) →* self::C::T*) →* self::C::T* field11;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>() →* S* field12;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>(S*) →* void field13;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>(S*) →* S* field14;
-  generic-covariant-impl field (<S extends self::C::T* = dynamic>() →* S*) →* void field15;
-  constructor •(self::C::T* field1) → self::C<self::C::T*>*
-    : self::C::field1 = field1, self::C::field2 = () → self::C::T* => field1, self::C::field3 = (self::C::T* t) → Null {}, self::C::field4 = (self::C::T* t) → self::C::T* => t, self::C::field5 = () → () →* self::C::T* => () → self::C::T* => field1, self::C::field6 = (() →* self::C::T* f) → Null {}, self::C::field7 = (() →* self::C::T* f) → self::C::T* => field1, self::C::field8 = ((self::C::T*) →* void f) → Null {}, self::C::field9 = ((self::C::T*) →* void f) → self::C::T* => field1, self::C::field10 = ((self::C::T*) →* self::C::T* f) → Null {}, self::C::field11 = ((self::C::T*) →* self::C::T* f) → self::C::T* => field1, self::C::field12 = <S extends self::C::T* = self::C::T*>() → Null => null, self::C::field13 = <S extends self::C::T* = self::C::T*>(S* s) → Null {}, self::C::field14 = <S extends self::C::T* = self::C::T*>(S* s) → S* => s, self::C::field15 = (<S extends self::C::T* = self::C::T*>() →* S* f) → Null {}, super core::Object::•()
-    ;
-  get getter1() → self::C::T*
-    return this.{self::C::field1};
-  get getter2() → () →* self::C::T*
-    return this.{self::C::field2};
-  get getter3() → (self::C::T*) →* void
-    return this.{self::C::field3};
-  get getter4() → (self::C::T*) →* self::C::T*
-    return this.{self::C::field4};
-  get getter5() → () →* () →* self::C::T*
-    return this.{self::C::field5};
-  get getter6() → (() →* self::C::T*) →* void
-    return this.{self::C::field6};
-  get getter7() → (() →* self::C::T*) →* self::C::T*
-    return this.{self::C::field7};
-  get getter8() → ((self::C::T*) →* void) →* void
-    return this.{self::C::field8};
-  get getter9() → ((self::C::T*) →* void) →* self::C::T*
-    return this.{self::C::field9};
-  get getter10() → ((self::C::T*) →* self::C::T*) →* void
-    return this.{self::C::field10};
-  get getter11() → ((self::C::T*) →* self::C::T*) →* self::C::T*
-    return this.{self::C::field11};
-  get getter12() → <S extends self::C::T* = dynamic>() →* S*
-    return this.{self::C::field12};
-  get getter13() → <S extends self::C::T* = dynamic>(S*) →* void
-    return this.{self::C::field13};
-  get getter14() → <S extends self::C::T* = dynamic>(S*) →* S*
-    return this.{self::C::field14};
-  get getter15() → (<S extends self::C::T* = dynamic>() →* S*) →* void
-    return this.{self::C::field15};
-  set setter1(generic-covariant-impl self::C::T* value) → void {
-    this.{self::C::field1} = value;
-  }
-  set setter2(generic-covariant-impl () →* self::C::T* value) → void {
-    this.{self::C::field2} = value;
-  }
-  set setter3((self::C::T*) →* void value) → void {
-    this.{self::C::field3} = value;
-  }
-  set setter4(generic-covariant-impl (self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field4} = value;
-  }
-  set setter5(generic-covariant-impl () →* () →* self::C::T* value) → void {
-    this.{self::C::field5} = value;
-  }
-  set setter6((() →* self::C::T*) →* void value) → void {
-    this.{self::C::field6} = value;
-  }
-  set setter7(generic-covariant-impl (() →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field7} = value;
-  }
-  set setter8(generic-covariant-impl ((self::C::T*) →* void) →* void value) → void {
-    this.{self::C::field8} = value;
-  }
-  set setter9(generic-covariant-impl ((self::C::T*) →* void) →* self::C::T* value) → void {
-    this.{self::C::field9} = value;
-  }
-  set setter10(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* void value) → void {
-    this.{self::C::field10} = value;
-  }
-  set setter11(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field11} = value;
-  }
-  set setter12(generic-covariant-impl <S extends self::C::T* = dynamic>() →* S* value) → void {
-    this.{self::C::field12} = value;
-  }
-  set setter13(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* void value) → void {
-    this.{self::C::field13} = value;
-  }
-  set setter14(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* S* value) → void {
-    this.{self::C::field14} = value;
-  }
-  set setter15(generic-covariant-impl (<S extends self::C::T* = dynamic>() →* S*) →* void value) → void {
-    this.{self::C::field15} = value;
-  }
-  method method1(generic-covariant-impl self::C::T* value) → void {
-    this.{self::C::field1} = value;
-  }
-  method method2(generic-covariant-impl () →* self::C::T* value) → void {
-    this.{self::C::field2} = value;
-  }
-  method method3((self::C::T*) →* void value) → void {
-    this.{self::C::field3} = value;
-  }
-  method method4(generic-covariant-impl (self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field4} = value;
-  }
-  method method5(generic-covariant-impl () →* () →* self::C::T* value) → void {
-    this.{self::C::field5} = value;
-  }
-  method method6((() →* self::C::T*) →* void value) → void {
-    this.{self::C::field6} = value;
-  }
-  method method7(generic-covariant-impl (() →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field7} = value;
-  }
-  method method8(generic-covariant-impl ((self::C::T*) →* void) →* void value) → void {
-    this.{self::C::field8} = value;
-  }
-  method method9(generic-covariant-impl ((self::C::T*) →* void) →* self::C::T* value) → void {
-    this.{self::C::field9} = value;
-  }
-  method method10(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* void value) → void {
-    this.{self::C::field10} = value;
-  }
-  method method11(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field11} = value;
-  }
-  method method12(generic-covariant-impl <S extends self::C::T* = dynamic>() →* S* value) → void {
-    this.{self::C::field12} = value;
-  }
-  method method13(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* void value) → void {
-    this.{self::C::field13} = value;
-  }
-  method method14(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* S* value) → void {
-    this.{self::C::field14} = value;
-  }
-  method method15(generic-covariant-impl (<S extends self::C::T* = dynamic>() →* S*) →* void value) → void {
-    this.{self::C::field15} = value;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::C<core::num*>* c = new self::C::•<core::int*>(0);
-  c.{self::C::field1};
-  c.{self::C::field2};
-  try {
-    c.{self::C::field3} as{TypeError,CovarianceCheck} (core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field4} as{TypeError,CovarianceCheck} (core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::field5};
-  try {
-    c.{self::C::field6} as{TypeError,CovarianceCheck} (() →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field7} as{TypeError,CovarianceCheck} (() →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::field8};
-  c.{self::C::field9};
-  try {
-    c.{self::C::field10} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field11} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field12} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>() →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field13} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field14} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field15} as{TypeError,CovarianceCheck} (<S extends core::num* = dynamic>() →* S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::getter1};
-  c.{self::C::getter2};
-  try {
-    c.{self::C::getter3} as{TypeError,CovarianceCheck} (core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter4} as{TypeError,CovarianceCheck} (core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::getter5};
-  try {
-    c.{self::C::getter6} as{TypeError,CovarianceCheck} (() →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter7} as{TypeError,CovarianceCheck} (() →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::getter8};
-  c.{self::C::getter9};
-  try {
-    c.{self::C::getter10} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter11} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter12} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>() →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter13} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter14} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter15} as{TypeError,CovarianceCheck} (<S extends core::num* = dynamic>() →* S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter1} = 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter2} = () → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::setter3} = (core::num* n) → Null {};
-  try {
-    c.{self::C::setter4} = (core::num* n) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter5} = () → () →* core::double* => () → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::setter6} = (() →* core::num* f) → Null {};
-  try {
-    c.{self::C::setter7} = (() →* core::num* f) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter8} = ((core::double*) →* void f) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter9} = ((core::double*) →* void f) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter10} = ((core::double*) →* core::num* f) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter11} = ((core::double*) →* core::num* f) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter12} = <S extends core::num* = core::num*>() → Null => null;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter13} = <S extends core::num* = core::num*>(S* s) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter14} = <S extends core::num* = core::num*>(S* s) → S* => s;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter15} = (<S extends core::num* = core::num*>() →* S* f) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method1}(0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method2}(() → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::method3}((core::num* n) → Null {});
-  try {
-    c.{self::C::method4}((core::num* n) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method5}(() → () →* core::double* => () → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::method6}((() →* core::num* f) → Null {});
-  try {
-    c.{self::C::method7}((() →* core::num* f) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method8}(((core::double*) →* void f) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method9}(((core::double*) →* void f) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method10}(((core::double*) →* core::num* f) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method11}(((core::double*) →* core::num* f) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method12}(<S extends core::num* = core::num*>() → Null => null);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method13}(<S extends core::num* = core::num*>(S* s) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method14}(<S extends core::num* = core::num*>(S* s) → S* => s);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method15}((<S extends core::num* = core::num*>() →* S* f) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.outline.expect
deleted file mode 100644
index 8663996..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.outline.expect
+++ /dev/null
@@ -1,125 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::C::T* field1;
-  generic-covariant-impl field () →* self::C::T* field2;
-  field (self::C::T*) →* void field3;
-  generic-covariant-impl field (self::C::T*) →* self::C::T* field4;
-  generic-covariant-impl field () →* () →* self::C::T* field5;
-  field (() →* self::C::T*) →* void field6;
-  generic-covariant-impl field (() →* self::C::T*) →* self::C::T* field7;
-  generic-covariant-impl field ((self::C::T*) →* void) →* void field8;
-  generic-covariant-impl field ((self::C::T*) →* void) →* self::C::T* field9;
-  generic-covariant-impl field ((self::C::T*) →* self::C::T*) →* void field10;
-  generic-covariant-impl field ((self::C::T*) →* self::C::T*) →* self::C::T* field11;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>() →* S* field12;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>(S*) →* void field13;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>(S*) →* S* field14;
-  generic-covariant-impl field (<S extends self::C::T* = dynamic>() →* S*) →* void field15;
-  constructor •(self::C::T* field1) → self::C<self::C::T*>*
-    ;
-  get getter1() → self::C::T*
-    ;
-  get getter2() → () →* self::C::T*
-    ;
-  get getter3() → (self::C::T*) →* void
-    ;
-  get getter4() → (self::C::T*) →* self::C::T*
-    ;
-  get getter5() → () →* () →* self::C::T*
-    ;
-  get getter6() → (() →* self::C::T*) →* void
-    ;
-  get getter7() → (() →* self::C::T*) →* self::C::T*
-    ;
-  get getter8() → ((self::C::T*) →* void) →* void
-    ;
-  get getter9() → ((self::C::T*) →* void) →* self::C::T*
-    ;
-  get getter10() → ((self::C::T*) →* self::C::T*) →* void
-    ;
-  get getter11() → ((self::C::T*) →* self::C::T*) →* self::C::T*
-    ;
-  get getter12() → <S extends self::C::T* = dynamic>() →* S*
-    ;
-  get getter13() → <S extends self::C::T* = dynamic>(S*) →* void
-    ;
-  get getter14() → <S extends self::C::T* = dynamic>(S*) →* S*
-    ;
-  get getter15() → (<S extends self::C::T* = dynamic>() →* S*) →* void
-    ;
-  set setter1(generic-covariant-impl self::C::T* value) → void
-    ;
-  set setter2(generic-covariant-impl () →* self::C::T* value) → void
-    ;
-  set setter3((self::C::T*) →* void value) → void
-    ;
-  set setter4(generic-covariant-impl (self::C::T*) →* self::C::T* value) → void
-    ;
-  set setter5(generic-covariant-impl () →* () →* self::C::T* value) → void
-    ;
-  set setter6((() →* self::C::T*) →* void value) → void
-    ;
-  set setter7(generic-covariant-impl (() →* self::C::T*) →* self::C::T* value) → void
-    ;
-  set setter8(generic-covariant-impl ((self::C::T*) →* void) →* void value) → void
-    ;
-  set setter9(generic-covariant-impl ((self::C::T*) →* void) →* self::C::T* value) → void
-    ;
-  set setter10(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* void value) → void
-    ;
-  set setter11(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* self::C::T* value) → void
-    ;
-  set setter12(generic-covariant-impl <S extends self::C::T* = dynamic>() →* S* value) → void
-    ;
-  set setter13(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* void value) → void
-    ;
-  set setter14(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* S* value) → void
-    ;
-  set setter15(generic-covariant-impl (<S extends self::C::T* = dynamic>() →* S*) →* void value) → void
-    ;
-  method method1(generic-covariant-impl self::C::T* value) → void
-    ;
-  method method2(generic-covariant-impl () →* self::C::T* value) → void
-    ;
-  method method3((self::C::T*) →* void value) → void
-    ;
-  method method4(generic-covariant-impl (self::C::T*) →* self::C::T* value) → void
-    ;
-  method method5(generic-covariant-impl () →* () →* self::C::T* value) → void
-    ;
-  method method6((() →* self::C::T*) →* void value) → void
-    ;
-  method method7(generic-covariant-impl (() →* self::C::T*) →* self::C::T* value) → void
-    ;
-  method method8(generic-covariant-impl ((self::C::T*) →* void) →* void value) → void
-    ;
-  method method9(generic-covariant-impl ((self::C::T*) →* void) →* self::C::T* value) → void
-    ;
-  method method10(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* void value) → void
-    ;
-  method method11(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* self::C::T* value) → void
-    ;
-  method method12(generic-covariant-impl <S extends self::C::T* = dynamic>() →* S* value) → void
-    ;
-  method method13(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* void value) → void
-    ;
-  method method14(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* S* value) → void
-    ;
-  method method15(generic-covariant-impl (<S extends self::C::T* = dynamic>() →* S*) →* void value) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.transformed.expect
deleted file mode 100644
index 39064e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/non_covariant_checks.dart.weak.transformed.expect
+++ /dev/null
@@ -1,493 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::C::T* field1;
-  generic-covariant-impl field () →* self::C::T* field2;
-  field (self::C::T*) →* void field3;
-  generic-covariant-impl field (self::C::T*) →* self::C::T* field4;
-  generic-covariant-impl field () →* () →* self::C::T* field5;
-  field (() →* self::C::T*) →* void field6;
-  generic-covariant-impl field (() →* self::C::T*) →* self::C::T* field7;
-  generic-covariant-impl field ((self::C::T*) →* void) →* void field8;
-  generic-covariant-impl field ((self::C::T*) →* void) →* self::C::T* field9;
-  generic-covariant-impl field ((self::C::T*) →* self::C::T*) →* void field10;
-  generic-covariant-impl field ((self::C::T*) →* self::C::T*) →* self::C::T* field11;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>() →* S* field12;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>(S*) →* void field13;
-  generic-covariant-impl field <S extends self::C::T* = dynamic>(S*) →* S* field14;
-  generic-covariant-impl field (<S extends self::C::T* = dynamic>() →* S*) →* void field15;
-  constructor •(self::C::T* field1) → self::C<self::C::T*>*
-    : self::C::field1 = field1, self::C::field2 = () → self::C::T* => field1, self::C::field3 = (self::C::T* t) → Null {}, self::C::field4 = (self::C::T* t) → self::C::T* => t, self::C::field5 = () → () →* self::C::T* => () → self::C::T* => field1, self::C::field6 = (() →* self::C::T* f) → Null {}, self::C::field7 = (() →* self::C::T* f) → self::C::T* => field1, self::C::field8 = ((self::C::T*) →* void f) → Null {}, self::C::field9 = ((self::C::T*) →* void f) → self::C::T* => field1, self::C::field10 = ((self::C::T*) →* self::C::T* f) → Null {}, self::C::field11 = ((self::C::T*) →* self::C::T* f) → self::C::T* => field1, self::C::field12 = <S extends self::C::T* = self::C::T*>() → Null => null, self::C::field13 = <S extends self::C::T* = self::C::T*>(S* s) → Null {}, self::C::field14 = <S extends self::C::T* = self::C::T*>(S* s) → S* => s, self::C::field15 = (<S extends self::C::T* = self::C::T*>() →* S* f) → Null {}, super core::Object::•()
-    ;
-  get getter1() → self::C::T*
-    return this.{self::C::field1};
-  get getter2() → () →* self::C::T*
-    return this.{self::C::field2};
-  get getter3() → (self::C::T*) →* void
-    return this.{self::C::field3};
-  get getter4() → (self::C::T*) →* self::C::T*
-    return this.{self::C::field4};
-  get getter5() → () →* () →* self::C::T*
-    return this.{self::C::field5};
-  get getter6() → (() →* self::C::T*) →* void
-    return this.{self::C::field6};
-  get getter7() → (() →* self::C::T*) →* self::C::T*
-    return this.{self::C::field7};
-  get getter8() → ((self::C::T*) →* void) →* void
-    return this.{self::C::field8};
-  get getter9() → ((self::C::T*) →* void) →* self::C::T*
-    return this.{self::C::field9};
-  get getter10() → ((self::C::T*) →* self::C::T*) →* void
-    return this.{self::C::field10};
-  get getter11() → ((self::C::T*) →* self::C::T*) →* self::C::T*
-    return this.{self::C::field11};
-  get getter12() → <S extends self::C::T* = dynamic>() →* S*
-    return this.{self::C::field12};
-  get getter13() → <S extends self::C::T* = dynamic>(S*) →* void
-    return this.{self::C::field13};
-  get getter14() → <S extends self::C::T* = dynamic>(S*) →* S*
-    return this.{self::C::field14};
-  get getter15() → (<S extends self::C::T* = dynamic>() →* S*) →* void
-    return this.{self::C::field15};
-  set setter1(generic-covariant-impl self::C::T* value) → void {
-    this.{self::C::field1} = value;
-  }
-  set setter2(generic-covariant-impl () →* self::C::T* value) → void {
-    this.{self::C::field2} = value;
-  }
-  set setter3((self::C::T*) →* void value) → void {
-    this.{self::C::field3} = value;
-  }
-  set setter4(generic-covariant-impl (self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field4} = value;
-  }
-  set setter5(generic-covariant-impl () →* () →* self::C::T* value) → void {
-    this.{self::C::field5} = value;
-  }
-  set setter6((() →* self::C::T*) →* void value) → void {
-    this.{self::C::field6} = value;
-  }
-  set setter7(generic-covariant-impl (() →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field7} = value;
-  }
-  set setter8(generic-covariant-impl ((self::C::T*) →* void) →* void value) → void {
-    this.{self::C::field8} = value;
-  }
-  set setter9(generic-covariant-impl ((self::C::T*) →* void) →* self::C::T* value) → void {
-    this.{self::C::field9} = value;
-  }
-  set setter10(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* void value) → void {
-    this.{self::C::field10} = value;
-  }
-  set setter11(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field11} = value;
-  }
-  set setter12(generic-covariant-impl <S extends self::C::T* = dynamic>() →* S* value) → void {
-    this.{self::C::field12} = value;
-  }
-  set setter13(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* void value) → void {
-    this.{self::C::field13} = value;
-  }
-  set setter14(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* S* value) → void {
-    this.{self::C::field14} = value;
-  }
-  set setter15(generic-covariant-impl (<S extends self::C::T* = dynamic>() →* S*) →* void value) → void {
-    this.{self::C::field15} = value;
-  }
-  method method1(generic-covariant-impl self::C::T* value) → void {
-    this.{self::C::field1} = value;
-  }
-  method method2(generic-covariant-impl () →* self::C::T* value) → void {
-    this.{self::C::field2} = value;
-  }
-  method method3((self::C::T*) →* void value) → void {
-    this.{self::C::field3} = value;
-  }
-  method method4(generic-covariant-impl (self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field4} = value;
-  }
-  method method5(generic-covariant-impl () →* () →* self::C::T* value) → void {
-    this.{self::C::field5} = value;
-  }
-  method method6((() →* self::C::T*) →* void value) → void {
-    this.{self::C::field6} = value;
-  }
-  method method7(generic-covariant-impl (() →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field7} = value;
-  }
-  method method8(generic-covariant-impl ((self::C::T*) →* void) →* void value) → void {
-    this.{self::C::field8} = value;
-  }
-  method method9(generic-covariant-impl ((self::C::T*) →* void) →* self::C::T* value) → void {
-    this.{self::C::field9} = value;
-  }
-  method method10(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* void value) → void {
-    this.{self::C::field10} = value;
-  }
-  method method11(generic-covariant-impl ((self::C::T*) →* self::C::T*) →* self::C::T* value) → void {
-    this.{self::C::field11} = value;
-  }
-  method method12(generic-covariant-impl <S extends self::C::T* = dynamic>() →* S* value) → void {
-    this.{self::C::field12} = value;
-  }
-  method method13(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* void value) → void {
-    this.{self::C::field13} = value;
-  }
-  method method14(generic-covariant-impl <S extends self::C::T* = dynamic>(S*) →* S* value) → void {
-    this.{self::C::field14} = value;
-  }
-  method method15(generic-covariant-impl (<S extends self::C::T* = dynamic>() →* S*) →* void value) → void {
-    this.{self::C::field15} = value;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::C<core::num*>* c = new self::C::•<core::int*>(0);
-  c.{self::C::field1};
-  c.{self::C::field2};
-  try {
-    c.{self::C::field3} as{TypeError,CovarianceCheck} (core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field4} as{TypeError,CovarianceCheck} (core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::field5};
-  try {
-    c.{self::C::field6} as{TypeError,CovarianceCheck} (() →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field7} as{TypeError,CovarianceCheck} (() →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::field8};
-  c.{self::C::field9};
-  try {
-    c.{self::C::field10} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field11} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field12} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>() →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field13} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field14} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::field15} as{TypeError,CovarianceCheck} (<S extends core::num* = dynamic>() →* S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::getter1};
-  c.{self::C::getter2};
-  try {
-    c.{self::C::getter3} as{TypeError,CovarianceCheck} (core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter4} as{TypeError,CovarianceCheck} (core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::getter5};
-  try {
-    c.{self::C::getter6} as{TypeError,CovarianceCheck} (() →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter7} as{TypeError,CovarianceCheck} (() →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::getter8};
-  c.{self::C::getter9};
-  try {
-    c.{self::C::getter10} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter11} as{TypeError,CovarianceCheck} ((core::num*) →* core::num*) →* core::num*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter12} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>() →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter13} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter14} as{TypeError,CovarianceCheck} <S extends core::num* = dynamic>(S*) →* S*;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::getter15} as{TypeError,CovarianceCheck} (<S extends core::num* = dynamic>() →* S*) →* void;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter1} = 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter2} = () → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::setter3} = (core::num* n) → Null {};
-  try {
-    c.{self::C::setter4} = (core::num* n) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter5} = () → () →* core::double* => () → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::setter6} = (() →* core::num* f) → Null {};
-  try {
-    c.{self::C::setter7} = (() →* core::num* f) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter8} = ((core::double*) →* void f) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter9} = ((core::double*) →* void f) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter10} = ((core::double*) →* core::num* f) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter11} = ((core::double*) →* core::num* f) → core::double* => 0.5;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter12} = <S extends core::num* = core::num*>() → Null => null;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter13} = <S extends core::num* = core::num*>(S* s) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter14} = <S extends core::num* = core::num*>(S* s) → S* => s;
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::setter15} = (<S extends core::num* = core::num*>() →* S* f) → Null {};
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method1}(0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method2}(() → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::method3}((core::num* n) → Null {});
-  try {
-    c.{self::C::method4}((core::num* n) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method5}(() → () →* core::double* => () → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  c.{self::C::method6}((() →* core::num* f) → Null {});
-  try {
-    c.{self::C::method7}((() →* core::num* f) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method8}(((core::double*) →* void f) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method9}(((core::double*) →* void f) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method10}(((core::double*) →* core::num* f) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method11}(((core::double*) →* core::num* f) → core::double* => 0.5);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method12}(<S extends core::num* = core::num*>() → Null => null);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method13}(<S extends core::num* = core::num*>(S* s) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method14}(<S extends core::num* = core::num*>(S* s) → S* => s);
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-  try {
-    c.{self::C::method15}((<S extends core::num* = core::num*>() →* S* f) → Null {});
-    throw "TypeError expected";
-  }
-  on core::TypeError* catch(final core::TypeError* e) {
-    core::print(e);
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart
deleted file mode 100644
index a24abda..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class Foo {
-  int field;
-  static int staticField;
-}
-
-main() {
-  Foo foo = new Foo();
-  foo?.field = 5;
-  Foo?.staticField = 5;
-  foo.field ??= 5;
-  Foo.staticField ??= 5;
-  foo?.field ??= 5;
-  Foo?.staticField ??= 5;
-
-  int intValue = foo.field ?? 6;
-  num numValue = foo.field ?? 4.5;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.textual_outline.expect
deleted file mode 100644
index bafe8cc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class Foo {
-  int field;
-  static int staticField;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.textual_outline_modelled.expect
deleted file mode 100644
index bafe8cc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class Foo {
-  int field;
-  static int staticField;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.expect
deleted file mode 100644
index 6cfab2a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field core::int* field = null;
-  static field core::int* staticField = null;
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  let final self::Foo* #t1 = foo in #t1.{self::Foo::==}(null) ?{core::int*} null : #t1.{self::Foo::field} = 5;
-  self::Foo::staticField = 5;
-  let final self::Foo* #t2 = foo in #t2.{self::Foo::field}.{core::num::==}(null) ?{core::int*} #t2.{self::Foo::field} = 5 : null;
-  self::Foo::staticField.{core::num::==}(null) ?{core::int*} self::Foo::staticField = 5 : null;
-  let final self::Foo* #t3 = foo in #t3.{self::Foo::==}(null) ?{core::int*} null : #t3.{self::Foo::field}.{core::num::==}(null) ?{core::int*} #t3.{self::Foo::field} = 5 : null;
-  self::Foo::staticField.{core::num::==}(null) ?{core::int*} self::Foo::staticField = 5 : null;
-  core::int* intValue = let final core::int* #t4 = foo.{self::Foo::field} in #t4.{core::num::==}(null) ?{core::int*} 6 : #t4;
-  core::num* numValue = let final core::int* #t5 = foo.{self::Foo::field} in #t5.{core::num::==}(null) ?{core::num*} 4.5 : #t5;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.outline.expect
deleted file mode 100644
index da72a4c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field core::int* field;
-  static field core::int* staticField;
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.transformed.expect
deleted file mode 100644
index 6cfab2a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware.dart.weak.transformed.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field core::int* field = null;
-  static field core::int* staticField = null;
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  let final self::Foo* #t1 = foo in #t1.{self::Foo::==}(null) ?{core::int*} null : #t1.{self::Foo::field} = 5;
-  self::Foo::staticField = 5;
-  let final self::Foo* #t2 = foo in #t2.{self::Foo::field}.{core::num::==}(null) ?{core::int*} #t2.{self::Foo::field} = 5 : null;
-  self::Foo::staticField.{core::num::==}(null) ?{core::int*} self::Foo::staticField = 5 : null;
-  let final self::Foo* #t3 = foo in #t3.{self::Foo::==}(null) ?{core::int*} null : #t3.{self::Foo::field}.{core::num::==}(null) ?{core::int*} #t3.{self::Foo::field} = 5 : null;
-  self::Foo::staticField.{core::num::==}(null) ?{core::int*} self::Foo::staticField = 5 : null;
-  core::int* intValue = let final core::int* #t4 = foo.{self::Foo::field} in #t4.{core::num::==}(null) ?{core::int*} 6 : #t4;
-  core::num* numValue = let final core::int* #t5 = foo.{self::Foo::field} in #t5.{core::num::==}(null) ?{core::num*} 4.5 : #t5;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart
deleted file mode 100644
index 8ebe5ef..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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.6
-
-class Class {}
-
-main() {
-  var o;
-  if (false) {
-    // ignore: unused_local_variable
-    for (Class c in o?.iterable) {}
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.textual_outline.expect
deleted file mode 100644
index 43e0a72..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class Class {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.textual_outline_modelled.expect
deleted file mode 100644
index 43e0a72..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class Class {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.expect
deleted file mode 100644
index 2c4a16c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class extends core::Object {
-  synthetic constructor •() → self::Class*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  dynamic o;
-  if(false) {
-    for (final dynamic #t1 in (let final dynamic #t2 = o in #t2.{core::Object::==}(null) ?{dynamic} null : #t2.iterable) as{TypeError,ForDynamic} core::Iterable<dynamic>*) {
-      self::Class* c = #t1 as{TypeError,ForDynamic} self::Class*;
-    }
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.outline.expect
deleted file mode 100644
index 7ea3238..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.outline.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class extends core::Object {
-  synthetic constructor •() → self::Class*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.transformed.expect
deleted file mode 100644
index 8bd8e5e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_for_in.dart.weak.transformed.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class extends core::Object {
-  synthetic constructor •() → self::Class*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  dynamic o;
-  if(false) {
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = ((let final dynamic #t1 = o in #t1.{core::Object::==}(null) ?{dynamic} null : #t1.iterable) as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t2 = :sync-for-iterator.{core::Iterator::current};
-        {
-          self::Class* c = #t2 as{TypeError,ForDynamic} self::Class*;
-        }
-      }
-    }
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart
deleted file mode 100644
index cc2a80e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// 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.6
-
-class A {
-  B b;
-}
-
-class B {
-  C operator +(int i) => null;
-}
-
-class C extends B {}
-
-main() {
-  A a;
-  a?.b++;
-  C c = a?.b++;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.textual_outline.expect
deleted file mode 100644
index 7fa7e53..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class A {
-  B b;
-}
-
-class B {
-  C operator +(int i) => null;
-}
-
-class C extends B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7fa7e53..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-class A {
-  B b;
-}
-
-class B {
-  C operator +(int i) => null;
-}
-
-class C extends B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.expect
deleted file mode 100644
index e7859b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field self::B* b = null;
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  operator +(core::int* i) → self::C*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-}
-static method main() → dynamic {
-  self::A* a;
-  let final self::A* #t1 = a in #t1.{self::A::==}(null) ?{self::B*} null : #t1.{self::A::b} = #t1.{self::A::b}.{self::B::+}(1);
-  self::C* c = (let final self::A* #t2 = a in #t2.{self::A::==}(null) ?{self::B*} null : let final self::B* #t3 = #t2.{self::A::b} in let final void #t4 = #t2.{self::A::b} = #t3.{self::B::+}(1) in #t3) as{TypeError} self::C*;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.outline.expect
deleted file mode 100644
index 04702ee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.outline.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field self::B* b;
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  operator +(core::int* i) → self::C*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.transformed.expect
deleted file mode 100644
index e7859b1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_postfix.dart.weak.transformed.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field self::B* b = null;
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  operator +(core::int* i) → self::C*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-}
-static method main() → dynamic {
-  self::A* a;
-  let final self::A* #t1 = a in #t1.{self::A::==}(null) ?{self::B*} null : #t1.{self::A::b} = #t1.{self::A::b}.{self::B::+}(1);
-  self::C* c = (let final self::A* #t2 = a in #t2.{self::A::==}(null) ?{self::B*} null : let final self::B* #t3 = #t2.{self::A::b} in let final void #t4 = #t2.{self::A::b} = #t3.{self::B::+}(1) in #t3) as{TypeError} self::C*;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart
deleted file mode 100644
index 7609a86..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// 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.6
-
-nullAwareListSpread(List<String> list) {
-  list = ['foo', ...?list];
-}
-
-nullAwareSetSpread(Set<String> set) {
-  set = {'foo', ...?set};
-}
-
-nullAwareMapSpread(Map<int, String> map) {
-  map = {0: 'foo', ...?map};
-}
-
-main() {
-  nullAwareListSpread(null);
-  nullAwareSetSpread(null);
-  nullAwareMapSpread(null);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.textual_outline.expect
deleted file mode 100644
index 5e023d7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-nullAwareListSpread(List<String> list) {}
-nullAwareSetSpread(Set<String> set) {}
-nullAwareMapSpread(Map<int, String> map) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.textual_outline_modelled.expect
deleted file mode 100644
index 20bd984..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-main() {}
-nullAwareListSpread(List<String> list) {}
-nullAwareMapSpread(Map<int, String> map) {}
-nullAwareSetSpread(Set<String> set) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.expect
deleted file mode 100644
index 807a6b5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method nullAwareListSpread(core::List<core::String*>* list) → dynamic {
-  list = block {
-    final core::List<core::String*>* #t1 = <core::String*>["foo"];
-    final core::Iterable<core::String*>* #t2 = list;
-    if(!#t2.{core::Object::==}(null))
-      #t1.{core::List::addAll}{Invariant}(#t2);
-  } =>#t1;
-}
-static method nullAwareSetSpread(core::Set<core::String*>* set) → dynamic {
-  set = block {
-    final core::Set<core::String*>* #t3 = col::LinkedHashSet::•<core::String*>();
-    #t3.{core::Set::add}{Invariant}("foo");
-    final core::Iterable<core::String*>* #t4 = set;
-    if(!#t4.{core::Object::==}(null))
-      #t3.{core::Set::addAll}{Invariant}(#t4);
-  } =>#t3;
-}
-static method nullAwareMapSpread(core::Map<core::int*, core::String*>* map) → dynamic {
-  map = block {
-    final core::Map<core::int*, core::String*>* #t5 = <core::int*, core::String*>{};
-    #t5.{core::Map::[]=}{Invariant}(0, "foo");
-    final core::Map<core::int*, core::String*>* #t6 = map;
-    if(!#t6.{core::Object::==}(null))
-      for (final core::MapEntry<core::int*, core::String*>* #t7 in #t6.{core::Map::entries})
-        #t5.{core::Map::[]=}{Invariant}(#t7.{core::MapEntry::key}, #t7.{core::MapEntry::value});
-  } =>#t5;
-}
-static method main() → dynamic {
-  self::nullAwareListSpread(null);
-  self::nullAwareSetSpread(null);
-  self::nullAwareMapSpread(null);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.outline.expect
deleted file mode 100644
index e47f45e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method nullAwareListSpread(core::List<core::String*>* list) → dynamic
-  ;
-static method nullAwareSetSpread(core::Set<core::String*>* set) → dynamic
-  ;
-static method nullAwareMapSpread(core::Map<core::int*, core::String*>* map) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.transformed.expect
deleted file mode 100644
index 485db8b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/null_aware_spread.dart.weak.transformed.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method nullAwareListSpread(core::List<core::String*>* list) → dynamic {
-  list = block {
-    final core::List<core::String*>* #t1 = core::_GrowableList::_literal1<core::String*>("foo");
-    final core::Iterable<core::String*>* #t2 = list;
-    if(!#t2.{core::Object::==}(null))
-      #t1.{core::List::addAll}{Invariant}(#t2);
-  } =>#t1;
-}
-static method nullAwareSetSpread(core::Set<core::String*>* set) → dynamic {
-  set = block {
-    final core::Set<core::String*>* #t3 = new col::_CompactLinkedHashSet::•<core::String*>();
-    #t3.{core::Set::add}{Invariant}("foo");
-    final core::Iterable<core::String*>* #t4 = set;
-    if(!#t4.{core::Object::==}(null))
-      #t3.{core::Set::addAll}{Invariant}(#t4);
-  } =>#t3;
-}
-static method nullAwareMapSpread(core::Map<core::int*, core::String*>* map) → dynamic {
-  map = block {
-    final core::Map<core::int*, core::String*>* #t5 = <core::int*, core::String*>{};
-    #t5.{core::Map::[]=}{Invariant}(0, "foo");
-    final core::Map<core::int*, core::String*>* #t6 = map;
-    if(!#t6.{core::Object::==}(null)) {
-      core::Iterator<core::MapEntry<core::int*, core::String*>>* :sync-for-iterator = #t6.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::int*, core::String*>* #t7 = :sync-for-iterator.{core::Iterator::current};
-        #t5.{core::Map::[]=}{Invariant}(#t7.{core::MapEntry::key}, #t7.{core::MapEntry::value});
-      }
-    }
-  } =>#t5;
-}
-static method main() → dynamic {
-  self::nullAwareListSpread(null);
-  self::nullAwareSetSpread(null);
-  self::nullAwareMapSpread(null);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart b/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart
deleted file mode 100644
index c90859c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-// 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.6
-
-class Foo {
-}
-
-main() {
-  Foo foo = new Foo();
-
-  // Not defined, but given right arity.
-  print(foo < 2);
-  print(foo > 2);
-  print(foo <= 2);
-  print(foo >= 2);
-  print(foo == 2);
-  print(foo - 2);
-  print(foo + 2);
-  print(foo / 2);
-  print(foo ~/ 2);
-  print(foo * 2);
-  print(foo % 2);
-  print(foo | 2);
-  print(foo ^ 2);
-  print(foo & 2);
-  print(foo << 2);
-  print(foo >> 2);
-  // print(foo >>> 2); // triple shift not enabled by default at the moment.
-  print(foo[2] = 2);
-  print(foo[2]);
-  print(~foo);
-  print(-foo);
-
-  // Not defined, and given wrong arity.
-  // Should be binary.
-  print(<foo);
-  print(>foo);
-  print(<=foo);
-  print(>=foo);
-  print(==foo);
-  print(+foo);
-  print(/foo);
-  print(~/foo);
-  print(*foo);
-  print(%foo);
-  print(|foo);
-  print(^foo);
-  print(&foo);
-  print(<<foo);
-  print(>>foo);
-  // print(>>>foo); // triple shift not enabled by default at the moment.
-
-  // Should be unary.
-  print(foo ~ 2);
-}
\ No newline at end of file
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.textual_outline.expect
deleted file mode 100644
index 1a0868f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class Foo {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.textual_outline_modelled.expect
deleted file mode 100644
index 1a0868f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class Foo {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.expect
deleted file mode 100644
index 6717947..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.expect
+++ /dev/null
@@ -1,367 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:38:10: Error: 'foo' isn't a type.
-//   print(<foo);
-//          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:38:10: Error: Expected '>' after this.
-//   print(<foo);
-//          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:38:13: Error: Expected '[' before this.
-//   print(<foo);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:39:9: Error: Expected an identifier, but got '>'.
-// Try inserting an identifier before '>'.
-//   print(>foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:40:9: Error: Expected an identifier, but got '<='.
-// Try inserting an identifier before '<='.
-//   print(<=foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:41:9: Error: Expected an identifier, but got '>='.
-// Try inserting an identifier before '>='.
-//   print(>=foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:42:9: Error: Expected an identifier, but got '=='.
-// Try inserting an identifier before '=='.
-//   print(==foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:43:9: Error: '+' is not a prefix operator.
-// Try removing '+'.
-//   print(+foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:44:9: Error: Expected an identifier, but got '/'.
-// Try inserting an identifier before '/'.
-//   print(/foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:45:9: Error: Expected an identifier, but got '~/'.
-// Try inserting an identifier before '~/'.
-//   print(~/foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:46:9: Error: Expected an identifier, but got '*'.
-// Try inserting an identifier before '*'.
-//   print(*foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:47:9: Error: Expected an identifier, but got '%'.
-// Try inserting an identifier before '%'.
-//   print(%foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:48:9: Error: Expected an identifier, but got '|'.
-// Try inserting an identifier before '|'.
-//   print(|foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:49:9: Error: Expected an identifier, but got '^'.
-// Try inserting an identifier before '^'.
-//   print(^foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:50:9: Error: Expected an identifier, but got '&'.
-// Try inserting an identifier before '&'.
-//   print(&foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:51:9: Error: Expected an identifier, but got '<<'.
-// Try inserting an identifier before '<<'.
-//   print(<<foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:52:9: Error: Expected an identifier, but got '>>'.
-// Try inserting an identifier before '>>'.
-//   print(>>foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:56:13: Error: '~' isn't a binary operator.
-//   print(foo ~ 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:14:13: Error: The operator '<' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '<' operator.
-//   print(foo < 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:15:13: Error: The operator '>' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '>' operator.
-//   print(foo > 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:16:13: Error: The operator '<=' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '<=' operator.
-//   print(foo <= 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:17:13: Error: The operator '>=' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '>=' operator.
-//   print(foo >= 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:19:13: Error: The operator '-' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '-' operator.
-//   print(foo - 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:20:13: Error: The operator '+' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '+' operator.
-//   print(foo + 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:21:13: Error: The operator '/' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '/' operator.
-//   print(foo / 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:22:13: Error: The operator '~/' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '~/' operator.
-//   print(foo ~/ 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:23:13: Error: The operator '*' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '*' operator.
-//   print(foo * 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:24:13: Error: The operator '%' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '%' operator.
-//   print(foo % 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:25:13: Error: The operator '|' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '|' operator.
-//   print(foo | 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:26:13: Error: The operator '^' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '^' operator.
-//   print(foo ^ 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:27:13: Error: The operator '&' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '&' operator.
-//   print(foo & 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:28:13: Error: The operator '<<' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '<<' operator.
-//   print(foo << 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:29:13: Error: The operator '>>' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '>>' operator.
-//   print(foo >> 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:31:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]=' operator.
-//   print(foo[2] = 2);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:32:12: Error: The operator '[]' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]' operator.
-//   print(foo[2]);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:33:9: Error: The operator '~' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '~' operator.
-//   print(~foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:34:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a 'unary-' operator.
-//   print(-foo);
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:14:13: Error: The operator '<' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '<' operator.
-  print(foo < 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:15:13: Error: The operator '>' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '>' operator.
-  print(foo > 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:16:13: Error: The operator '<=' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '<=' operator.
-  print(foo <= 2);
-            ^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:17:13: Error: The operator '>=' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '>=' operator.
-  print(foo >= 2);
-            ^^");
-  core::print(foo.{self::Foo::==}(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:19:13: Error: The operator '-' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '-' operator.
-  print(foo - 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:20:13: Error: The operator '+' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '+' operator.
-  print(foo + 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:21:13: Error: The operator '/' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '/' operator.
-  print(foo / 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:22:13: Error: The operator '~/' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '~/' operator.
-  print(foo ~/ 2);
-            ^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:23:13: Error: The operator '*' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '*' operator.
-  print(foo * 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:24:13: Error: The operator '%' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '%' operator.
-  print(foo % 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:25:13: Error: The operator '|' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '|' operator.
-  print(foo | 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:26:13: Error: The operator '^' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '^' operator.
-  print(foo ^ 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:27:13: Error: The operator '&' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '&' operator.
-  print(foo & 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:28:13: Error: The operator '<<' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '<<' operator.
-  print(foo << 2);
-            ^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:29:13: Error: The operator '>>' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '>>' operator.
-  print(foo >> 2);
-            ^^");
-  core::print(let final self::Foo* #t1 = foo in let final core::int* #t2 = 2 in let final core::int* #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:31:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '[]=' operator.
-  print(foo[2] = 2);
-           ^" in #t3);
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:32:12: Error: The operator '[]' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '[]' operator.
-  print(foo[2]);
-           ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:33:9: Error: The operator '~' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '~' operator.
-  print(~foo);
-        ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:34:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a 'unary-' operator.
-  print(-foo);
-        ^");
-  core::print(<invalid-type>[]);
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:39:9: Error: This couldn't be parsed.
-  print(>foo);
-        ^".>(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:40:9: Error: This couldn't be parsed.
-  print(<=foo);
-        ^".<=(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:41:9: Error: This couldn't be parsed.
-  print(>=foo);
-        ^".>=(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:42:9: Error: This couldn't be parsed.
-  print(==foo);
-        ^".{core::Object::==}(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:43:9: Error: This couldn't be parsed.
-  print(+foo);
-        ^".+(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:44:9: Error: This couldn't be parsed.
-  print(/foo);
-        ^"./(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:45:9: Error: This couldn't be parsed.
-  print(~/foo);
-        ^".~/(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:46:9: Error: This couldn't be parsed.
-  print(*foo);
-        ^".*(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:47:9: Error: This couldn't be parsed.
-  print(%foo);
-        ^".%(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:48:9: Error: This couldn't be parsed.
-  print(|foo);
-        ^".|(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:49:9: Error: This couldn't be parsed.
-  print(^foo);
-        ^".^(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:50:9: Error: This couldn't be parsed.
-  print(&foo);
-        ^".&(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:51:9: Error: This couldn't be parsed.
-  print(<<foo);
-        ^".<<(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:52:9: Error: This couldn't be parsed.
-  print(>>foo);
-        ^".>>(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:56:13: Error: '~' isn't a binary operator.
-  print(foo ~ 2);
-            ^");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.outline.expect
deleted file mode 100644
index bb0c2dc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.outline.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.transformed.expect
deleted file mode 100644
index fb71500..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart.weak.transformed.expect
+++ /dev/null
@@ -1,372 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:38:10: Error: 'foo' isn't a type.
-//   print(<foo);
-//          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:38:10: Error: Expected '>' after this.
-//   print(<foo);
-//          ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:38:13: Error: Expected '[' before this.
-//   print(<foo);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:39:9: Error: Expected an identifier, but got '>'.
-// Try inserting an identifier before '>'.
-//   print(>foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:40:9: Error: Expected an identifier, but got '<='.
-// Try inserting an identifier before '<='.
-//   print(<=foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:41:9: Error: Expected an identifier, but got '>='.
-// Try inserting an identifier before '>='.
-//   print(>=foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:42:9: Error: Expected an identifier, but got '=='.
-// Try inserting an identifier before '=='.
-//   print(==foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:43:9: Error: '+' is not a prefix operator.
-// Try removing '+'.
-//   print(+foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:44:9: Error: Expected an identifier, but got '/'.
-// Try inserting an identifier before '/'.
-//   print(/foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:45:9: Error: Expected an identifier, but got '~/'.
-// Try inserting an identifier before '~/'.
-//   print(~/foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:46:9: Error: Expected an identifier, but got '*'.
-// Try inserting an identifier before '*'.
-//   print(*foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:47:9: Error: Expected an identifier, but got '%'.
-// Try inserting an identifier before '%'.
-//   print(%foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:48:9: Error: Expected an identifier, but got '|'.
-// Try inserting an identifier before '|'.
-//   print(|foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:49:9: Error: Expected an identifier, but got '^'.
-// Try inserting an identifier before '^'.
-//   print(^foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:50:9: Error: Expected an identifier, but got '&'.
-// Try inserting an identifier before '&'.
-//   print(&foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:51:9: Error: Expected an identifier, but got '<<'.
-// Try inserting an identifier before '<<'.
-//   print(<<foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:52:9: Error: Expected an identifier, but got '>>'.
-// Try inserting an identifier before '>>'.
-//   print(>>foo);
-//         ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:56:13: Error: '~' isn't a binary operator.
-//   print(foo ~ 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:14:13: Error: The operator '<' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '<' operator.
-//   print(foo < 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:15:13: Error: The operator '>' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '>' operator.
-//   print(foo > 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:16:13: Error: The operator '<=' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '<=' operator.
-//   print(foo <= 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:17:13: Error: The operator '>=' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '>=' operator.
-//   print(foo >= 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:19:13: Error: The operator '-' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '-' operator.
-//   print(foo - 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:20:13: Error: The operator '+' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '+' operator.
-//   print(foo + 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:21:13: Error: The operator '/' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '/' operator.
-//   print(foo / 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:22:13: Error: The operator '~/' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '~/' operator.
-//   print(foo ~/ 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:23:13: Error: The operator '*' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '*' operator.
-//   print(foo * 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:24:13: Error: The operator '%' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '%' operator.
-//   print(foo % 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:25:13: Error: The operator '|' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '|' operator.
-//   print(foo | 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:26:13: Error: The operator '^' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '^' operator.
-//   print(foo ^ 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:27:13: Error: The operator '&' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '&' operator.
-//   print(foo & 2);
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:28:13: Error: The operator '<<' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '<<' operator.
-//   print(foo << 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:29:13: Error: The operator '>>' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '>>' operator.
-//   print(foo >> 2);
-//             ^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:31:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]=' operator.
-//   print(foo[2] = 2);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:32:12: Error: The operator '[]' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '[]' operator.
-//   print(foo[2]);
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:33:9: Error: The operator '~' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a '~' operator.
-//   print(~foo);
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:34:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-// Try correcting the operator to an existing operator, or defining a 'unary-' operator.
-//   print(-foo);
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:14:13: Error: The operator '<' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '<' operator.
-  print(foo < 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:15:13: Error: The operator '>' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '>' operator.
-  print(foo > 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:16:13: Error: The operator '<=' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '<=' operator.
-  print(foo <= 2);
-            ^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:17:13: Error: The operator '>=' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '>=' operator.
-  print(foo >= 2);
-            ^^");
-  core::print(foo.{self::Foo::==}(2));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:19:13: Error: The operator '-' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '-' operator.
-  print(foo - 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:20:13: Error: The operator '+' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '+' operator.
-  print(foo + 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:21:13: Error: The operator '/' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '/' operator.
-  print(foo / 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:22:13: Error: The operator '~/' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '~/' operator.
-  print(foo ~/ 2);
-            ^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:23:13: Error: The operator '*' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '*' operator.
-  print(foo * 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:24:13: Error: The operator '%' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '%' operator.
-  print(foo % 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:25:13: Error: The operator '|' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '|' operator.
-  print(foo | 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:26:13: Error: The operator '^' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '^' operator.
-  print(foo ^ 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:27:13: Error: The operator '&' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '&' operator.
-  print(foo & 2);
-            ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:28:13: Error: The operator '<<' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '<<' operator.
-  print(foo << 2);
-            ^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:29:13: Error: The operator '>>' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '>>' operator.
-  print(foo >> 2);
-            ^^");
-  core::print(let final self::Foo* #t1 = foo in let final core::int* #t2 = 2 in let final core::int* #t3 = 2 in let final void #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:31:12: Error: The operator '[]=' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '[]=' operator.
-  print(foo[2] = 2);
-           ^" in #t3);
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:32:12: Error: The operator '[]' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '[]' operator.
-  print(foo[2]);
-           ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:33:9: Error: The operator '~' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a '~' operator.
-  print(~foo);
-        ^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:34:9: Error: The operator 'unary-' isn't defined for the class 'Foo'.
- - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart'.
-Try correcting the operator to an existing operator, or defining a 'unary-' operator.
-  print(-foo);
-        ^");
-  core::print(core::_GrowableList::•<invalid-type>(0));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:39:9: Error: This couldn't be parsed.
-  print(>foo);
-        ^".>(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:40:9: Error: This couldn't be parsed.
-  print(<=foo);
-        ^".<=(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:41:9: Error: This couldn't be parsed.
-  print(>=foo);
-        ^".>=(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:42:9: Error: This couldn't be parsed.
-  print(==foo);
-        ^".{core::Object::==}(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:43:9: Error: This couldn't be parsed.
-  print(+foo);
-        ^".+(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:44:9: Error: This couldn't be parsed.
-  print(/foo);
-        ^"./(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:45:9: Error: This couldn't be parsed.
-  print(~/foo);
-        ^".~/(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:46:9: Error: This couldn't be parsed.
-  print(*foo);
-        ^".*(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:47:9: Error: This couldn't be parsed.
-  print(%foo);
-        ^".%(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:48:9: Error: This couldn't be parsed.
-  print(|foo);
-        ^".|(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:49:9: Error: This couldn't be parsed.
-  print(^foo);
-        ^".^(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:50:9: Error: This couldn't be parsed.
-  print(&foo);
-        ^".&(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:51:9: Error: This couldn't be parsed.
-  print(<<foo);
-        ^".<<(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:52:9: Error: This couldn't be parsed.
-  print(>>foo);
-        ^".>>(foo));
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/operator_method_not_found.dart:56:13: Error: '~' isn't a binary operator.
-  print(foo ~ 2);
-            ^");
-}
-
-
-Extra constant evaluation status:
-Evaluated: VariableGet @ org-dartlang-testcase:///operator_method_not_found.dart:31:18 -> IntConstant(2)
-Extra constant evaluation: evaluated: 74, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart b/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart
deleted file mode 100644
index 0a9b170..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Operators {
-  operator +(other) => null;
-  operator &(other) => null;
-  operator ~() => null;
-  operator |(other) => null;
-  operator ^(other) => null;
-  operator /(other) => null;
-  operator ==(other) => null;
-  operator >(other) => null;
-  operator >=(other) => null;
-  operator [](index) => null;
-  void operator []=(index, value) {}
-  operator <<(other) => null;
-  operator <(other) => null;
-  operator <=(other) => null;
-  operator *(other) => null;
-  operator %(other) => null;
-  operator >>(other) => null;
-  operator -(other) => null;
-  operator ~/(other) => null;
-  operator -() => null;
-}
-
-main(arguments) {
-  var a = new Operators();
-  var b = new Operators();
-  a + b;
-  a & b;
-  ~a;
-  a | b;
-  a ^ b;
-  a / b;
-  a == b;
-  a > b;
-  a >= b;
-  a[0];
-  a[0] = b;
-  a << b;
-  a < b;
-  a <= b;
-  a * b;
-  a % b;
-  a >> b;
-  a - b;
-  a ~/ b;
-  -a;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.textual_outline.expect
deleted file mode 100644
index 481687e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.textual_outline.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-// @dart = 2.6
-class Operators {
-  operator +(other) => null;
-  operator &(other) => null;
-  operator ~() => null;
-  operator |(other) => null;
-  operator ^(other) => null;
-  operator /(other) => null;
-  operator ==(other) => null;
-  operator >(other) => null;
-  operator >=(other) => null;
-  operator [](index) => null;
-  void operator []=(index, value) {}
-  operator <<(other) => null;
-  operator <(other) => null;
-  operator <=(other) => null;
-  operator *(other) => null;
-  operator %(other) => null;
-  operator >>(other) => null;
-  operator -(other) => null;
-  operator ~/(other) => null;
-  operator -() => null;
-}
-
-main(arguments) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.textual_outline_modelled.expect
deleted file mode 100644
index 078d711..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-// @dart = 2.6
-class Operators {
-  operator %(other) => null;
-  operator &(other) => null;
-  operator *(other) => null;
-  operator +(other) => null;
-  operator -() => null;
-  operator -(other) => null;
-  operator /(other) => null;
-  operator <(other) => null;
-  operator <<(other) => null;
-  operator <=(other) => null;
-  operator ==(other) => null;
-  operator >(other) => null;
-  operator >=(other) => null;
-  operator >>(other) => null;
-  operator [](index) => null;
-  operator ^(other) => null;
-  operator |(other) => null;
-  operator ~() => null;
-  operator ~/(other) => null;
-  void operator []=(index, value) {}
-}
-
-main(arguments) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.expect
deleted file mode 100644
index edc56e5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.expect
+++ /dev/null
@@ -1,81 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Operators extends core::Object {
-  synthetic constructor •() → self::Operators*
-    : super core::Object::•()
-    ;
-  operator +(dynamic other) → dynamic
-    return null;
-  operator &(dynamic other) → dynamic
-    return null;
-  operator ~() → dynamic
-    return null;
-  operator |(dynamic other) → dynamic
-    return null;
-  operator ^(dynamic other) → dynamic
-    return null;
-  operator /(dynamic other) → dynamic
-    return null;
-  operator ==(dynamic other) → core::bool*
-    return null;
-  operator >(dynamic other) → dynamic
-    return null;
-  operator >=(dynamic other) → dynamic
-    return null;
-  operator [](dynamic index) → dynamic
-    return null;
-  operator []=(dynamic index, dynamic value) → void {}
-  operator <<(dynamic other) → dynamic
-    return null;
-  operator <(dynamic other) → dynamic
-    return null;
-  operator <=(dynamic other) → dynamic
-    return null;
-  operator *(dynamic other) → dynamic
-    return null;
-  operator %(dynamic other) → dynamic
-    return null;
-  operator >>(dynamic other) → dynamic
-    return null;
-  operator -(dynamic other) → dynamic
-    return null;
-  operator ~/(dynamic other) → dynamic
-    return null;
-  operator unary-() → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main(dynamic arguments) → dynamic {
-  self::Operators* a = new self::Operators::•();
-  self::Operators* b = new self::Operators::•();
-  a.{self::Operators::+}(b);
-  a.{self::Operators::&}(b);
-  a.{self::Operators::~}();
-  a.{self::Operators::|}(b);
-  a.{self::Operators::^}(b);
-  a.{self::Operators::/}(b);
-  a.{self::Operators::==}(b);
-  a.{self::Operators::>}(b);
-  a.{self::Operators::>=}(b);
-  a.{self::Operators::[]}(0);
-  a.{self::Operators::[]=}(0, b);
-  a.{self::Operators::<<}(b);
-  a.{self::Operators::<}(b);
-  a.{self::Operators::<=}(b);
-  a.{self::Operators::*}(b);
-  a.{self::Operators::%}(b);
-  a.{self::Operators::>>}(b);
-  a.{self::Operators::-}(b);
-  a.{self::Operators::~/}(b);
-  a.{self::Operators::unary-}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.outline.expect
deleted file mode 100644
index d6c0166..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.outline.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Operators extends core::Object {
-  synthetic constructor •() → self::Operators*
-    ;
-  operator +(dynamic other) → dynamic
-    ;
-  operator &(dynamic other) → dynamic
-    ;
-  operator ~() → dynamic
-    ;
-  operator |(dynamic other) → dynamic
-    ;
-  operator ^(dynamic other) → dynamic
-    ;
-  operator /(dynamic other) → dynamic
-    ;
-  operator ==(dynamic other) → core::bool*
-    ;
-  operator >(dynamic other) → dynamic
-    ;
-  operator >=(dynamic other) → dynamic
-    ;
-  operator [](dynamic index) → dynamic
-    ;
-  operator []=(dynamic index, dynamic value) → void
-    ;
-  operator <<(dynamic other) → dynamic
-    ;
-  operator <(dynamic other) → dynamic
-    ;
-  operator <=(dynamic other) → dynamic
-    ;
-  operator *(dynamic other) → dynamic
-    ;
-  operator %(dynamic other) → dynamic
-    ;
-  operator >>(dynamic other) → dynamic
-    ;
-  operator -(dynamic other) → dynamic
-    ;
-  operator ~/(dynamic other) → dynamic
-    ;
-  operator unary-() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main(dynamic arguments) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.transformed.expect
deleted file mode 100644
index edc56e5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/operators.dart.weak.transformed.expect
+++ /dev/null
@@ -1,81 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Operators extends core::Object {
-  synthetic constructor •() → self::Operators*
-    : super core::Object::•()
-    ;
-  operator +(dynamic other) → dynamic
-    return null;
-  operator &(dynamic other) → dynamic
-    return null;
-  operator ~() → dynamic
-    return null;
-  operator |(dynamic other) → dynamic
-    return null;
-  operator ^(dynamic other) → dynamic
-    return null;
-  operator /(dynamic other) → dynamic
-    return null;
-  operator ==(dynamic other) → core::bool*
-    return null;
-  operator >(dynamic other) → dynamic
-    return null;
-  operator >=(dynamic other) → dynamic
-    return null;
-  operator [](dynamic index) → dynamic
-    return null;
-  operator []=(dynamic index, dynamic value) → void {}
-  operator <<(dynamic other) → dynamic
-    return null;
-  operator <(dynamic other) → dynamic
-    return null;
-  operator <=(dynamic other) → dynamic
-    return null;
-  operator *(dynamic other) → dynamic
-    return null;
-  operator %(dynamic other) → dynamic
-    return null;
-  operator >>(dynamic other) → dynamic
-    return null;
-  operator -(dynamic other) → dynamic
-    return null;
-  operator ~/(dynamic other) → dynamic
-    return null;
-  operator unary-() → dynamic
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main(dynamic arguments) → dynamic {
-  self::Operators* a = new self::Operators::•();
-  self::Operators* b = new self::Operators::•();
-  a.{self::Operators::+}(b);
-  a.{self::Operators::&}(b);
-  a.{self::Operators::~}();
-  a.{self::Operators::|}(b);
-  a.{self::Operators::^}(b);
-  a.{self::Operators::/}(b);
-  a.{self::Operators::==}(b);
-  a.{self::Operators::>}(b);
-  a.{self::Operators::>=}(b);
-  a.{self::Operators::[]}(0);
-  a.{self::Operators::[]=}(0, b);
-  a.{self::Operators::<<}(b);
-  a.{self::Operators::<}(b);
-  a.{self::Operators::<=}(b);
-  a.{self::Operators::*}(b);
-  a.{self::Operators::%}(b);
-  a.{self::Operators::>>}(b);
-  a.{self::Operators::-}(b);
-  a.{self::Operators::~/}(b);
-  a.{self::Operators::unary-}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart b/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart
deleted file mode 100644
index f21131e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Foo {
-  method(x, [y, z]) {
-    return "string";
-  }
-}
-
-abstract class External {
-  String externalMethod(int x, [int y, int z]);
-  void listen(Listener listener);
-}
-
-external External createExternal();
-
-abstract class Listener {
-  void event(String input, [int x, int y]);
-}
-
-class TestListener extends Listener {
-  void event(input, [x, y]) {}
-}
-
-class ExtendedListener extends Listener {
-  void event(input, [x, y, z]) {}
-}
-
-class InvalidListener {
-  void event(input, [x]) {}
-}
-
-main() {
-  var foo = new Foo();
-  var string1 = foo.method(1);
-  var string2 = foo.method(1, 2);
-  var string3 = foo.method(1, 2, 3);
-
-  var extern = createExternal();
-  var string4 = extern.externalMethod(1);
-  var string5 = extern.externalMethod(1, 2);
-  var string6 = extern.externalMethod(1, 2, 3);
-
-  extern.listen(new TestListener());
-  extern.listen(new ExtendedListener());
-  extern.listen(new InvalidListener());
-
-  var nothing1 = foo.method();
-  var nothing2 = foo.method(1, 2, 3, 4);
-  var nothing3 = extern.externalMethod();
-  var nothing4 = extern.externalMethod(1, 2, 3, 4);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.textual_outline.expect
deleted file mode 100644
index fefc2ed..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.textual_outline.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-// @dart = 2.6
-class Foo {
-  method(x, [y, z]) {}
-}
-
-abstract class External {
-  String externalMethod(int x, [int y, int z]);
-  void listen(Listener listener);
-}
-
-external External createExternal();
-
-abstract class Listener {
-  void event(String input, [int x, int y]);
-}
-
-class TestListener extends Listener {
-  void event(input, [x, y]) {}
-}
-
-class ExtendedListener extends Listener {
-  void event(input, [x, y, z]) {}
-}
-
-class InvalidListener {
-  void event(input, [x]) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.textual_outline_modelled.expect
deleted file mode 100644
index 686656a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,28 +0,0 @@
-// @dart = 2.6
-abstract class External {
-  String externalMethod(int x, [int y, int z]);
-  void listen(Listener listener);
-}
-
-abstract class Listener {
-  void event(String input, [int x, int y]);
-}
-
-class ExtendedListener extends Listener {
-  void event(input, [x, y, z]) {}
-}
-
-class Foo {
-  method(x, [y, z]) {}
-}
-
-class InvalidListener {
-  void event(input, [x]) {}
-}
-
-class TestListener extends Listener {
-  void event(input, [x, y]) {}
-}
-
-external External createExternal();
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.weak.expect
deleted file mode 100644
index 866d061..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.weak.expect
+++ /dev/null
@@ -1,146 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:49:21: Error: The argument type 'InvalidListener' can't be assigned to the parameter type 'Listener'.
-//  - 'InvalidListener' is from 'pkg/front_end/testcases/general_nnbd_opt_out/optional.dart'.
-//  - 'Listener' is from 'pkg/front_end/testcases/general_nnbd_opt_out/optional.dart'.
-//   extern.listen(new InvalidListener());
-//                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:51:28: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing1 = foo.method();
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:52:28: Error: Too many positional arguments: 3 allowed, but 4 found.
-// Try removing the extra positional arguments.
-//   var nothing2 = foo.method(1, 2, 3, 4);
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:53:39: Error: Too few positional arguments: 1 required, 0 given.
-//   var nothing3 = extern.externalMethod();
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:54:39: Error: Too many positional arguments: 3 allowed, but 4 found.
-// Try removing the extra positional arguments.
-//   var nothing4 = extern.externalMethod(1, 2, 3, 4);
-//                                       ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  method method(dynamic x, [dynamic y = #C1, dynamic z = #C1]) → dynamic {
-    return "string";
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class External extends core::Object {
-  synthetic constructor •() → self::External*
-    : super core::Object::•()
-    ;
-  abstract method externalMethod(core::int* x, [core::int* y = #C1, core::int* z = #C1]) → core::String*;
-  abstract method listen(self::Listener* listener) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Listener extends core::Object {
-  synthetic constructor •() → self::Listener*
-    : super core::Object::•()
-    ;
-  abstract method event(core::String* input, [core::int* x = #C1, core::int* y = #C1]) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class TestListener extends self::Listener {
-  synthetic constructor •() → self::TestListener*
-    : super self::Listener::•()
-    ;
-  method event(core::String* input, [core::int* x = #C1, core::int* y = #C1]) → void {}
-}
-class ExtendedListener extends self::Listener {
-  synthetic constructor •() → self::ExtendedListener*
-    : super self::Listener::•()
-    ;
-  method event(core::String* input, [core::int* x = #C1, core::int* y = #C1, dynamic z = #C1]) → void {}
-}
-class InvalidListener extends core::Object {
-  synthetic constructor •() → self::InvalidListener*
-    : super core::Object::•()
-    ;
-  method event(dynamic input, [dynamic x = #C1]) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-external static method createExternal() → self::External*;
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  dynamic string1 = foo.{self::Foo::method}(1);
-  dynamic string2 = foo.{self::Foo::method}(1, 2);
-  dynamic string3 = foo.{self::Foo::method}(1, 2, 3);
-  self::External* extern = self::createExternal();
-  core::String* string4 = extern.{self::External::externalMethod}(1);
-  core::String* string5 = extern.{self::External::externalMethod}(1, 2);
-  core::String* string6 = extern.{self::External::externalMethod}(1, 2, 3);
-  extern.{self::External::listen}(new self::TestListener::•());
-  extern.{self::External::listen}(new self::ExtendedListener::•());
-  extern.{self::External::listen}(let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:49:21: Error: The argument type 'InvalidListener' can't be assigned to the parameter type 'Listener'.
- - 'InvalidListener' is from 'pkg/front_end/testcases/general_nnbd_opt_out/optional.dart'.
- - 'Listener' is from 'pkg/front_end/testcases/general_nnbd_opt_out/optional.dart'.
-  extern.listen(new InvalidListener());
-                    ^" in new self::InvalidListener::•() as{TypeError} self::Listener*);
-  invalid-type nothing1 = let final<BottomType> #t2 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:51:28: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing1 = foo.method();
-                           ^" in foo.{self::Foo::method}();
-  invalid-type nothing2 = let final<BottomType> #t3 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:52:28: Error: Too many positional arguments: 3 allowed, but 4 found.
-Try removing the extra positional arguments.
-  var nothing2 = foo.method(1, 2, 3, 4);
-                           ^" in foo.{self::Foo::method}(1, 2, 3, 4);
-  invalid-type nothing3 = let final<BottomType> #t4 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:53:39: Error: Too few positional arguments: 1 required, 0 given.
-  var nothing3 = extern.externalMethod();
-                                      ^" in extern.{self::External::externalMethod}();
-  invalid-type nothing4 = let final<BottomType> #t5 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/optional.dart:54:39: Error: Too many positional arguments: 3 allowed, but 4 found.
-Try removing the extra positional arguments.
-  var nothing4 = extern.externalMethod(1, 2, 3, 4);
-                                      ^" in extern.{self::External::externalMethod}(1, 2, 3, 4);
-}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.weak.outline.expect
deleted file mode 100644
index 319a00f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/optional.dart.weak.outline.expect
+++ /dev/null
@@ -1,82 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    ;
-  method method(dynamic x, [dynamic y, dynamic z]) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class External extends core::Object {
-  synthetic constructor •() → self::External*
-    ;
-  abstract method externalMethod(core::int* x, [core::int* y, core::int* z]) → core::String*;
-  abstract method listen(self::Listener* listener) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Listener extends core::Object {
-  synthetic constructor •() → self::Listener*
-    ;
-  abstract method event(core::String* input, [core::int* x, core::int* y]) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class TestListener extends self::Listener {
-  synthetic constructor •() → self::TestListener*
-    ;
-  method event(core::String* input, [core::int* x, core::int* y]) → void
-    ;
-}
-class ExtendedListener extends self::Listener {
-  synthetic constructor •() → self::ExtendedListener*
-    ;
-  method event(core::String* input, [core::int* x, core::int* y, dynamic z]) → void
-    ;
-}
-class InvalidListener extends core::Object {
-  synthetic constructor •() → self::InvalidListener*
-    ;
-  method event(dynamic input, [dynamic x]) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-external static method createExternal() → self::External*;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override.dart
deleted file mode 100644
index 952f79d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Foo {}
-
-class Bar extends Foo {}
-
-class Base {
-  Foo method() {
-    return new Foo();
-  }
-}
-
-class Sub extends Base {
-  Foo method() {
-    return new Bar();
-  }
-}
-
-main(List<String> args) {
-  var object = args.length == 0 ? new Base() : new Sub();
-  var a = object.method();
-  print(a);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.textual_outline.expect
deleted file mode 100644
index bd802d4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class Foo {}
-
-class Bar extends Foo {}
-
-class Base {
-  Foo method() {}
-}
-
-class Sub extends Base {
-  Foo method() {}
-}
-
-main(List<String> args) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.textual_outline_modelled.expect
deleted file mode 100644
index 857d43d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class Bar extends Foo {}
-
-class Base {
-  Foo method() {}
-}
-
-class Foo {}
-
-class Sub extends Base {
-  Foo method() {}
-}
-
-main(List<String> args) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.expect
deleted file mode 100644
index a968ece..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends self::Foo {
-  synthetic constructor •() → self::Bar*
-    : super self::Foo::•()
-    ;
-}
-class Base extends core::Object {
-  synthetic constructor •() → self::Base*
-    : super core::Object::•()
-    ;
-  method method() → self::Foo* {
-    return new self::Foo::•();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends self::Base {
-  synthetic constructor •() → self::Sub*
-    : super self::Base::•()
-    ;
-  method method() → self::Foo* {
-    return new self::Bar::•();
-  }
-}
-static method main(core::List<core::String*>* args) → dynamic {
-  self::Base* object = args.{core::List::length}.{core::num::==}(0) ?{self::Base*} new self::Base::•() : new self::Sub::•();
-  self::Foo* a = object.{self::Base::method}();
-  core::print(a);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.outline.expect
deleted file mode 100644
index d64628d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.outline.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends self::Foo {
-  synthetic constructor •() → self::Bar*
-    ;
-}
-class Base extends core::Object {
-  synthetic constructor •() → self::Base*
-    ;
-  method method() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends self::Base {
-  synthetic constructor •() → self::Sub*
-    ;
-  method method() → self::Foo*
-    ;
-}
-static method main(core::List<core::String*>* args) → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.transformed.expect
deleted file mode 100644
index a968ece..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override.dart.weak.transformed.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends self::Foo {
-  synthetic constructor •() → self::Bar*
-    : super self::Foo::•()
-    ;
-}
-class Base extends core::Object {
-  synthetic constructor •() → self::Base*
-    : super core::Object::•()
-    ;
-  method method() → self::Foo* {
-    return new self::Foo::•();
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Sub extends self::Base {
-  synthetic constructor •() → self::Sub*
-    : super self::Base::•()
-    ;
-  method method() → self::Foo* {
-    return new self::Bar::•();
-  }
-}
-static method main(core::List<core::String*>* args) → dynamic {
-  self::Base* object = args.{core::List::length}.{core::num::==}(0) ?{self::Base*} new self::Base::•() : new self::Sub::•();
-  self::Foo* a = object.{self::Base::method}();
-  core::print(a);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart
deleted file mode 100644
index 9714934..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {}
-
-class B extends A {}
-
-class C {
-  void set x(A value) {}
-  B get y => null;
-}
-
-class D extends C {
-  void set x(value) {} // Inferred type: A
-  get y => null; // Inferred type: B
-}
-
-class E extends D {
-  void set x(A value) {} // Ok
-  B get y => null; // Ok
-}
-
-class F extends D {
-  void set x(B value) {}
-  A get y => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.textual_outline.expect
deleted file mode 100644
index e0a4d3b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.textual_outline.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void set x(A value) {}
-  B get y => null;
-}
-
-class D extends C {
-  void set x(value) {}
-  get y => null;
-}
-
-class E extends D {
-  void set x(A value) {}
-  B get y => null;
-}
-
-class F extends D {
-  void set x(B value) {}
-  A get y => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.textual_outline_modelled.expect
deleted file mode 100644
index f5cef13..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  B get y => null;
-  void set x(A value) {}
-}
-
-class D extends C {
-  get y => null;
-  void set x(value) {}
-}
-
-class E extends D {
-  B get y => null;
-  void set x(A value) {}
-}
-
-class F extends D {
-  A get y => null;
-  void set x(B value) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.weak.expect
deleted file mode 100644
index 481cc72..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.weak.expect
+++ /dev/null
@@ -1,90 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:28:9: Error: The return type of the method 'F.y' is 'A', which does not match the return type, 'B', of the overridden method, 'D.y'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-// Change to a subtype of 'B'.
-//   A get y => null;
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:18:7: Context: This is the overridden method ('y').
-//   get y => null; // Inferred type: B
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:27:16: Error: The parameter 'value' of the method 'F.x' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'D.x'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x(B value) {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:17:12: Context: This is the overridden method ('x').
-//   void set x(value) {} // Inferred type: A
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  set x(self::A* value) → void {}
-  get y() → self::B*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  set x(self::A* value) → void {}
-  get y() → self::B*
-    return null;
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-  set x(self::A* value) → void {}
-  get y() → self::B*
-    return null;
-}
-class F extends self::D {
-  synthetic constructor •() → self::F*
-    : super self::D::•()
-    ;
-  set x(self::B* value) → void {}
-  get y() → self::A*
-    return null;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.weak.outline.expect
deleted file mode 100644
index 609ae29..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart.weak.outline.expect
+++ /dev/null
@@ -1,89 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:28:9: Error: The return type of the method 'F.y' is 'A', which does not match the return type, 'B', of the overridden method, 'D.y'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-// Change to a subtype of 'B'.
-//   A get y => null;
-//         ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:18:7: Context: This is the overridden method ('y').
-//   get y => null; // Inferred type: B
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:27:16: Error: The parameter 'value' of the method 'F.x' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'D.x'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x(B value) {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_after_inference.dart:17:12: Context: This is the overridden method ('x').
-//   void set x(value) {} // Inferred type: A
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  set x(self::A* value) → void
-    ;
-  get y() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  set x(self::A* value) → void
-    ;
-  get y() → self::B*
-    ;
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    ;
-  set x(self::A* value) → void
-    ;
-  get y() → self::B*
-    ;
-}
-class F extends self::D {
-  synthetic constructor •() → self::F*
-    ;
-  set x(self::B* value) → void
-    ;
-  get y() → self::A*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart
deleted file mode 100644
index 54a5691..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {}
-
-class B extends A {}
-
-class C {
-  void set x(A value) {}
-  A get y => null;
-}
-
-class D extends C {
-  void set x(Object value) {} // Ok
-  B get y => null; // Ok
-}
-
-class E extends C {
-  void set x(B value) {}
-  Object get y => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.textual_outline.expect
deleted file mode 100644
index 2eac781..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.textual_outline.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void set x(A value) {}
-  A get y => null;
-}
-
-class D extends C {
-  void set x(Object value) {}
-  B get y => null;
-}
-
-class E extends C {
-  void set x(B value) {}
-  Object get y => null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.textual_outline_modelled.expect
deleted file mode 100644
index 434390e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,21 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  A get y => null;
-  void set x(A value) {}
-}
-
-class D extends C {
-  B get y => null;
-  void set x(Object value) {}
-}
-
-class E extends C {
-  Object get y => null;
-  void set x(B value) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.weak.expect
deleted file mode 100644
index ecb2657..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.weak.expect
+++ /dev/null
@@ -1,82 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:23:14: Error: The return type of the method 'E.y' is 'Object', which does not match the return type, 'A', of the overridden method, 'C.y'.
-//  - 'Object' is from 'dart:core'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart'.
-// Change to a subtype of 'A'.
-//   Object get y => null;
-//              ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:13:9: Context: This is the overridden method ('y').
-//   A get y => null;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:22:16: Error: The parameter 'value' of the method 'E.x' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.x'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x(B value) {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:12:12: Context: This is the overridden method ('x').
-//   void set x(A value) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  set x(self::A* value) → void {}
-  get y() → self::A*
-    return null;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  set x(core::Object* value) → void {}
-  get y() → self::B*
-    return null;
-}
-class E extends self::C {
-  synthetic constructor •() → self::E*
-    : super self::C::•()
-    ;
-  set x(self::B* value) → void {}
-  get y() → core::Object*
-    return null;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.weak.outline.expect
deleted file mode 100644
index b6b6656..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart.weak.outline.expect
+++ /dev/null
@@ -1,81 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:23:14: Error: The return type of the method 'E.y' is 'Object', which does not match the return type, 'A', of the overridden method, 'C.y'.
-//  - 'Object' is from 'dart:core'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart'.
-// Change to a subtype of 'A'.
-//   Object get y => null;
-//              ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:13:9: Context: This is the overridden method ('y').
-//   A get y => null;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:22:16: Error: The parameter 'value' of the method 'E.x' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.x'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x(B value) {}
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_basic.dart:12:12: Context: This is the overridden method ('x').
-//   void set x(A value) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  set x(self::A* value) → void
-    ;
-  get y() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  set x(core::Object* value) → void
-    ;
-  get y() → self::B*
-    ;
-}
-class E extends self::C {
-  synthetic constructor •() → self::E*
-    ;
-  set x(self::B* value) → void
-    ;
-  get y() → core::Object*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart
deleted file mode 100644
index d7222f0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {}
-
-class B extends A {}
-
-class C {
-  void set x1(covariant A value) {}
-  void set x2(A value) {}
-  void set x3(covariant A value) {}
-  void set x4(A value) {}
-  void set x5(covariant A value) {}
-  void set x6(covariant B value) {}
-}
-
-class D extends C {
-  void set x1(B value) {} // Ok because covariant is inherited
-  void set x2(covariant B value) {} // Ok because covariant
-  void set x3(covariant B value) {} // Ok because covariant
-  void set x4(B value) {} // Not covariant
-  void set x5(covariant String value) {}
-  void set x6(covariant A value) {} // Always ok
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.textual_outline.expect
deleted file mode 100644
index 37a5988..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.textual_outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void set x1(covariant A value) {}
-  void set x2(A value) {}
-  void set x3(covariant A value) {}
-  void set x4(A value) {}
-  void set x5(covariant A value) {}
-  void set x6(covariant B value) {}
-}
-
-class D extends C {
-  void set x1(B value) {}
-  void set x2(covariant B value) {}
-  void set x3(covariant B value) {}
-  void set x4(B value) {}
-  void set x5(covariant String value) {}
-  void set x6(covariant A value) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.textual_outline_modelled.expect
deleted file mode 100644
index 37a5988..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void set x1(covariant A value) {}
-  void set x2(A value) {}
-  void set x3(covariant A value) {}
-  void set x4(A value) {}
-  void set x5(covariant A value) {}
-  void set x6(covariant B value) {}
-}
-
-class D extends C {
-  void set x1(B value) {}
-  void set x2(covariant B value) {}
-  void set x3(covariant B value) {}
-  void set x4(B value) {}
-  void set x5(covariant String value) {}
-  void set x6(covariant A value) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.weak.expect
deleted file mode 100644
index 525a9fe..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.weak.expect
+++ /dev/null
@@ -1,79 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:24:17: Error: The parameter 'value' of the method 'D.x4' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.x4'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x4(B value) {} // Not covariant
-//                 ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:15:12: Context: This is the overridden method ('x4').
-//   void set x4(A value) {}
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:25:32: Error: The parameter 'value' of the method 'D.x5' has type 'String', which does not match the corresponding type, 'A', in the overridden method, 'C.x5'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x5(covariant String value) {}
-//                                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:16:12: Context: This is the overridden method ('x5').
-//   void set x5(covariant A value) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  set x1(covariant self::A* value) → void {}
-  set x2(self::A* value) → void {}
-  set x3(covariant self::A* value) → void {}
-  set x4(self::A* value) → void {}
-  set x5(covariant self::A* value) → void {}
-  set x6(covariant self::B* value) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  set x1(covariant self::B* value) → void {}
-  set x2(covariant self::B* value) → void {}
-  set x3(covariant self::B* value) → void {}
-  set x4(self::B* value) → void {}
-  set x5(covariant core::String* value) → void {}
-  set x6(covariant self::A* value) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.weak.outline.expect
deleted file mode 100644
index 71b6124..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart.weak.outline.expect
+++ /dev/null
@@ -1,88 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:24:17: Error: The parameter 'value' of the method 'D.x4' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.x4'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x4(B value) {} // Not covariant
-//                 ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:15:12: Context: This is the overridden method ('x4').
-//   void set x4(A value) {}
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:25:32: Error: The parameter 'value' of the method 'D.x5' has type 'String', which does not match the corresponding type, 'A', in the overridden method, 'C.x5'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void set x5(covariant String value) {}
-//                                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_accessor_with_covariant_modifier.dart:16:12: Context: This is the overridden method ('x5').
-//   void set x5(covariant A value) {}
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  set x1(covariant self::A* value) → void
-    ;
-  set x2(self::A* value) → void
-    ;
-  set x3(covariant self::A* value) → void
-    ;
-  set x4(self::A* value) → void
-    ;
-  set x5(covariant self::A* value) → void
-    ;
-  set x6(covariant self::B* value) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  set x1(covariant self::B* value) → void
-    ;
-  set x2(covariant self::B* value) → void
-    ;
-  set x3(covariant self::B* value) → void
-    ;
-  set x4(self::B* value) → void
-    ;
-  set x5(covariant core::String* value) → void
-    ;
-  set x6(covariant self::A* value) → void
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart
deleted file mode 100644
index d85b522..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {}
-
-class B extends A {}
-
-class C {
-  void f(A x) {}
-}
-
-class D extends C {
-  void f(x) {} // Inferred type: (A) -> void
-}
-
-class E extends D {
-  void f(A x) {} // Ok
-}
-
-class F extends D {
-  void f(B x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.textual_outline.expect
deleted file mode 100644
index 27efff1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.textual_outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void f(A x) {}
-}
-
-class D extends C {
-  void f(x) {}
-}
-
-class E extends D {
-  void f(A x) {}
-}
-
-class F extends D {
-  void f(B x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.textual_outline_modelled.expect
deleted file mode 100644
index 27efff1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void f(A x) {}
-}
-
-class D extends C {
-  void f(x) {}
-}
-
-class E extends D {
-  void f(A x) {}
-}
-
-class F extends D {
-  void f(B x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.weak.expect
deleted file mode 100644
index 2e681e6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.weak.expect
+++ /dev/null
@@ -1,72 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart:24:12: Error: The parameter 'x' of the method 'F.f' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'D.f'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f(B x) {}
-//            ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart:16:8: Context: This is the overridden method ('f').
-//   void f(x) {} // Inferred type: (A) -> void
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method f(self::A* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  method f(self::A* x) → void {}
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-  method f(self::A* x) → void {}
-}
-class F extends self::D {
-  synthetic constructor •() → self::F*
-    : super self::D::•()
-    ;
-  method f(self::B* x) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.weak.outline.expect
deleted file mode 100644
index d43aca5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart.weak.outline.expect
+++ /dev/null
@@ -1,71 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart:24:12: Error: The parameter 'x' of the method 'F.f' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'D.f'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f(B x) {}
-//            ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_after_inference.dart:16:8: Context: This is the overridden method ('f').
-//   void f(x) {} // Inferred type: (A) -> void
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method f(self::A* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  method f(self::A* x) → void
-    ;
-}
-class E extends self::D {
-  synthetic constructor •() → self::E*
-    ;
-  method f(self::A* x) → void
-    ;
-}
-class F extends self::D {
-  synthetic constructor •() → self::F*
-    ;
-  method f(self::B* x) → void
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart
deleted file mode 100644
index 2a9cc11..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {}
-
-class B extends A {}
-
-class C {
-  void f1(A x) {}
-  void f2([A x]) {}
-  void f3({A x}) {}
-  A f4() {}
-}
-
-class D extends C {
-  void f1(Object x) {} // Ok
-  void f2([Object x]) {} // Ok
-  void f3({Object x}) {} // Ok
-  B f4() {} // Ok
-}
-
-class E extends C {
-  void f1(B x) {}
-  void f2([B x]) {}
-  void f3({B x}) {}
-  Object f4() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.textual_outline.expect
deleted file mode 100644
index 16702e3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.textual_outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void f1(A x) {}
-  void f2([A x]) {}
-  void f3({A x}) {}
-  A f4() {}
-}
-
-class D extends C {
-  void f1(Object x) {}
-  void f2([Object x]) {}
-  void f3({Object x}) {}
-  B f4() {}
-}
-
-class E extends C {
-  void f1(B x) {}
-  void f2([B x]) {}
-  void f3({B x}) {}
-  Object f4() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6ae09bf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  A f4() {}
-  void f1(A x) {}
-  void f2([A x]) {}
-  void f3({A x}) {}
-}
-
-class D extends C {
-  B f4() {}
-  void f1(Object x) {}
-  void f2([Object x]) {}
-  void f3({Object x}) {}
-}
-
-class E extends C {
-  Object f4() {}
-  void f1(B x) {}
-  void f2([B x]) {}
-  void f3({B x}) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.weak.expect
deleted file mode 100644
index 9ed41eb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.weak.expect
+++ /dev/null
@@ -1,109 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:26:13: Error: The parameter 'x' of the method 'E.f1' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f1'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f1(B x) {}
-//             ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:12:8: Context: This is the overridden method ('f1').
-//   void f1(A x) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:27:14: Error: The parameter 'x' of the method 'E.f2' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f2'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f2([B x]) {}
-//              ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:13:8: Context: This is the overridden method ('f2').
-//   void f2([A x]) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:28:14: Error: The parameter 'x' of the method 'E.f3' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f3'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f3({B x}) {}
-//              ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:14:8: Context: This is the overridden method ('f3').
-//   void f3({A x}) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:29:10: Error: The return type of the method 'E.f4' is 'Object', which does not match the return type, 'A', of the overridden method, 'C.f4'.
-//  - 'Object' is from 'dart:core'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a subtype of 'A'.
-//   Object f4() {}
-//          ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:15:5: Context: This is the overridden method ('f4').
-//   A f4() {}
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method f1(self::A* x) → void {}
-  method f2([self::A* x = #C1]) → void {}
-  method f3({self::A* x = #C1}) → void {}
-  method f4() → self::A* {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  method f1(core::Object* x) → void {}
-  method f2([core::Object* x = #C1]) → void {}
-  method f3({core::Object* x = #C1}) → void {}
-  method f4() → self::B* {}
-}
-class E extends self::C {
-  synthetic constructor •() → self::E*
-    : super self::C::•()
-    ;
-  method f1(self::B* x) → void {}
-  method f2([self::B* x = #C1]) → void {}
-  method f3({self::B* x = #C1}) → void {}
-  method f4() → core::Object* {}
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.weak.outline.expect
deleted file mode 100644
index 026643a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart.weak.outline.expect
+++ /dev/null
@@ -1,113 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:26:13: Error: The parameter 'x' of the method 'E.f1' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f1'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f1(B x) {}
-//             ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:12:8: Context: This is the overridden method ('f1').
-//   void f1(A x) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:27:14: Error: The parameter 'x' of the method 'E.f2' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f2'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f2([B x]) {}
-//              ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:13:8: Context: This is the overridden method ('f2').
-//   void f2([A x]) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:28:14: Error: The parameter 'x' of the method 'E.f3' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f3'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f3({B x}) {}
-//              ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:14:8: Context: This is the overridden method ('f3').
-//   void f3({A x}) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:29:10: Error: The return type of the method 'E.f4' is 'Object', which does not match the return type, 'A', of the overridden method, 'C.f4'.
-//  - 'Object' is from 'dart:core'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart'.
-// Change to a subtype of 'A'.
-//   Object f4() {}
-//          ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_basic.dart:15:5: Context: This is the overridden method ('f4').
-//   A f4() {}
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method f1(self::A* x) → void
-    ;
-  method f2([self::A* x]) → void
-    ;
-  method f3({self::A* x}) → void
-    ;
-  method f4() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  method f1(core::Object* x) → void
-    ;
-  method f2([core::Object* x]) → void
-    ;
-  method f3({core::Object* x}) → void
-    ;
-  method f4() → self::B*
-    ;
-}
-class E extends self::C {
-  synthetic constructor •() → self::E*
-    ;
-  method f1(self::B* x) → void
-    ;
-  method f2([self::B* x]) → void
-    ;
-  method f3({self::B* x}) → void
-    ;
-  method f4() → core::Object*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart
deleted file mode 100644
index 27dc333..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that an override of a generic method is allowed in case of
-// correctly defined f-bounded type variables.
-
-class Foo<T extends Foo<T>> {}
-
-abstract class Bar {
-  void fisk<S extends Foo<S>>();
-}
-
-class Hest implements Bar {
-  @override
-  void fisk<U extends Foo<U>>() {}
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.textual_outline.expect
deleted file mode 100644
index 4f5df34..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.textual_outline.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-// @dart = 2.6
-class Foo<T extends Foo<T>> {}
-
-abstract class Bar {
-  void fisk<S extends Foo<S>>();
-}
-
-class Hest implements Bar {
-  @override
-  void fisk<U extends Foo<U>>() {}
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6832671..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-// @dart = 2.6
-abstract class Bar {
-  void fisk<S extends Foo<S>>();
-}
-
-class Foo<T extends Foo<T>> {}
-
-class Hest implements Bar {
-  @override
-  void fisk<U extends Foo<U>>() {}
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.expect
deleted file mode 100644
index ed9f7b4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.expect
+++ /dev/null
@@ -1,57 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo<T extends self::Foo<self::Foo::T*>* = self::Foo<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::Foo<self::Foo::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract method fisk<S extends self::Foo<self::Bar::fisk::S*>* = self::Foo<dynamic>*>() → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hest extends core::Object implements self::Bar {
-  synthetic constructor •() → self::Hest*
-    : super core::Object::•()
-    ;
-  @#C1
-  method fisk<U extends self::Foo<self::Hest::fisk::U*>* = self::Foo<dynamic>*>() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.outline.expect
deleted file mode 100644
index ec5db7f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.outline.expect
+++ /dev/null
@@ -1,57 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo<T extends self::Foo<self::Foo::T*>* = self::Foo<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::Foo<self::Foo::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    ;
-  abstract method fisk<S extends self::Foo<self::Bar::fisk::S*>* = self::Foo<dynamic>*>() → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hest extends core::Object implements self::Bar {
-  synthetic constructor •() → self::Hest*
-    ;
-  @core::override
-  method fisk<U extends self::Foo<self::Hest::fisk::U*>* = self::Foo<dynamic>*>() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///override_check_generic_method_f_bounded.dart:17:4 -> InstanceConstant(const _Override{})
-Extra constant evaluation: evaluated: 1, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.transformed.expect
deleted file mode 100644
index ed9f7b4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_generic_method_f_bounded.dart.weak.transformed.expect
+++ /dev/null
@@ -1,57 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo<T extends self::Foo<self::Foo::T*>* = self::Foo<dynamic>*> extends core::Object {
-  synthetic constructor •() → self::Foo<self::Foo::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Bar extends core::Object {
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract method fisk<S extends self::Foo<self::Bar::fisk::S*>* = self::Foo<dynamic>*>() → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Hest extends core::Object implements self::Bar {
-  synthetic constructor •() → self::Hest*
-    : super core::Object::•()
-    ;
-  @#C1
-  method fisk<U extends self::Foo<self::Hest::fisk::U*>* = self::Foo<dynamic>*>() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart
deleted file mode 100644
index babc0db..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A<T> {
-  void f<U>(Map<T, U> m) {}
-}
-
-class B extends A<String> {
-  // To see that this is a valid override, both T and U need to be substituted
-  // correctly.
-  void f<V>(Map<String, V> m) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.textual_outline.expect
deleted file mode 100644
index bb679c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A<T> {
-  void f<U>(Map<T, U> m) {}
-}
-
-class B extends A<String> {
-  void f<V>(Map<String, V> m) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.textual_outline_modelled.expect
deleted file mode 100644
index bb679c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-class A<T> {
-  void f<U>(Map<T, U> m) {}
-}
-
-class B extends A<String> {
-  void f<V>(Map<String, V> m) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.expect
deleted file mode 100644
index 65a02b5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  method f<U extends core::Object* = dynamic>(generic-covariant-impl core::Map<self::A::T*, self::A::f::U*>* m) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A<core::String*> {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method f<V extends core::Object* = dynamic>(generic-covariant-impl core::Map<core::String*, self::B::f::V*>* m) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.outline.expect
deleted file mode 100644
index b90d84e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.outline.expect
+++ /dev/null
@@ -1,28 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    ;
-  method f<U extends core::Object* = dynamic>(generic-covariant-impl core::Map<self::A::T*, self::A::f::U*>* m) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A<core::String*> {
-  synthetic constructor •() → self::B*
-    ;
-  method f<V extends core::Object* = dynamic>(generic-covariant-impl core::Map<core::String*, self::B::f::V*>* m) → void
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.transformed.expect
deleted file mode 100644
index 65a02b5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_two_substitutions.dart.weak.transformed.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  method f<U extends core::Object* = dynamic>(generic-covariant-impl core::Map<self::A::T*, self::A::f::U*>* m) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A<core::String*> {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method f<V extends core::Object* = dynamic>(generic-covariant-impl core::Map<core::String*, self::B::f::V*>* m) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart
deleted file mode 100644
index ff643a1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {}
-
-class B extends A {}
-
-class C {
-  void f1(covariant A x) {}
-  void f2(A x) {}
-  void f3(covariant A x) {}
-  void f4(A x) {}
-  void f5(covariant A x) {}
-  void f6(covariant B x) {}
-}
-
-class D extends C {
-  void f1(B x) {} // Ok because covariant is inherited
-  void f2(covariant B x) {} // Ok because covariant
-  void f3(covariant B x) {} // Ok because covariant
-  void f4(B x) {} // Not covariant
-  void f5(covariant String x) {}
-  void f6(covariant A x) {} // Always ok
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.textual_outline.expect
deleted file mode 100644
index 9a29d45..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.textual_outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void f1(covariant A x) {}
-  void f2(A x) {}
-  void f3(covariant A x) {}
-  void f4(A x) {}
-  void f5(covariant A x) {}
-  void f6(covariant B x) {}
-}
-
-class D extends C {
-  void f1(B x) {}
-  void f2(covariant B x) {}
-  void f3(covariant B x) {}
-  void f4(B x) {}
-  void f5(covariant String x) {}
-  void f6(covariant A x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9a29d45..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B extends A {}
-
-class C {
-  void f1(covariant A x) {}
-  void f2(A x) {}
-  void f3(covariant A x) {}
-  void f4(A x) {}
-  void f5(covariant A x) {}
-  void f6(covariant B x) {}
-}
-
-class D extends C {
-  void f1(B x) {}
-  void f2(covariant B x) {}
-  void f3(covariant B x) {}
-  void f4(B x) {}
-  void f5(covariant String x) {}
-  void f6(covariant A x) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.weak.expect
deleted file mode 100644
index d101f52..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.weak.expect
+++ /dev/null
@@ -1,79 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:24:13: Error: The parameter 'x' of the method 'D.f4' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f4'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f4(B x) {} // Not covariant
-//             ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:15:8: Context: This is the overridden method ('f4').
-//   void f4(A x) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:25:28: Error: The parameter 'x' of the method 'D.f5' has type 'String', which does not match the corresponding type, 'A', in the overridden method, 'C.f5'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f5(covariant String x) {}
-//                            ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:16:8: Context: This is the overridden method ('f5').
-//   void f5(covariant A x) {}
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method f1(covariant self::A* x) → void {}
-  method f2(self::A* x) → void {}
-  method f3(covariant self::A* x) → void {}
-  method f4(self::A* x) → void {}
-  method f5(covariant self::A* x) → void {}
-  method f6(covariant self::B* x) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  method f1(covariant self::B* x) → void {}
-  method f2(covariant self::B* x) → void {}
-  method f3(covariant self::B* x) → void {}
-  method f4(self::B* x) → void {}
-  method f5(covariant core::String* x) → void {}
-  method f6(covariant self::A* x) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.weak.outline.expect
deleted file mode 100644
index 5de4285..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart.weak.outline.expect
+++ /dev/null
@@ -1,88 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:24:13: Error: The parameter 'x' of the method 'D.f4' has type 'B', which does not match the corresponding type, 'A', in the overridden method, 'C.f4'.
-//  - 'B' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f4(B x) {} // Not covariant
-//             ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:15:8: Context: This is the overridden method ('f4').
-//   void f4(A x) {}
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:25:28: Error: The parameter 'x' of the method 'D.f5' has type 'String', which does not match the corresponding type, 'A', in the overridden method, 'C.f5'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart'.
-// Change to a supertype of 'A', or, for a covariant parameter, a subtype.
-//   void f5(covariant String x) {}
-//                            ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_check_with_covariant_modifier.dart:16:8: Context: This is the overridden method ('f5').
-//   void f5(covariant A x) {}
-//        ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  method f1(covariant self::A* x) → void
-    ;
-  method f2(self::A* x) → void
-    ;
-  method f3(covariant self::A* x) → void
-    ;
-  method f4(self::A* x) → void
-    ;
-  method f5(covariant self::A* x) → void
-    ;
-  method f6(covariant self::B* x) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  method f1(covariant self::B* x) → void
-    ;
-  method f2(covariant self::B* x) → void
-    ;
-  method f3(covariant self::B* x) → void
-    ;
-  method f4(self::B* x) → void
-    ;
-  method f5(covariant core::String* x) → void
-    ;
-  method f6(covariant self::A* x) → void
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart
deleted file mode 100644
index 3007e70..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// 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.6
-
-class B {
-  num get foo => null;
-  set foo(dynamic newFoo) {}
-}
-
-class A extends B {
-  set foo(newFoo) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.textual_outline.expect
deleted file mode 100644
index 405d608..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class B {
-  num get foo => null;
-  set foo(dynamic newFoo) {}
-}
-
-class A extends B {
-  set foo(newFoo) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.textual_outline_modelled.expect
deleted file mode 100644
index aded191..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class A extends B {
-  set foo(newFoo) {}
-}
-
-class B {
-  num get foo => null;
-  set foo(dynamic newFoo) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.expect
deleted file mode 100644
index 845e3fb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  get foo() → core::num*
-    return null;
-  set foo(dynamic newFoo) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends self::B {
-  synthetic constructor •() → self::A*
-    : super self::B::•()
-    ;
-  set foo(dynamic newFoo) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.outline.expect
deleted file mode 100644
index 77549aa..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.outline.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  get foo() → core::num*
-    ;
-  set foo(dynamic newFoo) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends self::B {
-  synthetic constructor •() → self::A*
-    ;
-  set foo(dynamic newFoo) → void
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.transformed.expect
deleted file mode 100644
index 845e3fb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_for_setters.dart.weak.transformed.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  get foo() → core::num*
-    return null;
-  set foo(dynamic newFoo) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A extends self::B {
-  synthetic constructor •() → self::A*
-    : super self::B::•()
-    ;
-  set foo(dynamic newFoo) → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart
deleted file mode 100644
index 5629be1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart
+++ /dev/null
@@ -1,37 +0,0 @@
-// 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.6
-
-// The test checks that override-based inference for named parameters isn't
-// affected by the name-based ordering of the parameters.
-
-class A {
-  foo({bool c = true, bool a}) {}
-}
-
-class B extends A {
-  foo({c = true, bool a}) {}
-}
-
-class C extends B {
-  foo({bool c = true, bool a}) {}
-}
-
-// A1, B1, and C1 are similar to A, B, and C, only they have the names of the
-// named parameters swapped, to test that the alternative ordering works.
-
-class A1 {
-  foo({bool a = true, bool c}) {}
-}
-
-class B1 extends A1 {
-  foo({a = true, bool c}) {}
-}
-
-class C1 extends B1 {
-  foo({bool a = true, bool c}) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.textual_outline.expect
deleted file mode 100644
index c56c48e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.textual_outline.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-// @dart = 2.6
-class A {
-  foo({bool c = true, bool a}) {}
-}
-
-class B extends A {
-  foo({c = true, bool a}) {}
-}
-
-class C extends B {
-  foo({bool c = true, bool a}) {}
-}
-
-class A1 {
-  foo({bool a = true, bool c}) {}
-}
-
-class B1 extends A1 {
-  foo({a = true, bool c}) {}
-}
-
-class C1 extends B1 {
-  foo({bool a = true, bool c}) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.textual_outline_modelled.expect
deleted file mode 100644
index cd5ed60e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,26 +0,0 @@
-// @dart = 2.6
-class A {
-  foo({bool c = true, bool a}) {}
-}
-
-class A1 {
-  foo({bool a = true, bool c}) {}
-}
-
-class B extends A {
-  foo({c = true, bool a}) {}
-}
-
-class B1 extends A1 {
-  foo({a = true, bool c}) {}
-}
-
-class C extends B {
-  foo({bool c = true, bool a}) {}
-}
-
-class C1 extends B1 {
-  foo({bool a = true, bool c}) {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.expect
deleted file mode 100644
index 6e67b60..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.expect
+++ /dev/null
@@ -1,66 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo({core::bool* c = #C1, core::bool* a = #C2}) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method foo({core::bool* c = #C1, core::bool* a = #C2}) → dynamic {}
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-  method foo({core::bool* c = #C1, core::bool* a = #C2}) → dynamic {}
-}
-class A1 extends core::Object {
-  synthetic constructor •() → self::A1*
-    : super core::Object::•()
-    ;
-  method foo({core::bool* a = #C1, core::bool* c = #C2}) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B1 extends self::A1 {
-  synthetic constructor •() → self::B1*
-    : super self::A1::•()
-    ;
-  method foo({core::bool* a = #C1, core::bool* c = #C2}) → dynamic {}
-}
-class C1 extends self::B1 {
-  synthetic constructor •() → self::C1*
-    : super self::B1::•()
-    ;
-  method foo({core::bool* a = #C1, core::bool* c = #C2}) → dynamic {}
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = true
-  #C2 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.outline.expect
deleted file mode 100644
index f3f9552..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.outline.expect
+++ /dev/null
@@ -1,62 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  method foo({core::bool* c = true, core::bool* a}) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-  method foo({core::bool* c = true, core::bool* a}) → dynamic
-    ;
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    ;
-  method foo({core::bool* c = true, core::bool* a}) → dynamic
-    ;
-}
-class A1 extends core::Object {
-  synthetic constructor •() → self::A1*
-    ;
-  method foo({core::bool* a = true, core::bool* c}) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B1 extends self::A1 {
-  synthetic constructor •() → self::B1*
-    ;
-  method foo({core::bool* a = true, core::bool* c}) → dynamic
-    ;
-}
-class C1 extends self::B1 {
-  synthetic constructor •() → self::C1*
-    ;
-  method foo({core::bool* a = true, core::bool* c}) → dynamic
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.transformed.expect
deleted file mode 100644
index 6e67b60..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_inference_named_parameters_ordering.dart.weak.transformed.expect
+++ /dev/null
@@ -1,66 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method foo({core::bool* c = #C1, core::bool* a = #C2}) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method foo({core::bool* c = #C1, core::bool* a = #C2}) → dynamic {}
-}
-class C extends self::B {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-  method foo({core::bool* c = #C1, core::bool* a = #C2}) → dynamic {}
-}
-class A1 extends core::Object {
-  synthetic constructor •() → self::A1*
-    : super core::Object::•()
-    ;
-  method foo({core::bool* a = #C1, core::bool* c = #C2}) → dynamic {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B1 extends self::A1 {
-  synthetic constructor •() → self::B1*
-    : super self::A1::•()
-    ;
-  method foo({core::bool* a = #C1, core::bool* c = #C2}) → dynamic {}
-}
-class C1 extends self::B1 {
-  synthetic constructor •() → self::C1*
-    : super self::B1::•()
-    ;
-  method foo({core::bool* a = #C1, core::bool* c = #C2}) → dynamic {}
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = true
-  #C2 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart b/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart
deleted file mode 100644
index f3610f1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.6
-
-abstract class A {
-  void set x(Object y);
-}
-
-class B implements A {
-  int x;
-}
-
-main() {
-  new B().x = 5;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.textual_outline.expect
deleted file mode 100644
index efb031f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class A {
-  void set x(Object y);
-}
-
-class B implements A {
-  int x;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.textual_outline_modelled.expect
deleted file mode 100644
index efb031f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class A {
-  void set x(Object y);
-}
-
-class B implements A {
-  int x;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.weak.expect
deleted file mode 100644
index 2b856cc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.weak.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart:12:7: Error: The field 'B.x' has type 'int', which does not match the corresponding type, 'Object', in the overridden setter, 'A.x'.
-//  - 'Object' is from 'dart:core'.
-//   int x;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart:8:12: Context: This is the overridden method ('x').
-//   void set x(Object y);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract set x(core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object implements self::A {
-  field core::int* x = null;
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::B::•().{self::B::x} = 5;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.weak.outline.expect
deleted file mode 100644
index 14323ba..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart.weak.outline.expect
+++ /dev/null
@@ -1,47 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart:12:7: Error: The field 'B.x' has type 'int', which does not match the corresponding type, 'Object', in the overridden setter, 'A.x'.
-//  - 'Object' is from 'dart:core'.
-//   int x;
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/override_setter_with_field.dart:8:12: Context: This is the overridden method ('x').
-//   void set x(Object y);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract set x(core::Object* y) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object implements self::A {
-  field core::int* x;
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart
deleted file mode 100644
index a195bd0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-part of "part_as_entry_point_lib.dart";
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.textual_outline.expect
deleted file mode 100644
index 56c5193..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-part of "part_as_entry_point_lib.dart";
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.textual_outline_modelled.expect
deleted file mode 100644
index 56c5193..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-part of "part_as_entry_point_lib.dart";
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.expect
deleted file mode 100644
index b77b0c2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-part part_as_entry_point.dart;
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.outline.expect
deleted file mode 100644
index 1d93518..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-library;
-import self as self;
-
-part part_as_entry_point.dart;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.transformed.expect
deleted file mode 100644
index b77b0c2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point.dart.weak.transformed.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-part part_as_entry_point.dart;
-static method main() → dynamic {
-  core::print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point_lib.dart
deleted file mode 100644
index e6bac42..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_as_entry_point_lib.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-part "part_as_entry_point.dart";
-
-main() {
-  print("Hello, World!");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart
deleted file mode 100644
index 5a02b1b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.6
-
-import 'part_not_part_of_lib2.dart';
-
-@override
-part 'part_not_part_of_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.textual_outline.expect
deleted file mode 100644
index 49e7a9f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'part_not_part_of_lib2.dart';
-@override
-part 'part_not_part_of_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.textual_outline_modelled.expect
deleted file mode 100644
index 49e7a9f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'part_not_part_of_lib2.dart';
-@override
-part 'part_not_part_of_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.expect
deleted file mode 100644
index e5e9a47..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart:10:6: Error: Can't use 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib1.dart' as a part, because it has no 'part of' declaration.
-// part 'part_not_part_of_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_not_part_of_lib2.dart";
-
-@#C1
-part part_not_part_of_lib1.dart;
-static method main() → dynamic {}
-
-library;
-import self as self2;
-import "part_not_part_of_lib1.dart" as par;
-
-import "org-dartlang-testcase:///part_not_part_of_lib1.dart";
-
-static method methodFromLib2() → dynamic {
-  par::methodFromLib1();
-}
-
-library;
-import self as par;
-
-static method methodFromLib1() → dynamic {}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.outline.expect
deleted file mode 100644
index 1296a68..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.outline.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart:10:6: Error: Can't use 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib1.dart' as a part, because it has no 'part of' declaration.
-// part 'part_not_part_of_lib1.dart';
-//      ^
-//
-import self as self;
-
-import "org-dartlang-testcase:///part_not_part_of_lib2.dart";
-
-part part_not_part_of_lib1.dart;
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-
-import "org-dartlang-testcase:///part_not_part_of_lib1.dart";
-
-static method methodFromLib2() → dynamic
-  ;
-
-library;
-import self as self3;
-
-static method methodFromLib1() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.transformed.expect
deleted file mode 100644
index e5e9a47..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart.weak.transformed.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of.dart:10:6: Error: Can't use 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib1.dart' as a part, because it has no 'part of' declaration.
-// part 'part_not_part_of_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_not_part_of_lib2.dart";
-
-@#C1
-part part_not_part_of_lib1.dart;
-static method main() → dynamic {}
-
-library;
-import self as self2;
-import "part_not_part_of_lib1.dart" as par;
-
-import "org-dartlang-testcase:///part_not_part_of_lib1.dart";
-
-static method methodFromLib2() → dynamic {
-  par::methodFromLib1();
-}
-
-library;
-import self as par;
-
-static method methodFromLib1() → dynamic {}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib1.dart
deleted file mode 100644
index 2d3b8e5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib1.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// 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.6
-
-methodFromLib1() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib2.dart
deleted file mode 100644
index 2bbe471..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_lib2.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.6
-
-import "part_not_part_of_lib1.dart";
-
-methodFromLib2() {
-  methodFromLib1();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart
deleted file mode 100644
index c769ab8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.6
-
-import 'part_not_part_of_same_named_library_lib2.dart';
-
-@override
-part 'part_not_part_of_same_named_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.textual_outline.expect
deleted file mode 100644
index 5094fa1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'part_not_part_of_same_named_library_lib2.dart';
-@override
-part 'part_not_part_of_same_named_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5094fa1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'part_not_part_of_same_named_library_lib2.dart';
-@override
-part 'part_not_part_of_same_named_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.expect
deleted file mode 100644
index a5b4847..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart:10:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib1.dart' as part of 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart' but its 'part of' declaration says 'foo'.
-// Try changing the 'part of' declaration to use a relative file name.
-// part 'part_not_part_of_same_named_library_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_not_part_of_same_named_library_lib2.dart";
-
-@#C1
-part part_not_part_of_same_named_library_lib1.dart;
-static method main() → dynamic {}
-
-library foo;
-import self as self2;
-
-part part_not_part_of_same_named_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_not_part_of_same_named_library_lib1.dart */ methodFromLib1() → dynamic {}
-static method methodFromLib2() → dynamic {
-  self2::methodFromLib1();
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.outline.expect
deleted file mode 100644
index 7239b05..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.outline.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart:10:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib1.dart' as part of 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart' but its 'part of' declaration says 'foo'.
-// Try changing the 'part of' declaration to use a relative file name.
-// part 'part_not_part_of_same_named_library_lib1.dart';
-//      ^
-//
-import self as self;
-
-import "org-dartlang-testcase:///part_not_part_of_same_named_library_lib2.dart";
-
-part part_not_part_of_same_named_library_lib1.dart;
-static method main() → dynamic
-  ;
-
-library foo;
-import self as self2;
-
-part part_not_part_of_same_named_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_not_part_of_same_named_library_lib1.dart */ methodFromLib1() → dynamic
-  ;
-static method methodFromLib2() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.transformed.expect
deleted file mode 100644
index a5b4847..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart.weak.transformed.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart:10:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib1.dart' as part of 'pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library.dart' but its 'part of' declaration says 'foo'.
-// Try changing the 'part of' declaration to use a relative file name.
-// part 'part_not_part_of_same_named_library_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_not_part_of_same_named_library_lib2.dart";
-
-@#C1
-part part_not_part_of_same_named_library_lib1.dart;
-static method main() → dynamic {}
-
-library foo;
-import self as self2;
-
-part part_not_part_of_same_named_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_not_part_of_same_named_library_lib1.dart */ methodFromLib1() → dynamic {}
-static method methodFromLib2() → dynamic {
-  self2::methodFromLib1();
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib1.dart
deleted file mode 100644
index 0fb26aa..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib1.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-part of foo;
-
-methodFromLib1() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib2.dart
deleted file mode 100644
index 6c12333..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_not_part_of_same_named_library_lib2.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-library foo;
-
-part "part_not_part_of_same_named_library_lib1.dart";
-
-methodFromLib2() {
-  methodFromLib1();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart
deleted file mode 100644
index 1e489bd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.6
-
-import 'part_part_of_different_unnamed_library_lib2.dart';
-
-@override
-part 'part_part_of_different_unnamed_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.textual_outline.expect
deleted file mode 100644
index 24b780d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'part_part_of_different_unnamed_library_lib2.dart';
-@override
-part 'part_part_of_different_unnamed_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.textual_outline_modelled.expect
deleted file mode 100644
index 24b780d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import 'part_part_of_different_unnamed_library_lib2.dart';
-@override
-part 'part_part_of_different_unnamed_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.expect
deleted file mode 100644
index 3adf6ff..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart:10:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib1.dart' as part of 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart' but its 'part of' declaration says 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib2.dart'.
-// part 'part_part_of_different_unnamed_library_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_part_of_different_unnamed_library_lib2.dart";
-
-@#C1
-part part_part_of_different_unnamed_library_lib1.dart;
-static method main() → dynamic {}
-
-library;
-import self as self2;
-
-part part_part_of_different_unnamed_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_part_of_different_unnamed_library_lib1.dart */ methodFromLib1() → dynamic {}
-static method methodFromLib2() → dynamic {
-  self2::methodFromLib1();
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.outline.expect
deleted file mode 100644
index c0bec63..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart:10:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib1.dart' as part of 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart' but its 'part of' declaration says 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib2.dart'.
-// part 'part_part_of_different_unnamed_library_lib1.dart';
-//      ^
-//
-import self as self;
-
-import "org-dartlang-testcase:///part_part_of_different_unnamed_library_lib2.dart";
-
-part part_part_of_different_unnamed_library_lib1.dart;
-static method main() → dynamic
-  ;
-
-library;
-import self as self2;
-
-part part_part_of_different_unnamed_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_part_of_different_unnamed_library_lib1.dart */ methodFromLib1() → dynamic
-  ;
-static method methodFromLib2() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.transformed.expect
deleted file mode 100644
index 3adf6ff..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart.weak.transformed.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart:10:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib1.dart' as part of 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library.dart' but its 'part of' declaration says 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib2.dart'.
-// part 'part_part_of_different_unnamed_library_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_part_of_different_unnamed_library_lib2.dart";
-
-@#C1
-part part_part_of_different_unnamed_library_lib1.dart;
-static method main() → dynamic {}
-
-library;
-import self as self2;
-
-part part_part_of_different_unnamed_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_part_of_different_unnamed_library_lib1.dart */ methodFromLib1() → dynamic {}
-static method methodFromLib2() → dynamic {
-  self2::methodFromLib1();
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib1.dart
deleted file mode 100644
index f766e4d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib1.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-part of "part_part_of_different_unnamed_library_lib2.dart";
-
-methodFromLib1() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib2.dart
deleted file mode 100644
index 9e3868f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_different_unnamed_library_lib2.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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.6
-
-part "part_part_of_different_unnamed_library_lib1.dart";
-
-methodFromLib2() {
-  methodFromLib1();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart
deleted file mode 100644
index 820c2ac..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-library foo;
-
-import 'part_part_of_differently_named_library_lib2.dart';
-
-@override
-part 'part_part_of_differently_named_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.textual_outline.expect
deleted file mode 100644
index ea5cdd5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-library foo;
-
-import 'part_part_of_differently_named_library_lib2.dart';
-@override
-part 'part_part_of_differently_named_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.textual_outline_modelled.expect
deleted file mode 100644
index ea5cdd5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-library foo;
-
-import 'part_part_of_differently_named_library_lib2.dart';
-@override
-part 'part_part_of_differently_named_library_lib1.dart';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.expect
deleted file mode 100644
index 9dadde6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library foo;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart:12:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib1.dart' as part of 'foo' but its 'part of' declaration says 'bar'.
-// part 'part_part_of_differently_named_library_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_part_of_differently_named_library_lib2.dart";
-
-@#C1
-part part_part_of_differently_named_library_lib1.dart;
-static method main() → dynamic {}
-
-library bar;
-import self as self2;
-
-part part_part_of_differently_named_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_part_of_differently_named_library_lib1.dart */ methodFromLib1() → dynamic {}
-static method methodFromLib2() → dynamic {
-  self2::methodFromLib1();
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.outline.expect
deleted file mode 100644
index 6c74ea8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library foo;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart:12:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib1.dart' as part of 'foo' but its 'part of' declaration says 'bar'.
-// part 'part_part_of_differently_named_library_lib1.dart';
-//      ^
-//
-import self as self;
-
-import "org-dartlang-testcase:///part_part_of_differently_named_library_lib2.dart";
-
-part part_part_of_differently_named_library_lib1.dart;
-static method main() → dynamic
-  ;
-
-library bar;
-import self as self2;
-
-part part_part_of_differently_named_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_part_of_differently_named_library_lib1.dart */ methodFromLib1() → dynamic
-  ;
-static method methodFromLib2() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.transformed.expect
deleted file mode 100644
index 9dadde6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart.weak.transformed.expect
+++ /dev/null
@@ -1,29 +0,0 @@
-library foo;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library.dart:12:6: Error: Using 'pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib1.dart' as part of 'foo' but its 'part of' declaration says 'bar'.
-// part 'part_part_of_differently_named_library_lib1.dart';
-//      ^
-//
-import self as self;
-import "dart:core" as core;
-
-import "org-dartlang-testcase:///part_part_of_differently_named_library_lib2.dart";
-
-@#C1
-part part_part_of_differently_named_library_lib1.dart;
-static method main() → dynamic {}
-
-library bar;
-import self as self2;
-
-part part_part_of_differently_named_library_lib1.dart;
-static method /* from org-dartlang-testcase:///part_part_of_differently_named_library_lib1.dart */ methodFromLib1() → dynamic {}
-static method methodFromLib2() → dynamic {
-  self2::methodFromLib1();
-}
-
-constants  {
-  #C1 = core::_Override {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib1.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib1.dart
deleted file mode 100644
index 3d0c7e8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib1.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// 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.6
-
-part of bar;
-
-methodFromLib1() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib2.dart b/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib2.dart
deleted file mode 100644
index 91bfb7d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/part_part_of_differently_named_library_lib2.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-library bar;
-
-part "part_part_of_differently_named_library_lib1.dart";
-
-methodFromLib2() {
-  methodFromLib1();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart b/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart
deleted file mode 100644
index c2f374e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.textual_outline.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.textual_outline.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.textual_outline_modelled.expect
deleted file mode 100644
index 506b9c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,2 +0,0 @@
-// @dart = 2.6
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.expect
deleted file mode 100644
index bef6d48..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.outline.expect
deleted file mode 100644
index 6a28c0d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.transformed.expect
deleted file mode 100644
index bef6d48..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/platform.dart.weak.transformed.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart b/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart
deleted file mode 100644
index 007bd17..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {}
-
-class B {}
-
-class AB1 extends A implements B {}
-
-class AB2 extends A implements B {}
-
-class BA1 extends B implements A {}
-
-class BA2 extends B implements A {}
-
-takeSubclassOfA(obj) {
-  // The analysis should at least infer that 'obj' is a subclass of A,
-  // When the upper bound is ambiguous, it should use the common superclass, if
-  // there is one besides Object.
-}
-
-takeSubclassOfB(obj) {
-  // Likewise, the analysis should infer that 'obj' is a subclass of B.
-}
-
-main() {
-  takeSubclassOfA(new AB1());
-  takeSubclassOfA(new AB2());
-
-  takeSubclassOfB(new BA1());
-  takeSubclassOfB(new BA2());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.textual_outline.expect
deleted file mode 100644
index f124a27..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B {}
-
-class AB1 extends A implements B {}
-
-class AB2 extends A implements B {}
-
-class BA1 extends B implements A {}
-
-class BA2 extends B implements A {}
-
-takeSubclassOfA(obj) {}
-takeSubclassOfB(obj) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.textual_outline_modelled.expect
deleted file mode 100644
index 615035f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class AB1 extends A implements B {}
-
-class AB2 extends A implements B {}
-
-class B {}
-
-class BA1 extends B implements A {}
-
-class BA2 extends B implements A {}
-
-main() {}
-takeSubclassOfA(obj) {}
-takeSubclassOfB(obj) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.expect
deleted file mode 100644
index 8785424..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.expect
+++ /dev/null
@@ -1,62 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AB1 extends self::A implements self::B {
-  synthetic constructor •() → self::AB1*
-    : super self::A::•()
-    ;
-}
-class AB2 extends self::A implements self::B {
-  synthetic constructor •() → self::AB2*
-    : super self::A::•()
-    ;
-}
-class BA1 extends self::B implements self::A {
-  synthetic constructor •() → self::BA1*
-    : super self::B::•()
-    ;
-}
-class BA2 extends self::B implements self::A {
-  synthetic constructor •() → self::BA2*
-    : super self::B::•()
-    ;
-}
-static method takeSubclassOfA(dynamic obj) → dynamic {}
-static method takeSubclassOfB(dynamic obj) → dynamic {}
-static method main() → dynamic {
-  self::takeSubclassOfA(new self::AB1::•());
-  self::takeSubclassOfA(new self::AB2::•());
-  self::takeSubclassOfB(new self::BA1::•());
-  self::takeSubclassOfB(new self::BA2::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.outline.expect
deleted file mode 100644
index 1d5764a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.outline.expect
+++ /dev/null
@@ -1,54 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AB1 extends self::A implements self::B {
-  synthetic constructor •() → self::AB1*
-    ;
-}
-class AB2 extends self::A implements self::B {
-  synthetic constructor •() → self::AB2*
-    ;
-}
-class BA1 extends self::B implements self::A {
-  synthetic constructor •() → self::BA1*
-    ;
-}
-class BA2 extends self::B implements self::A {
-  synthetic constructor •() → self::BA2*
-    ;
-}
-static method takeSubclassOfA(dynamic obj) → dynamic
-  ;
-static method takeSubclassOfB(dynamic obj) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.transformed.expect
deleted file mode 100644
index 8785424..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/prefer_baseclass.dart.weak.transformed.expect
+++ /dev/null
@@ -1,62 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class AB1 extends self::A implements self::B {
-  synthetic constructor •() → self::AB1*
-    : super self::A::•()
-    ;
-}
-class AB2 extends self::A implements self::B {
-  synthetic constructor •() → self::AB2*
-    : super self::A::•()
-    ;
-}
-class BA1 extends self::B implements self::A {
-  synthetic constructor •() → self::BA1*
-    : super self::B::•()
-    ;
-}
-class BA2 extends self::B implements self::A {
-  synthetic constructor •() → self::BA2*
-    : super self::B::•()
-    ;
-}
-static method takeSubclassOfA(dynamic obj) → dynamic {}
-static method takeSubclassOfB(dynamic obj) → dynamic {}
-static method main() → dynamic {
-  self::takeSubclassOfA(new self::AB1::•());
-  self::takeSubclassOfA(new self::AB2::•());
-  self::takeSubclassOfB(new self::BA1::•());
-  self::takeSubclassOfB(new self::BA2::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart b/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart
deleted file mode 100644
index 96e9ad9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import './private_method_tearoff_lib.dart';
-
-// `Bar' contains a private method `_f'. The function `baz' is declared in the
-// same library as `Bar' and attempts to invoke `_f`. The generated Kernel code
-// for `Foo' should contain a no such method forwarder for `_f'.
-
-class Foo implements Bar {}
-
-class Baz extends Foo {}
-
-main() {
-  baz(new Foo());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.textual_outline.expect
deleted file mode 100644
index d709d38..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-import './private_method_tearoff_lib.dart';
-
-class Foo implements Bar {}
-
-class Baz extends Foo {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.textual_outline_modelled.expect
deleted file mode 100644
index 5d346af..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-import './private_method_tearoff_lib.dart';
-
-class Baz extends Foo {}
-
-class Foo implements Bar {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.expect
deleted file mode 100644
index a2148b7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "private_method_tearoff_lib.dart" as pri;
-
-import "org-dartlang-testcase:///private_method_tearoff_lib.dart";
-
-class Foo extends core::Object implements pri::Bar {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder method /* from org-dartlang-testcase:///private_method_tearoff_lib.dart */ _f() → void
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-}
-class Baz extends self::Foo {
-  synthetic constructor •() → self::Baz*
-    : super self::Foo::•()
-    ;
-}
-static method main() → dynamic {
-  pri::baz(new self::Foo::•());
-}
-
-library;
-import self as pri;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  synthetic constructor •() → pri::Bar*
-    : super core::Object::•()
-    ;
-  method _f() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(pri::Bar* bar) → void {
-  core::print("${bar.{pri::Bar::_f}.{core::Object::runtimeType}}");
-}
-
-constants  {
-  #C1 = #org-dartlang-testcase:///private_method_tearoff.dart::_f
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.outline.expect
deleted file mode 100644
index 7580549..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.outline.expect
+++ /dev/null
@@ -1,60 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "private_method_tearoff_lib.dart" as pri;
-
-import "org-dartlang-testcase:///private_method_tearoff_lib.dart";
-
-class Foo extends core::Object implements pri::Bar {
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder method /* from org-dartlang-testcase:///private_method_tearoff_lib.dart */ _f() → void
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#_f, 0, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{})));
-}
-class Baz extends self::Foo {
-  synthetic constructor •() → self::Baz*
-    ;
-}
-static method main() → dynamic
-  ;
-
-library;
-import self as pri;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  synthetic constructor •() → pri::Bar*
-    ;
-  method _f() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(pri::Bar* bar) → void
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///private_method_tearoff_lib.dart:10:8 -> SymbolConstant(#_f)
-Evaluated: ListLiteral @ org-dartlang-testcase:///private_method_tearoff_lib.dart:10:8 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///private_method_tearoff_lib.dart:10:8 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///private_method_tearoff_lib.dart:10:8 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Extra constant evaluation: evaluated: 8, effectively constant: 4
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.transformed.expect
deleted file mode 100644
index a2148b7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff.dart.weak.transformed.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "private_method_tearoff_lib.dart" as pri;
-
-import "org-dartlang-testcase:///private_method_tearoff_lib.dart";
-
-class Foo extends core::Object implements pri::Bar {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder method /* from org-dartlang-testcase:///private_method_tearoff_lib.dart */ _f() → void
-    return this.{self::Foo::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4)));
-}
-class Baz extends self::Foo {
-  synthetic constructor •() → self::Baz*
-    : super self::Foo::•()
-    ;
-}
-static method main() → dynamic {
-  pri::baz(new self::Foo::•());
-}
-
-library;
-import self as pri;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  synthetic constructor •() → pri::Bar*
-    : super core::Object::•()
-    ;
-  method _f() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(pri::Bar* bar) → void {
-  core::print("${bar.{pri::Bar::_f}.{core::Object::runtimeType}}");
-}
-
-constants  {
-  #C1 = #org-dartlang-testcase:///private_method_tearoff.dart::_f
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff_lib.dart
deleted file mode 100644
index ef2c965..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/private_method_tearoff_lib.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// Companion library for private_method_tearoff.dart.
-
-class Bar {
-  void _f() {}
-}
-
-void baz(Bar bar) {
-  print("${bar._f.runtimeType}");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart b/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart
deleted file mode 100644
index a133572..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart
+++ /dev/null
@@ -1,24 +0,0 @@
-// 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.6
-
-class Class<T> {
-  method(T o) {
-    if (o is Class) {
-      o.method(null);
-    }
-  }
-}
-
-method<T>(T o) {
-  if (o is Class) {
-    o.method(null);
-  }
-}
-
-main() {
-  new Class().method(new Class());
-  method(new Class());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.textual_outline.expect
deleted file mode 100644
index 4e30433..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class Class<T> {
-  method(T o) {}
-}
-
-method<T>(T o) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6e6741a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class Class<T> {
-  method(T o) {}
-}
-
-main() {}
-method<T>(T o) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.expect
deleted file mode 100644
index 6999b2b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Class<self::Class::T*>*
-    : super core::Object::•()
-    ;
-  method method(generic-covariant-impl self::Class::T* o) → dynamic {
-    if(o is self::Class<dynamic>*) {
-      o{self::Class::T* & self::Class<dynamic>* /* '*' & '*' = '*' */}.{self::Class::method}(null);
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method method<T extends core::Object* = dynamic>(self::method::T* o) → dynamic {
-  if(o is self::Class<dynamic>*) {
-    o{self::method::T* & self::Class<dynamic>* /* '*' & '*' = '*' */}.{self::Class::method}(null);
-  }
-}
-static method main() → dynamic {
-  new self::Class::•<dynamic>().{self::Class::method}(new self::Class::•<dynamic>());
-  self::method<self::Class<dynamic>*>(new self::Class::•<dynamic>());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.outline.expect
deleted file mode 100644
index 0b52249..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Class<self::Class::T*>*
-    ;
-  method method(generic-covariant-impl self::Class::T* o) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method method<T extends core::Object* = dynamic>(self::method::T* o) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.transformed.expect
deleted file mode 100644
index 6999b2b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/promoted_access.dart.weak.transformed.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Class<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Class<self::Class::T*>*
-    : super core::Object::•()
-    ;
-  method method(generic-covariant-impl self::Class::T* o) → dynamic {
-    if(o is self::Class<dynamic>*) {
-      o{self::Class::T* & self::Class<dynamic>* /* '*' & '*' = '*' */}.{self::Class::method}(null);
-    }
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method method<T extends core::Object* = dynamic>(self::method::T* o) → dynamic {
-  if(o is self::Class<dynamic>*) {
-    o{self::method::T* & self::Class<dynamic>* /* '*' & '*' = '*' */}.{self::Class::method}(null);
-  }
-}
-static method main() → dynamic {
-  new self::Class::•<dynamic>().{self::Class::method}(new self::Class::•<dynamic>());
-  self::method<self::Class<dynamic>*>(new self::Class::•<dynamic>());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart b/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart
deleted file mode 100644
index 53b8a950..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-import './public_method_tearoff_lib.dart';
-
-// `Bar' contains a public method `f'. The function `baz' is declared in the
-// same library as `Bar' and attempts to invoke `f`. The generated Kernel code
-// for `Foo' should _not_ contain a no such method forwarder for `f'.
-
-class Foo extends Bar {}
-
-void main() {
-  baz(new Foo());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.textual_outline.expect
deleted file mode 100644
index c43b7fd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.textual_outline.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import './public_method_tearoff_lib.dart';
-
-class Foo extends Bar {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.textual_outline_modelled.expect
deleted file mode 100644
index c43b7fd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,6 +0,0 @@
-// @dart = 2.6
-import './public_method_tearoff_lib.dart';
-
-class Foo extends Bar {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.expect
deleted file mode 100644
index 370b63e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-import self as self;
-import "public_method_tearoff_lib.dart" as pub;
-
-import "org-dartlang-testcase:///public_method_tearoff_lib.dart";
-
-class Foo extends pub::Bar {
-  synthetic constructor •() → self::Foo*
-    : super pub::Bar::•()
-    ;
-}
-static method main() → void {
-  pub::baz(new self::Foo::•());
-}
-
-library;
-import self as pub;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  synthetic constructor •() → pub::Bar*
-    : super core::Object::•()
-    ;
-  method f() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(pub::Bar* bar) → void {
-  core::print("${bar.{pub::Bar::f}.{core::Object::runtimeType}}");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.outline.expect
deleted file mode 100644
index db658c6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.outline.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-library;
-import self as self;
-import "public_method_tearoff_lib.dart" as pub;
-
-import "org-dartlang-testcase:///public_method_tearoff_lib.dart";
-
-class Foo extends pub::Bar {
-  synthetic constructor •() → self::Foo*
-    ;
-}
-static method main() → void
-  ;
-
-library;
-import self as pub;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  synthetic constructor •() → pub::Bar*
-    ;
-  method f() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(pub::Bar* bar) → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.transformed.expect
deleted file mode 100644
index 370b63e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff.dart.weak.transformed.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-import self as self;
-import "public_method_tearoff_lib.dart" as pub;
-
-import "org-dartlang-testcase:///public_method_tearoff_lib.dart";
-
-class Foo extends pub::Bar {
-  synthetic constructor •() → self::Foo*
-    : super pub::Bar::•()
-    ;
-}
-static method main() → void {
-  pub::baz(new self::Foo::•());
-}
-
-library;
-import self as pub;
-import "dart:core" as core;
-
-class Bar extends core::Object {
-  synthetic constructor •() → pub::Bar*
-    : super core::Object::•()
-    ;
-  method f() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method baz(pub::Bar* bar) → void {
-  core::print("${bar.{pub::Bar::f}.{core::Object::runtimeType}}");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff_lib.dart
deleted file mode 100644
index 0f9c446..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/public_method_tearoff_lib.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// Companion library for public_method_tearoff.dart.
-
-class Bar {
-  void f() {}
-}
-
-void baz(Bar bar) {
-  print("${bar.f.runtimeType}");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart b/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart
deleted file mode 100644
index 2f7a38f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-library test.qualified.main;
-
-import "qualified_lib.dart" as lib;
-
-part "qualified_part.dart";
-
-class Bad extends lib.Missing {
-  lib.Missing method() {}
-  factory WrongName() {}
-}
-
-class WithMixin extends lib.Supertype with lib.Mixin {}
-
-class IllegalSupertype extends lib.VoidFunction {}
-
-main() {
-  new C<String>();
-  new C<String>.a();
-  new C<String>.b();
-  new lib.C<String>();
-  new lib.C<String>.a();
-  new lib.C<String>.b();
-  new WithMixin().supertypeMethod();
-  new WithMixin().foo();
-  new IllegalSupertype();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.textual_outline.expect
deleted file mode 100644
index 437d273..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.textual_outline.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-library test.qualified.main;
-
-import "qualified_lib.dart" as lib;
-part "qualified_part.dart";
-
-class Bad extends lib.Missing {
-  lib.Missing method() {}
-  factory WrongName() {}
-}
-
-class WithMixin extends lib.Supertype with lib.Mixin {}
-
-class IllegalSupertype extends lib.VoidFunction {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.textual_outline_modelled.expect
deleted file mode 100644
index 4102d33..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-// @dart = 2.6
-library test.qualified.main;
-
-import "qualified_lib.dart" as lib;
-part "qualified_part.dart";
-
-class Bad extends lib.Missing {
-  factory WrongName() {}
-  lib.Missing method() {}
-}
-
-class IllegalSupertype extends lib.VoidFunction {}
-
-class WithMixin extends lib.Supertype with lib.Mixin {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.expect
deleted file mode 100644
index ec198b7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.expect
+++ /dev/null
@@ -1,162 +0,0 @@
-library test.qualified.main;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:15:11: Error: The name of a constructor must match the name of the enclosing class.
-//   factory WrongName() {}
-//           ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:13:7: Context: The name of the enclosing class is 'Bad'.
-// class Bad extends lib.Missing {
-//       ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:13:19: Error: Type 'lib.Missing' not found.
-// class Bad extends lib.Missing {
-//                   ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:14:3: Error: Type 'lib.Missing' not found.
-//   lib.Missing method() {}
-//   ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:20:7: Error: The type 'lib.VoidFunction' can't be used as supertype.
-// class IllegalSupertype extends lib.VoidFunction {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified_lib.dart:29:9: Context: The issue arises via this type alias.
-// typedef VoidFunction = void Function();
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-import "qualified_lib.dart" as lib;
-
-import "org-dartlang-testcase:///qualified_lib.dart" as lib;
-
-part qualified_part.dart;
-class Bad extends core::Object {
-  method method() → invalid-type {}
-  static factory WrongName() → self::Bad* {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _WithMixin&Supertype&Mixin = lib::Supertype with lib::Mixin /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_WithMixin&Supertype&Mixin*
-    : super lib::Supertype::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{lib::Mixin::foo}();
-}
-class WithMixin extends self::_WithMixin&Supertype&Mixin {
-  synthetic constructor •() → self::WithMixin*
-    : super self::_WithMixin&Supertype&Mixin::•()
-    ;
-}
-class IllegalSupertype extends core::Object {
-  synthetic constructor •() → self::IllegalSupertype*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object { // from org-dartlang-testcase:///qualified_part.dart
-  static final field dynamic _redirecting# = <dynamic>[self::C::b];
-  constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  constructor a() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  static factory b<T extends core::Object* = dynamic>() → self::C<self::C::b::T*>*
-    let dynamic #redirecting_factory = lib::C::b in let self::C::b::T* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::C::•<core::String*>();
-  new self::C::a<core::String*>();
-  new lib::C::a<core::String*>();
-  new lib::C::•<core::String*>();
-  new lib::C::a<core::String*>();
-  new lib::C::a<core::String*>();
-  new self::WithMixin::•().{lib::Supertype::supertypeMethod}();
-  new self::WithMixin::•().{self::_WithMixin&Supertype&Mixin::foo}();
-  new self::IllegalSupertype::•();
-}
-
-library test.qualified.lib;
-import self as lib;
-import "dart:core" as core;
-import "qualified.dart" as self;
-
-import "org-dartlang-testcase:///qualified.dart" as main;
-
-typedef VoidFunction = () →* void;
-class C<T extends core::Object* = dynamic> extends self::C<lib::C::T*> {
-  static final field dynamic _redirecting# = <dynamic>[lib::C::b];
-  constructor •() → lib::C<lib::C::T*>*
-    : super self::C::•()
-    ;
-  constructor a() → lib::C<lib::C::T*>*
-    : super self::C::•()
-    ;
-  static factory b<T extends core::Object* = dynamic>() → lib::C<lib::C::b::T*>*
-    let dynamic #redirecting_factory = lib::C::a in let lib::C::b::T* #typeArg0 = null in invalid-expression;
-}
-class Supertype extends core::Object {
-  synthetic constructor •() → lib::Supertype*
-    : super core::Object::•()
-    ;
-  method supertypeMethod() → dynamic {
-    core::print("I'm supertypeMethod form lib.Supertype");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Mixin extends core::Object {
-  synthetic constructor •() → lib::Mixin*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic {
-    core::print("I'm Mixin.foo");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.outline.expect
deleted file mode 100644
index 3bf6dad..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.outline.expect
+++ /dev/null
@@ -1,145 +0,0 @@
-library test.qualified.main;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:15:11: Error: The name of a constructor must match the name of the enclosing class.
-//   factory WrongName() {}
-//           ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:13:7: Context: The name of the enclosing class is 'Bad'.
-// class Bad extends lib.Missing {
-//       ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:13:19: Error: Type 'lib.Missing' not found.
-// class Bad extends lib.Missing {
-//                   ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:14:3: Error: Type 'lib.Missing' not found.
-//   lib.Missing method() {}
-//   ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:20:7: Error: The type 'lib.VoidFunction' can't be used as supertype.
-// class IllegalSupertype extends lib.VoidFunction {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified_lib.dart:29:9: Context: The issue arises via this type alias.
-// typedef VoidFunction = void Function();
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-import "qualified_lib.dart" as lib;
-
-import "org-dartlang-testcase:///qualified_lib.dart" as lib;
-
-part qualified_part.dart;
-class Bad extends core::Object {
-  method method() → invalid-type
-    ;
-  static factory WrongName() → self::Bad*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _WithMixin&Supertype&Mixin = lib::Supertype with lib::Mixin /*isAnonymousMixin*/  {
-  synthetic constructor •() → self::_WithMixin&Supertype&Mixin*
-    : super lib::Supertype::•()
-    ;
-  mixin-super-stub method foo() → dynamic
-    return super.{lib::Mixin::foo}();
-}
-class WithMixin extends self::_WithMixin&Supertype&Mixin {
-  synthetic constructor •() → self::WithMixin*
-    ;
-}
-class IllegalSupertype extends core::Object {
-  synthetic constructor •() → self::IllegalSupertype*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object { // from org-dartlang-testcase:///qualified_part.dart
-  static final field dynamic _redirecting# = <dynamic>[self::C::b];
-  constructor •() → self::C<self::C::T*>*
-    ;
-  constructor a() → self::C<self::C::T*>*
-    ;
-  static factory b<T extends core::Object* = dynamic>() → self::C<self::C::b::T*>*
-    let dynamic #redirecting_factory = lib::C::b in let self::C::b::T* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
-
-library test.qualified.lib;
-import self as lib;
-import "dart:core" as core;
-import "qualified.dart" as self;
-
-import "org-dartlang-testcase:///qualified.dart" as main;
-
-typedef VoidFunction = () →* void;
-class C<T extends core::Object* = dynamic> extends self::C<lib::C::T*> {
-  static final field dynamic _redirecting# = <dynamic>[lib::C::b];
-  constructor •() → lib::C<lib::C::T*>*
-    ;
-  constructor a() → lib::C<lib::C::T*>*
-    ;
-  static factory b<T extends core::Object* = dynamic>() → lib::C<lib::C::b::T*>*
-    let dynamic #redirecting_factory = lib::C::a in let lib::C::b::T* #typeArg0 = null in invalid-expression;
-}
-class Supertype extends core::Object {
-  synthetic constructor •() → lib::Supertype*
-    ;
-  method supertypeMethod() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Mixin extends core::Object {
-  synthetic constructor •() → lib::Mixin*
-    ;
-  method foo() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.transformed.expect
deleted file mode 100644
index 9998bef..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart.weak.transformed.expect
+++ /dev/null
@@ -1,173 +0,0 @@
-library test.qualified.main;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:15:11: Error: The name of a constructor must match the name of the enclosing class.
-//   factory WrongName() {}
-//           ^^^^^^^^^
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:13:7: Context: The name of the enclosing class is 'Bad'.
-// class Bad extends lib.Missing {
-//       ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:13:19: Error: Type 'lib.Missing' not found.
-// class Bad extends lib.Missing {
-//                   ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:14:3: Error: Type 'lib.Missing' not found.
-//   lib.Missing method() {}
-//   ^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified.dart:20:7: Error: The type 'lib.VoidFunction' can't be used as supertype.
-// class IllegalSupertype extends lib.VoidFunction {}
-//       ^
-// pkg/front_end/testcases/general_nnbd_opt_out/qualified_lib.dart:29:9: Context: The issue arises via this type alias.
-// typedef VoidFunction = void Function();
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-import "qualified_lib.dart" as lib;
-
-import "org-dartlang-testcase:///qualified_lib.dart" as lib;
-
-part qualified_part.dart;
-class Bad extends core::Object {
-  method method() → invalid-type {}
-  static factory WrongName() → self::Bad* {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class _WithMixin&Supertype&Mixin extends lib::Supertype implements lib::Mixin /*isAnonymousMixin,isEliminatedMixin*/  {
-  synthetic constructor •() → self::_WithMixin&Supertype&Mixin*
-    : super lib::Supertype::•()
-    ;
-  method /* from org-dartlang-testcase:///qualified_lib.dart */ foo() → dynamic {
-    core::print("I'm Mixin.foo");
-  }
-  abstract member-signature get /* from org-dartlang-testcase:///qualified_lib.dart */ _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method /* from org-dartlang-testcase:///qualified_lib.dart */ _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method /* from org-dartlang-testcase:///qualified_lib.dart */ _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method /* from org-dartlang-testcase:///qualified_lib.dart */ _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method /* from org-dartlang-testcase:///qualified_lib.dart */ _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator /* from org-dartlang-testcase:///qualified_lib.dart */ ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get /* from org-dartlang-testcase:///qualified_lib.dart */ hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method /* from org-dartlang-testcase:///qualified_lib.dart */ toString() → core::String*; -> core::Object::toString
-  abstract member-signature method /* from org-dartlang-testcase:///qualified_lib.dart */ noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get /* from org-dartlang-testcase:///qualified_lib.dart */ runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class WithMixin extends self::_WithMixin&Supertype&Mixin {
-  synthetic constructor •() → self::WithMixin*
-    : super self::_WithMixin&Supertype&Mixin::•()
-    ;
-}
-class IllegalSupertype extends core::Object {
-  synthetic constructor •() → self::IllegalSupertype*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object { // from org-dartlang-testcase:///qualified_part.dart
-  static final field dynamic _redirecting# = <dynamic>[self::C::b];
-  constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  constructor a() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  static factory b<T extends core::Object* = dynamic>() → self::C<self::C::b::T*>*
-    let <T extends core::Object* = dynamic>() →* lib::C<T*>* #redirecting_factory = lib::C::b in let self::C::b::T* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::C::•<core::String*>();
-  new self::C::a<core::String*>();
-  new lib::C::a<core::String*>();
-  new lib::C::•<core::String*>();
-  new lib::C::a<core::String*>();
-  new lib::C::a<core::String*>();
-  new self::WithMixin::•().{lib::Supertype::supertypeMethod}();
-  new self::WithMixin::•().{self::_WithMixin&Supertype&Mixin::foo}();
-  new self::IllegalSupertype::•();
-}
-
-library test.qualified.lib;
-import self as lib;
-import "dart:core" as core;
-import "qualified.dart" as self;
-
-import "org-dartlang-testcase:///qualified.dart" as main;
-
-typedef VoidFunction = () →* void;
-class C<T extends core::Object* = dynamic> extends self::C<lib::C::T*> {
-  static final field dynamic _redirecting# = <dynamic>[lib::C::b];
-  constructor •() → lib::C<lib::C::T*>*
-    : super self::C::•()
-    ;
-  constructor a() → lib::C<lib::C::T*>*
-    : super self::C::•()
-    ;
-  static factory b<T extends core::Object* = dynamic>() → lib::C<lib::C::b::T*>*
-    let<BottomType> #redirecting_factory = lib::C::a in let lib::C::b::T* #typeArg0 = null in invalid-expression;
-}
-class Supertype extends core::Object {
-  synthetic constructor •() → lib::Supertype*
-    : super core::Object::•()
-    ;
-  method supertypeMethod() → dynamic {
-    core::print("I'm supertypeMethod form lib.Supertype");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Mixin extends core::Object {
-  synthetic constructor •() → lib::Mixin*
-    : super core::Object::•()
-    ;
-  method foo() → dynamic {
-    core::print("I'm Mixin.foo");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified_lib.dart b/pkg/front_end/testcases/general_nnbd_opt_out/qualified_lib.dart
deleted file mode 100644
index 76d07c3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified_lib.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-library test.qualified.lib;
-
-import "qualified.dart" as main;
-
-class C<T> extends main.C<T> {
-  C();
-  C.a();
-  factory C.b() = C<T>.a;
-}
-
-class Supertype {
-  supertypeMethod() {
-    print("I'm supertypeMethod form lib.Supertype");
-  }
-}
-
-abstract class Mixin {
-  foo() {
-    print("I'm Mixin.foo");
-  }
-}
-
-typedef VoidFunction = void Function();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/qualified_part.dart b/pkg/front_end/testcases/general_nnbd_opt_out/qualified_part.dart
deleted file mode 100644
index 2251abb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/qualified_part.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-part of test.qualified.main;
-
-class C<T> {
-  C();
-  C.a();
-  factory C.b() = lib.C<T>.b;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart
deleted file mode 100644
index b69d6a2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {
-  A();
-  factory A.fisk() = B;
-}
-
-class B extends A {}
-
-main() {
-  new A.fisk();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.textual_outline.expect
deleted file mode 100644
index 470f695..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  A();
-  factory A.fisk() = B;
-}
-
-class B extends A {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.textual_outline_modelled.expect
deleted file mode 100644
index 470f695..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  A();
-  factory A.fisk() = B;
-}
-
-class B extends A {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.expect
deleted file mode 100644
index 7443e13..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::fisk];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory fisk() → self::A*
-    let dynamic #redirecting_factory = self::B::• in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  new self::B::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.outline.expect
deleted file mode 100644
index 6128d70..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::fisk];
-  constructor •() → self::A*
-    ;
-  static factory fisk() → self::A*
-    let dynamic #redirecting_factory = self::B::• in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.transformed.expect
deleted file mode 100644
index 0ed4fed..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_constructor.dart.weak.transformed.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::fisk];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory fisk() → self::A*
-    let<BottomType> #redirecting_factory = self::B::• in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  new self::B::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart
deleted file mode 100644
index 20deced..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-abstract class FooBase<Tf> {
-  int get x;
-  factory FooBase(int x) = Foo<Tf>;
-}
-
-abstract class Foo<T> implements FooBase {
-  factory Foo(int x) = Bar<String, T>;
-}
-
-class Bar<Sb, Tb> implements Foo<Tb> {
-  int x;
-  Bar(this.x) {
-    print('Bar<$Sb,$Tb>');
-  }
-}
-
-class Builder<X> {
-  method() {
-    return new FooBase<X>(4);
-  }
-}
-
-class SimpleCase<A, B> {
-  factory SimpleCase() = SimpleCaseImpl<A, B>;
-}
-
-class SimpleCaseImpl<Ai, Bi> implements SimpleCase<Ai, Bi> {
-  factory SimpleCaseImpl() = SimpleCaseImpl2<Ai, Bi>;
-}
-
-class SimpleCaseImpl2<Ai2, Bi2> implements SimpleCaseImpl<Ai2, Bi2> {}
-
-class Base<M> {}
-
-class Mixin<M> {}
-
-class Mix<M> = Base<M> with Mixin<M>;
-
-main() {
-  print(new FooBase<double>(4).x);
-  new SimpleCase<int, double>();
-  new Mix<double>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.textual_outline.expect
deleted file mode 100644
index 7efd803..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.textual_outline.expect
+++ /dev/null
@@ -1,35 +0,0 @@
-// @dart = 2.6
-abstract class FooBase<Tf> {
-  int get x;
-  factory FooBase(int x) = Foo<Tf>;
-}
-
-abstract class Foo<T> implements FooBase {
-  factory Foo(int x) = Bar<String, T>;
-}
-
-class Bar<Sb, Tb> implements Foo<Tb> {
-  int x;
-  Bar(this.x) {}
-}
-
-class Builder<X> {
-  method() {}
-}
-
-class SimpleCase<A, B> {
-  factory SimpleCase() = SimpleCaseImpl<A, B>;
-}
-
-class SimpleCaseImpl<Ai, Bi> implements SimpleCase<Ai, Bi> {
-  factory SimpleCaseImpl() = SimpleCaseImpl2<Ai, Bi>;
-}
-
-class SimpleCaseImpl2<Ai2, Bi2> implements SimpleCaseImpl<Ai2, Bi2> {}
-
-class Base<M> {}
-
-class Mixin<M> {}
-
-class Mix<M> = Base<M> with Mixin<M>;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.textual_outline_modelled.expect
deleted file mode 100644
index 85db97c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-// @dart = 2.6
-abstract class Foo<T> implements FooBase {
-  factory Foo(int x) = Bar<String, T>;
-}
-
-abstract class FooBase<Tf> {
-  factory FooBase(int x) = Foo<Tf>;
-  int get x;
-}
-
-class Bar<Sb, Tb> implements Foo<Tb> {
-  Bar(this.x) {}
-  int x;
-}
-
-class Base<M> {}
-
-class Builder<X> {
-  method() {}
-}
-
-class Mix<M> = Base<M> with Mixin<M>;
-
-class Mixin<M> {}
-
-class SimpleCase<A, B> {
-  factory SimpleCase() = SimpleCaseImpl<A, B>;
-}
-
-class SimpleCaseImpl<Ai, Bi> implements SimpleCase<Ai, Bi> {
-  factory SimpleCaseImpl() = SimpleCaseImpl2<Ai, Bi>;
-}
-
-class SimpleCaseImpl2<Ai2, Bi2> implements SimpleCaseImpl<Ai2, Bi2> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.expect
deleted file mode 100644
index 7a6504b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.expect
+++ /dev/null
@@ -1,164 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart:9:28: Error: The constructor function type 'Foo<Tf> Function(int)' isn't a subtype of 'FooBase<Tf> Function(int)'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart'.
-//  - 'FooBase' is from 'pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart'.
-//   factory FooBase(int x) = Foo<Tf>;
-//                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class FooBase<Tf extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::FooBase::•];
-  abstract get x() → core::int*;
-  static factory •<Tf extends core::Object* = dynamic>(core::int* x) → self::FooBase<self::FooBase::•::Tf*>*
-    let dynamic #redirecting_factory = self::Foo::• in let self::FooBase::•::Tf* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Foo<T extends core::Object* = dynamic> extends core::Object implements self::FooBase<dynamic> {
-  static final field dynamic _redirecting# = <dynamic>[self::Foo::•];
-  static factory •<T extends core::Object* = dynamic>(core::int* x) → self::Foo<self::Foo::•::T*>*
-    let dynamic #redirecting_factory = self::Bar::• in let core::String* #typeArg0 = null in let self::Foo::•::T* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar<Sb extends core::Object* = dynamic, Tb extends core::Object* = dynamic> extends core::Object implements self::Foo<self::Bar::Tb*> {
-  field core::int* x;
-  constructor •(core::int* x) → self::Bar<self::Bar::Sb*, self::Bar::Tb*>*
-    : self::Bar::x = x, super core::Object::•() {
-    core::print("Bar<${self::Bar::Sb*},${self::Bar::Tb*}>");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Builder<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Builder<self::Builder::X*>*
-    : super core::Object::•()
-    ;
-  method method() → dynamic {
-    return new self::Bar::•<core::String*, self::Builder::X*>(4);
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCase<A extends core::Object* = dynamic, B extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::SimpleCase::•];
-  static factory •<A extends core::Object* = dynamic, B extends core::Object* = dynamic>() → self::SimpleCase<self::SimpleCase::•::A*, self::SimpleCase::•::B*>*
-    let dynamic #redirecting_factory = self::SimpleCaseImpl::• in let self::SimpleCase::•::A* #typeArg0 = null in let self::SimpleCase::•::B* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCaseImpl<Ai extends core::Object* = dynamic, Bi extends core::Object* = dynamic> extends core::Object implements self::SimpleCase<self::SimpleCaseImpl::Ai*, self::SimpleCaseImpl::Bi*> {
-  static final field dynamic _redirecting# = <dynamic>[self::SimpleCaseImpl::•];
-  static factory •<Ai extends core::Object* = dynamic, Bi extends core::Object* = dynamic>() → self::SimpleCaseImpl<self::SimpleCaseImpl::•::Ai*, self::SimpleCaseImpl::•::Bi*>*
-    let dynamic #redirecting_factory = self::SimpleCaseImpl2::• in let self::SimpleCaseImpl::•::Ai* #typeArg0 = null in let self::SimpleCaseImpl::•::Bi* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCaseImpl2<Ai2 extends core::Object* = dynamic, Bi2 extends core::Object* = dynamic> extends core::Object implements self::SimpleCaseImpl<self::SimpleCaseImpl2::Ai2*, self::SimpleCaseImpl2::Bi2*> {
-  synthetic constructor •() → self::SimpleCaseImpl2<self::SimpleCaseImpl2::Ai2*, self::SimpleCaseImpl2::Bi2*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Base<M extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Base<self::Base::M*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Mixin<M extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Mixin<self::Mixin::M*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Mix<M extends core::Object* = dynamic> = self::Base<self::Mix::M*> with self::Mixin<self::Mix::M*> {
-  synthetic constructor •() → self::Mix<self::Mix::M*>*
-    : super self::Base::•()
-    ;
-}
-static method main() → dynamic {
-  core::print(new self::Bar::•<core::String*, core::double*>(4).{self::FooBase::x});
-  new self::SimpleCaseImpl2::•<core::int*, core::double*>();
-  new self::Mix::•<core::double*>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.outline.expect
deleted file mode 100644
index b991362..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.outline.expect
+++ /dev/null
@@ -1,154 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart:9:28: Error: The constructor function type 'Foo<Tf> Function(int)' isn't a subtype of 'FooBase<Tf> Function(int)'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart'.
-//  - 'FooBase' is from 'pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart'.
-//   factory FooBase(int x) = Foo<Tf>;
-//                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class FooBase<Tf extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::FooBase::•];
-  abstract get x() → core::int*;
-  static factory •<Tf extends core::Object* = dynamic>(core::int* x) → self::FooBase<self::FooBase::•::Tf*>*
-    let dynamic #redirecting_factory = self::Foo::• in let self::FooBase::•::Tf* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Foo<T extends core::Object* = dynamic> extends core::Object implements self::FooBase<dynamic> {
-  static final field dynamic _redirecting# = <dynamic>[self::Foo::•];
-  static factory •<T extends core::Object* = dynamic>(core::int* x) → self::Foo<self::Foo::•::T*>*
-    let dynamic #redirecting_factory = self::Bar::• in let core::String* #typeArg0 = null in let self::Foo::•::T* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar<Sb extends core::Object* = dynamic, Tb extends core::Object* = dynamic> extends core::Object implements self::Foo<self::Bar::Tb*> {
-  field core::int* x;
-  constructor •(core::int* x) → self::Bar<self::Bar::Sb*, self::Bar::Tb*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Builder<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Builder<self::Builder::X*>*
-    ;
-  method method() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCase<A extends core::Object* = dynamic, B extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::SimpleCase::•];
-  static factory •<A extends core::Object* = dynamic, B extends core::Object* = dynamic>() → self::SimpleCase<self::SimpleCase::•::A*, self::SimpleCase::•::B*>*
-    let dynamic #redirecting_factory = self::SimpleCaseImpl::• in let self::SimpleCase::•::A* #typeArg0 = null in let self::SimpleCase::•::B* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCaseImpl<Ai extends core::Object* = dynamic, Bi extends core::Object* = dynamic> extends core::Object implements self::SimpleCase<self::SimpleCaseImpl::Ai*, self::SimpleCaseImpl::Bi*> {
-  static final field dynamic _redirecting# = <dynamic>[self::SimpleCaseImpl::•];
-  static factory •<Ai extends core::Object* = dynamic, Bi extends core::Object* = dynamic>() → self::SimpleCaseImpl<self::SimpleCaseImpl::•::Ai*, self::SimpleCaseImpl::•::Bi*>*
-    let dynamic #redirecting_factory = self::SimpleCaseImpl2::• in let self::SimpleCaseImpl::•::Ai* #typeArg0 = null in let self::SimpleCaseImpl::•::Bi* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCaseImpl2<Ai2 extends core::Object* = dynamic, Bi2 extends core::Object* = dynamic> extends core::Object implements self::SimpleCaseImpl<self::SimpleCaseImpl2::Ai2*, self::SimpleCaseImpl2::Bi2*> {
-  synthetic constructor •() → self::SimpleCaseImpl2<self::SimpleCaseImpl2::Ai2*, self::SimpleCaseImpl2::Bi2*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Base<M extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Base<self::Base::M*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Mixin<M extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Mixin<self::Mixin::M*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Mix<M extends core::Object* = dynamic> = self::Base<self::Mix::M*> with self::Mixin<self::Mix::M*> {
-  synthetic constructor •() → self::Mix<self::Mix::M*>*
-    : super self::Base::•()
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.transformed.expect
deleted file mode 100644
index a63abfb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart.weak.transformed.expect
+++ /dev/null
@@ -1,174 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart:9:28: Error: The constructor function type 'Foo<Tf> Function(int)' isn't a subtype of 'FooBase<Tf> Function(int)'.
-//  - 'Foo' is from 'pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart'.
-//  - 'FooBase' is from 'pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory.dart'.
-//   factory FooBase(int x) = Foo<Tf>;
-//                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class FooBase<Tf extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::FooBase::•];
-  abstract get x() → core::int*;
-  static factory •<Tf extends core::Object* = dynamic>(core::int* x) → self::FooBase<self::FooBase::•::Tf*>*
-    let <T extends core::Object* = dynamic>(core::int*) →* self::Foo<T*>* #redirecting_factory = self::Foo::• in let self::FooBase::•::Tf* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class Foo<T extends core::Object* = dynamic> extends core::Object implements self::FooBase<dynamic> {
-  static final field dynamic _redirecting# = <dynamic>[self::Foo::•];
-  static factory •<T extends core::Object* = dynamic>(core::int* x) → self::Foo<self::Foo::•::T*>*
-    let<BottomType> #redirecting_factory = self::Bar::• in let core::String* #typeArg0 = null in let self::Foo::•::T* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar<Sb extends core::Object* = dynamic, Tb extends core::Object* = dynamic> extends core::Object implements self::Foo<self::Bar::Tb*> {
-  field core::int* x;
-  constructor •(core::int* x) → self::Bar<self::Bar::Sb*, self::Bar::Tb*>*
-    : self::Bar::x = x, super core::Object::•() {
-    core::print("Bar<${self::Bar::Sb*},${self::Bar::Tb*}>");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Builder<X extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Builder<self::Builder::X*>*
-    : super core::Object::•()
-    ;
-  method method() → dynamic {
-    return new self::Bar::•<core::String*, self::Builder::X*>(4);
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCase<A extends core::Object* = dynamic, B extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::SimpleCase::•];
-  static factory •<A extends core::Object* = dynamic, B extends core::Object* = dynamic>() → self::SimpleCase<self::SimpleCase::•::A*, self::SimpleCase::•::B*>*
-    let <Ai extends core::Object* = dynamic, Bi extends core::Object* = dynamic>() →* self::SimpleCaseImpl<Ai*, Bi*>* #redirecting_factory = self::SimpleCaseImpl::• in let self::SimpleCase::•::A* #typeArg0 = null in let self::SimpleCase::•::B* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCaseImpl<Ai extends core::Object* = dynamic, Bi extends core::Object* = dynamic> extends core::Object implements self::SimpleCase<self::SimpleCaseImpl::Ai*, self::SimpleCaseImpl::Bi*> {
-  static final field dynamic _redirecting# = <dynamic>[self::SimpleCaseImpl::•];
-  static factory •<Ai extends core::Object* = dynamic, Bi extends core::Object* = dynamic>() → self::SimpleCaseImpl<self::SimpleCaseImpl::•::Ai*, self::SimpleCaseImpl::•::Bi*>*
-    let<BottomType> #redirecting_factory = self::SimpleCaseImpl2::• in let self::SimpleCaseImpl::•::Ai* #typeArg0 = null in let self::SimpleCaseImpl::•::Bi* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class SimpleCaseImpl2<Ai2 extends core::Object* = dynamic, Bi2 extends core::Object* = dynamic> extends core::Object implements self::SimpleCaseImpl<self::SimpleCaseImpl2::Ai2*, self::SimpleCaseImpl2::Bi2*> {
-  synthetic constructor •() → self::SimpleCaseImpl2<self::SimpleCaseImpl2::Ai2*, self::SimpleCaseImpl2::Bi2*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Base<M extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Base<self::Base::M*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Mixin<M extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Mixin<self::Mixin::M*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Mix<M extends core::Object* = dynamic> extends self::Base<self::Mix::M*> implements self::Mixin<self::Mix::M*> /*isEliminatedMixin*/  {
-  synthetic constructor •() → self::Mix<self::Mix::M*>*
-    : super self::Base::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::print(new self::Bar::•<core::String*, core::double*>(4).{self::FooBase::x});
-  new self::SimpleCaseImpl2::•<core::int*, core::double*>();
-  new self::Mix::•<core::double*>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart
deleted file mode 100644
index 5d70e99..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-// The purpose of this test is to check the representation of redirecting
-// factory constructors in a case of a redirecting chain.
-
-library redirecting_factory_constructors.chain_test;
-
-class A {
-  A();
-  factory A.first() = A;
-  factory A.second() = A.first;
-}
-
-main() {
-  new A.second();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.textual_outline.expect
deleted file mode 100644
index 25a1082..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.chain_test;
-
-class A {
-  A();
-  factory A.first() = A;
-  factory A.second() = A.first;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 25a1082..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.chain_test;
-
-class A {
-  A();
-  factory A.first() = A;
-  factory A.second() = A.first;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.expect
deleted file mode 100644
index 88615ec..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library redirecting_factory_constructors.chain_test;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::first, self::A::second];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory first() → self::A*
-    let dynamic #redirecting_factory = self::A::• in invalid-expression;
-  static factory second() → self::A*
-    let dynamic #redirecting_factory = self::A::first in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.outline.expect
deleted file mode 100644
index 7df5d5f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library redirecting_factory_constructors.chain_test;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::first, self::A::second];
-  constructor •() → self::A*
-    ;
-  static factory first() → self::A*
-    let dynamic #redirecting_factory = self::A::• in invalid-expression;
-  static factory second() → self::A*
-    let dynamic #redirecting_factory = self::A::first in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.transformed.expect
deleted file mode 100644
index cab046f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_chain_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library redirecting_factory_constructors.chain_test;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::first, self::A::second];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory first() → self::A*
-    let<BottomType> #redirecting_factory = self::A::• in invalid-expression;
-  static factory second() → self::A*
-    let () →* self::A* #redirecting_factory = self::A::first in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart
deleted file mode 100644
index ff9b289..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that the type inference implementation correctly uses least
-// closure of the inferred type arguments in invocations of 'const' redirecting
-// factory constructors in case there are type variables in them.
-
-class _X<T> {
-  const factory _X() = _Y<T>;
-}
-
-class _Y<T> implements _X<T> {
-  const _Y();
-}
-
-class A<T> {
-  _X<T> x;
-  A(this.x);
-}
-
-class B<T> extends A<T> {
-  B() : super(const _X());
-}
-
-main() {
-  dynamic x = new B().x;
-  if (x is! _Y<Null>) {
-    throw "Unexpected run-time type: `new B().x` is ${x.runtimeType}, "
-        "but `_Y<Null>` expected";
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.textual_outline.expect
deleted file mode 100644
index 4767533..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.textual_outline.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-class _X<T> {
-  const factory _X() = _Y<T>;
-}
-
-class _Y<T> implements _X<T> {
-  const _Y();
-}
-
-class A<T> {
-  _X<T> x;
-  A(this.x);
-}
-
-class B<T> extends A<T> {
-  B() : super(const _X());
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.textual_outline_modelled.expect
deleted file mode 100644
index 889323b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-class A<T> {
-  A(this.x);
-  _X<T> x;
-}
-
-class B<T> extends A<T> {
-  B() : super(const _X());
-}
-
-class _X<T> {
-  const factory _X() = _Y<T>;
-}
-
-class _Y<T> implements _X<T> {
-  const _Y();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.expect
deleted file mode 100644
index 86194ea..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.expect
+++ /dev/null
@@ -1,71 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class _X<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::_X::•];
-  static factory •<T extends core::Object* = dynamic>() → self::_X<self::_X::•::T*>*
-    let dynamic #redirecting_factory = self::_Y::• in let self::_X::•::T* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class _Y<T extends core::Object* = dynamic> extends core::Object implements self::_X<self::_Y::T*> /*hasConstConstructor*/  {
-  const constructor •() → self::_Y<self::_Y::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::_X<self::A::T*>* x;
-  constructor •(self::_X<self::A::T*>* x) → self::A<self::A::T*>*
-    : self::A::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A<self::B::T*> {
-  constructor •() → self::B<self::B::T*>*
-    : super self::A::•(#C1)
-    ;
-}
-static method main() → dynamic {
-  dynamic x = new self::B::•<dynamic>().{self::A::x};
-  if(!(x is self::_Y<Null>*)) {
-    throw "Unexpected run-time type: `new B().x` is ${x.{core::Object::runtimeType}}, but `_Y<Null>` expected";
-  }
-}
-
-constants  {
-  #C1 = self::_Y<Null> {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///redirecting_factory_const_inference.dart:
-- _Y. (from org-dartlang-testcase:///redirecting_factory_const_inference.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.outline.expect
deleted file mode 100644
index 23d11ab..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.outline.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class _X<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::_X::•];
-  static factory •<T extends core::Object* = dynamic>() → self::_X<self::_X::•::T*>*
-    let dynamic #redirecting_factory = self::_Y::• in let self::_X::•::T* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class _Y<T extends core::Object* = dynamic> extends core::Object implements self::_X<self::_Y::T*> /*hasConstConstructor*/  {
-  const constructor •() → self::_Y<self::_Y::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::_X<self::A::T*>* x;
-  constructor •(self::_X<self::A::T*>* x) → self::A<self::A::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A<self::B::T*> {
-  constructor •() → self::B<self::B::T*>*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.transformed.expect
deleted file mode 100644
index 2027839..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_const_inference.dart.weak.transformed.expect
+++ /dev/null
@@ -1,71 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class _X<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::_X::•];
-  static factory •<T extends core::Object* = dynamic>() → self::_X<self::_X::•::T*>*
-    let<BottomType> #redirecting_factory = self::_Y::• in let self::_X::•::T* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class _Y<T extends core::Object* = dynamic> extends core::Object implements self::_X<self::_Y::T*> /*hasConstConstructor*/  {
-  const constructor •() → self::_Y<self::_Y::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class A<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::_X<self::A::T*>* x;
-  constructor •(self::_X<self::A::T*>* x) → self::A<self::A::T*>*
-    : self::A::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A<self::B::T*> {
-  constructor •() → self::B<self::B::T*>*
-    : super self::A::•(#C1)
-    ;
-}
-static method main() → dynamic {
-  dynamic x = new self::B::•<dynamic>().{self::A::x};
-  if(!(x is self::_Y<Null>*)) {
-    throw "Unexpected run-time type: `new B().x` is ${x.{core::Object::runtimeType}}, but `_Y<Null>` expected";
-  }
-}
-
-constants  {
-  #C1 = self::_Y<Null> {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///redirecting_factory_const_inference.dart:
-- _Y. (from org-dartlang-testcase:///redirecting_factory_const_inference.dart:16:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart
deleted file mode 100644
index bf32643..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that annotations on redirecting factories and their formals
-// aren't skipped by the compiler and are observable in its output.
-
-const forParameter = 1;
-const forFactoryItself = 2;
-const anotherForParameter = 3;
-
-class Foo {
-  @forFactoryItself
-  factory Foo(@forParameter @anotherForParameter p) = Foo.named;
-  Foo.named(p);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.textual_outline.expect
deleted file mode 100644
index 1a59844..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.textual_outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-const forParameter = 1;
-const forFactoryItself = 2;
-const anotherForParameter = 3;
-
-class Foo {
-  @forFactoryItself
-  factory Foo(@forParameter @anotherForParameter p) = Foo.named;
-  Foo.named(p);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.textual_outline_modelled.expect
deleted file mode 100644
index 0b5eb06..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class Foo {
-  Foo.named(p);
-  @forFactoryItself
-  factory Foo(@forParameter @anotherForParameter p) = Foo.named;
-}
-
-const anotherForParameter = 3;
-const forFactoryItself = 2;
-const forParameter = 1;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.expect
deleted file mode 100644
index 5da2827..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::Foo::•];
-  constructor named(dynamic p) → self::Foo*
-    : super core::Object::•()
-    ;
-  @#C1
-  static factory •(@#C2 @#C3 dynamic p) → self::Foo*
-    let dynamic #redirecting_factory = self::Foo::named in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* forParameter = #C2;
-static const field core::int* forFactoryItself = #C1;
-static const field core::int* anotherForParameter = #C3;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 2
-  #C2 = 1
-  #C3 = 3
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.outline.expect
deleted file mode 100644
index a83d25d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.outline.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::Foo::•];
-  constructor named(dynamic p) → self::Foo*
-    ;
-  @self::forFactoryItself
-  static factory •(dynamic p) → self::Foo*
-    let dynamic #redirecting_factory = self::Foo::named in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* forParameter = 1;
-static const field core::int* forFactoryItself = 2;
-static const field core::int* anotherForParameter = 3;
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: StaticGet @ org-dartlang-testcase:///redirecting_factory_metadata.dart:15:4 -> IntConstant(2)
-Extra constant evaluation: evaluated: 5, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.transformed.expect
deleted file mode 100644
index 4dc094e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_metadata.dart.weak.transformed.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::Foo::•];
-  constructor named(dynamic p) → self::Foo*
-    : super core::Object::•()
-    ;
-  @#C1
-  static factory •(@#C2 @#C3 dynamic p) → self::Foo*
-    let<BottomType> #redirecting_factory = self::Foo::named in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static const field core::int* forParameter = #C2;
-static const field core::int* forFactoryItself = #C1;
-static const field core::int* anotherForParameter = #C3;
-static method main() → dynamic {}
-
-constants  {
-  #C1 = 2
-  #C2 = 1
-  #C3 = 3
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart
deleted file mode 100644
index 7dc3eaf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-// The purpose of this test is to check the representation of redirecting
-// factory constructors on a simple case.
-
-library redirecting_factory_constructors.simple_test;
-
-class A {
-  A();
-  factory A.redir() = A;
-}
-
-main() {
-  new A.redir();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.textual_outline.expect
deleted file mode 100644
index 72e8dd1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.simple_test;
-
-class A {
-  A();
-  factory A.redir() = A;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 72e8dd1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.simple_test;
-
-class A {
-  A();
-  factory A.redir() = A;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.expect
deleted file mode 100644
index de93fd8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library redirecting_factory_constructors.simple_test;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory redir() → self::A*
-    let dynamic #redirecting_factory = self::A::• in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.outline.expect
deleted file mode 100644
index 43d5697..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library redirecting_factory_constructors.simple_test;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •() → self::A*
-    ;
-  static factory redir() → self::A*
-    let dynamic #redirecting_factory = self::A::• in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.transformed.expect
deleted file mode 100644
index 5aec6a3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_simple_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library redirecting_factory_constructors.simple_test;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory redir() → self::A*
-    let<BottomType> #redirecting_factory = self::A::• in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart
deleted file mode 100644
index 616356f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-// The purpose of this test is to check the representation of redirecting
-// factory constructors in the case when the redirection target has type
-// arguments supplied by the redirecting factory constructor.
-
-library redirecting_factory_constructors.typeargs_test;
-
-class X {}
-
-class Y extends X {}
-
-class A {
-  A();
-
-  factory A.redir() = B<Y>;
-}
-
-class B<T extends X> extends A {
-  B();
-}
-
-main() {
-  new A.redir();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.textual_outline.expect
deleted file mode 100644
index e6e9dba..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.typeargs_test;
-
-class X {}
-
-class Y extends X {}
-
-class A {
-  A();
-  factory A.redir() = B<Y>;
-}
-
-class B<T extends X> extends A {
-  B();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 0bc43b3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.typeargs_test;
-
-class A {
-  A();
-  factory A.redir() = B<Y>;
-}
-
-class B<T extends X> extends A {
-  B();
-}
-
-class X {}
-
-class Y extends X {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.expect
deleted file mode 100644
index 9ada94b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-library redirecting_factory_constructors.typeargs_test;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    : super self::X::•()
-    ;
-}
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory redir() → self::A*
-    let dynamic #redirecting_factory = self::B::• in let self::Y* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends self::X* = self::X*> extends self::A {
-  constructor •() → self::B<self::B::T*>*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  new self::B::•<self::Y*>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.outline.expect
deleted file mode 100644
index fe27ae5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library redirecting_factory_constructors.typeargs_test;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    ;
-}
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •() → self::A*
-    ;
-  static factory redir() → self::A*
-    let dynamic #redirecting_factory = self::B::• in let self::Y* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends self::X* = self::X*> extends self::A {
-  constructor •() → self::B<self::B::T*>*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.transformed.expect
deleted file mode 100644
index da09dec..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeargs_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-library redirecting_factory_constructors.typeargs_test;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    : super self::X::•()
-    ;
-}
-class A extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  static factory redir() → self::A*
-    let<BottomType> #redirecting_factory = self::B::• in let self::Y* #typeArg0 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends self::X* = self::X*> extends self::A {
-  constructor •() → self::B<self::B::T*>*
-    : super self::A::•()
-    ;
-}
-static method main() → dynamic {
-  new self::B::•<self::Y*>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart
deleted file mode 100644
index 2240657..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-// The purpose of this test is to check the representation of redirecting
-// factory constructors in the case when type parameters of the enclosing class
-// are used in type annotations of the parameters of the redirecting factory
-// constructor.
-
-library redirecting_factory_constructors.typeparam_test;
-
-class A<T, S> {
-  A(T t, S s);
-  factory A.redir(T t, S s) = A<T, S>;
-}
-
-main() {
-  new A<int, String>.redir(42, "foobar");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.textual_outline.expect
deleted file mode 100644
index 06f0190..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.typeparam_test;
-
-class A<T, S> {
-  A(T t, S s);
-  factory A.redir(T t, S s) = A<T, S>;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 06f0190..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.typeparam_test;
-
-class A<T, S> {
-  A(T t, S s);
-  factory A.redir(T t, S s) = A<T, S>;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.expect
deleted file mode 100644
index 19f5ced..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library redirecting_factory_constructors.typeparam_test;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::Object* = dynamic, S extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •(self::A::T* t, self::A::S* s) → self::A<self::A::T*, self::A::S*>*
-    : super core::Object::•()
-    ;
-  static factory redir<T extends core::Object* = dynamic, S extends core::Object* = dynamic>(self::A::redir::T* t, self::A::redir::S* s) → self::A<self::A::redir::T*, self::A::redir::S*>*
-    let dynamic #redirecting_factory = self::A::• in let self::A::redir::T* #typeArg0 = null in let self::A::redir::S* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•<core::int*, core::String*>(42, "foobar");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.outline.expect
deleted file mode 100644
index edba967..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library redirecting_factory_constructors.typeparam_test;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::Object* = dynamic, S extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •(self::A::T* t, self::A::S* s) → self::A<self::A::T*, self::A::S*>*
-    ;
-  static factory redir<T extends core::Object* = dynamic, S extends core::Object* = dynamic>(self::A::redir::T* t, self::A::redir::S* s) → self::A<self::A::redir::T*, self::A::redir::S*>*
-    let dynamic #redirecting_factory = self::A::• in let self::A::redir::T* #typeArg0 = null in let self::A::redir::S* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.transformed.expect
deleted file mode 100644
index b6de55f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparam_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library redirecting_factory_constructors.typeparam_test;
-import self as self;
-import "dart:core" as core;
-
-class A<T extends core::Object* = dynamic, S extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •(self::A::T* t, self::A::S* s) → self::A<self::A::T*, self::A::S*>*
-    : super core::Object::•()
-    ;
-  static factory redir<T extends core::Object* = dynamic, S extends core::Object* = dynamic>(self::A::redir::T* t, self::A::redir::S* s) → self::A<self::A::redir::T*, self::A::redir::S*>*
-    let<BottomType> #redirecting_factory = self::A::• in let self::A::redir::T* #typeArg0 = null in let self::A::redir::S* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•<core::int*, core::String*>(42, "foobar");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart
deleted file mode 100644
index edf0e28..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-// The purpose of this test is to check the representation of redirecting
-// factory constructors in the case when type parameters of the enclosing class
-// are used in type annotations of the parameters of the redirecting factory
-// constructor, and one of the type parameters is the upper bound for the other.
-
-library redirecting_factory_constructors.typeparambounds_test;
-
-class X {}
-
-class Y extends X {}
-
-class A<T, S extends T> {
-  A(T t, S s);
-  factory A.redir(T t, S s) = A<T, S>;
-}
-
-main() {
-  new A<X, Y>.redir(new X(), new Y());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.textual_outline.expect
deleted file mode 100644
index 80e15be..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.typeparambounds_test;
-
-class X {}
-
-class Y extends X {}
-
-class A<T, S extends T> {
-  A(T t, S s);
-  factory A.redir(T t, S s) = A<T, S>;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7d63864..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,13 +0,0 @@
-// @dart = 2.6
-library redirecting_factory_constructors.typeparambounds_test;
-
-class A<T, S extends T> {
-  A(T t, S s);
-  factory A.redir(T t, S s) = A<T, S>;
-}
-
-class X {}
-
-class Y extends X {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.expect
deleted file mode 100644
index 521ea4e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library redirecting_factory_constructors.typeparambounds_test;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    : super self::X::•()
-    ;
-}
-class A<T extends core::Object* = dynamic, S extends self::A::T* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •(self::A::T* t, self::A::S* s) → self::A<self::A::T*, self::A::S*>*
-    : super core::Object::•()
-    ;
-  static factory redir<T extends core::Object* = dynamic, S extends self::A::redir::T* = dynamic>(self::A::redir::T* t, self::A::redir::S* s) → self::A<self::A::redir::T*, self::A::redir::S*>*
-    let dynamic #redirecting_factory = self::A::• in let self::A::redir::T* #typeArg0 = null in let self::A::redir::S* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•<self::X*, self::Y*>(new self::X::•(), new self::Y::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.outline.expect
deleted file mode 100644
index 2551eab..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,41 +0,0 @@
-library redirecting_factory_constructors.typeparambounds_test;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    ;
-}
-class A<T extends core::Object* = dynamic, S extends self::A::T* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •(self::A::T* t, self::A::S* s) → self::A<self::A::T*, self::A::S*>*
-    ;
-  static factory redir<T extends core::Object* = dynamic, S extends self::A::redir::T* = dynamic>(self::A::redir::T* t, self::A::redir::S* s) → self::A<self::A::redir::T*, self::A::redir::S*>*
-    let dynamic #redirecting_factory = self::A::• in let self::A::redir::T* #typeArg0 = null in let self::A::redir::S* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.transformed.expect
deleted file mode 100644
index 8409594..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_factory_typeparambounds_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library redirecting_factory_constructors.typeparambounds_test;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Y extends self::X {
-  synthetic constructor •() → self::Y*
-    : super self::X::•()
-    ;
-}
-class A<T extends core::Object* = dynamic, S extends self::A::T* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::redir];
-  constructor •(self::A::T* t, self::A::S* s) → self::A<self::A::T*, self::A::S*>*
-    : super core::Object::•()
-    ;
-  static factory redir<T extends core::Object* = dynamic, S extends self::A::redir::T* = dynamic>(self::A::redir::T* t, self::A::redir::S* s) → self::A<self::A::redir::T*, self::A::redir::S*>*
-    let<BottomType> #redirecting_factory = self::A::• in let self::A::redir::T* #typeArg0 = null in let self::A::redir::S* #typeArg1 = null in invalid-expression;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::A::•<self::X*, self::Y*>(new self::X::•(), new self::Y::•());
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart
deleted file mode 100644
index 6b25ff3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// The test checks that types of arguments of redirecting initializers are
-// checked against the corresponding formal parameter types of the redirection
-// targets, and the downcasts are inserted where appropriate.
-
-class X {}
-
-class Foo<T extends X> {
-  T x;
-  Foo.fromX(X _init) : this._internal(x: _init);
-  Foo.fromT(T _init) : this._internal(x: _init);
-  Foo._internal({this.x});
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.textual_outline.expect
deleted file mode 100644
index 1473d4d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class X {}
-
-class Foo<T extends X> {
-  T x;
-  Foo.fromX(X _init) : this._internal(x: _init);
-  Foo.fromT(T _init) : this._internal(x: _init);
-  Foo._internal({this.x});
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6cc8c23..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class Foo<T extends X> {
-  Foo._internal({this.x});
-  Foo.fromT(T _init) : this._internal(x: _init);
-  Foo.fromX(X _init) : this._internal(x: _init);
-  T x;
-}
-
-class X {}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.expect
deleted file mode 100644
index 0afec65..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo<T extends self::X* = self::X*> extends core::Object {
-  generic-covariant-impl field self::Foo::T* x;
-  constructor fromX(self::X* _init) → self::Foo<self::Foo::T*>*
-    : this self::Foo::_internal(x: _init as{TypeError} self::Foo::T*)
-    ;
-  constructor fromT(self::Foo::T* _init) → self::Foo<self::Foo::T*>*
-    : this self::Foo::_internal(x: _init)
-    ;
-  constructor _internal({self::Foo::T* x = #C1}) → self::Foo<self::Foo::T*>*
-    : self::Foo::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.outline.expect
deleted file mode 100644
index 6210541..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo<T extends self::X* = self::X*> extends core::Object {
-  generic-covariant-impl field self::Foo::T* x;
-  constructor fromX(self::X* _init) → self::Foo<self::Foo::T*>*
-    ;
-  constructor fromT(self::Foo::T* _init) → self::Foo<self::Foo::T*>*
-    ;
-  constructor _internal({self::Foo::T* x}) → self::Foo<self::Foo::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.transformed.expect
deleted file mode 100644
index 0afec65..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_assignable_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class X extends core::Object {
-  synthetic constructor •() → self::X*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Foo<T extends self::X* = self::X*> extends core::Object {
-  generic-covariant-impl field self::Foo::T* x;
-  constructor fromX(self::X* _init) → self::Foo<self::Foo::T*>*
-    : this self::Foo::_internal(x: _init as{TypeError} self::Foo::T*)
-    ;
-  constructor fromT(self::Foo::T* _init) → self::Foo<self::Foo::T*>*
-    : this self::Foo::_internal(x: _init)
-    ;
-  constructor _internal({self::Foo::T* x = #C1}) → self::Foo<self::Foo::T*>*
-    : self::Foo::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart
deleted file mode 100644
index eae24e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// The test checks that types of arguments of redirecting initializers are
-// checked against the corresponding formal parameter types of the redirection
-// targets, and the compile-time error is emitted in the case they are not
-// assignable.
-
-class Foo<T> {
-  T x;
-  Foo.from(String _init) : this._internal(x: _init);
-  Foo._internal({this.x});
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.textual_outline.expect
deleted file mode 100644
index ee6bdf0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class Foo<T> {
-  T x;
-  Foo.from(String _init) : this._internal(x: _init);
-  Foo._internal({this.x});
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.textual_outline_modelled.expect
deleted file mode 100644
index 987d68d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class Foo<T> {
-  Foo._internal({this.x});
-  Foo.from(String _init) : this._internal(x: _init);
-  T x;
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.expect
deleted file mode 100644
index e7f75d3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart:14:46: Error: The argument type 'String' can't be assigned to the parameter type 'T'.
-//   Foo.from(String _init) : this._internal(x: _init);
-//                                              ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::Foo::T* x;
-  constructor from(core::String* _init) → self::Foo<self::Foo::T*>*
-    : this self::Foo::_internal(x: let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart:14:46: Error: The argument type 'String' can't be assigned to the parameter type 'T'.
-  Foo.from(String _init) : this._internal(x: _init);
-                                             ^" in _init as{TypeError} <BottomType>)
-    ;
-  constructor _internal({self::Foo::T* x = #C1}) → self::Foo<self::Foo::T*>*
-    : self::Foo::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.outline.expect
deleted file mode 100644
index 4702554..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.outline.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::Foo::T* x;
-  constructor from(core::String* _init) → self::Foo<self::Foo::T*>*
-    ;
-  constructor _internal({self::Foo::T* x}) → self::Foo<self::Foo::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.transformed.expect
deleted file mode 100644
index e7f75d3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart.weak.transformed.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart:14:46: Error: The argument type 'String' can't be assigned to the parameter type 'T'.
-//   Foo.from(String _init) : this._internal(x: _init);
-//                                              ^
-//
-import self as self;
-import "dart:core" as core;
-
-class Foo<T extends core::Object* = dynamic> extends core::Object {
-  generic-covariant-impl field self::Foo::T* x;
-  constructor from(core::String* _init) → self::Foo<self::Foo::T*>*
-    : this self::Foo::_internal(x: let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/redirecting_initializer_arguments_test.dart:14:46: Error: The argument type 'String' can't be assigned to the parameter type 'T'.
-  Foo.from(String _init) : this._internal(x: _init);
-                                             ^" in _init as{TypeError} <BottomType>)
-    ;
-  constructor _internal({self::Foo::T* x = #C1}) → self::Foo<self::Foo::T*>*
-    : self::Foo::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → void {}
-
-constants  {
-  #C1 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart
deleted file mode 100644
index f4a2596..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-// The test checks that type arguments of the target of redirection factory
-// constructors are preserved throughout the chain of redirections.
-
-import 'package:expect/expect.dart';
-
-class A<T> {
-  factory A() = B<T, num>;
-  A.empty();
-}
-
-class B<U, W> extends A<U> {
-  factory B() = C<U, W, String>;
-  B.empty() : super.empty();
-}
-
-class C<V, S, R> extends B<V, S> {
-  C() : super.empty();
-  toString() => "${V},${S},${R}";
-}
-
-main() {
-  Expect.equals("${new A<int>()}", "int,num,String");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.textual_outline.expect
deleted file mode 100644
index 1f7d067..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.textual_outline.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-import 'package:expect/expect.dart';
-
-class A<T> {
-  factory A() = B<T, num>;
-  A.empty();
-}
-
-class B<U, W> extends A<U> {
-  factory B() = C<U, W, String>;
-  B.empty() : super.empty();
-}
-
-class C<V, S, R> extends B<V, S> {
-  C() : super.empty();
-  toString() => "${V},${S},${R}";
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.textual_outline_modelled.expect
deleted file mode 100644
index ebbc0f2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-import 'package:expect/expect.dart';
-
-class A<T> {
-  A.empty();
-  factory A() = B<T, num>;
-}
-
-class B<U, W> extends A<U> {
-  B.empty() : super.empty();
-  factory B() = C<U, W, String>;
-}
-
-class C<V, S, R> extends B<V, S> {
-  C() : super.empty();
-  toString() => "${V},${S},${R}";
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.expect
deleted file mode 100644
index e9d6519..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class A<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  constructor empty() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  static factory •<T extends core::Object* = dynamic>() → self::A<self::A::•::T*>*
-    let dynamic #redirecting_factory = self::B::• in let self::A::•::T* #typeArg0 = null in let core::num* #typeArg1 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<U extends core::Object* = dynamic, W extends core::Object* = dynamic> extends self::A<self::B::U*> {
-  static final field dynamic _redirecting# = <dynamic>[self::B::•];
-  constructor empty() → self::B<self::B::U*, self::B::W*>*
-    : super self::A::empty()
-    ;
-  static factory •<U extends core::Object* = dynamic, W extends core::Object* = dynamic>() → self::B<self::B::•::U*, self::B::•::W*>*
-    let dynamic #redirecting_factory = self::C::• in let self::B::•::U* #typeArg0 = null in let self::B::•::W* #typeArg1 = null in let core::String* #typeArg2 = null in invalid-expression;
-}
-class C<V extends core::Object* = dynamic, S extends core::Object* = dynamic, R extends core::Object* = dynamic> extends self::B<self::C::V*, self::C::S*> {
-  constructor •() → self::C<self::C::V*, self::C::S*, self::C::R*>*
-    : super self::B::empty()
-    ;
-  method toString() → core::String*
-    return "${self::C::V*},${self::C::S*},${self::C::R*}";
-}
-static method main() → dynamic {
-  exp::Expect::equals("${new self::C::•<core::int*, core::num*, core::String*>()}", "int,num,String");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.outline.expect
deleted file mode 100644
index abc8779..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.outline.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-class A<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  constructor empty() → self::A<self::A::T*>*
-    ;
-  static factory •<T extends core::Object* = dynamic>() → self::A<self::A::•::T*>*
-    let dynamic #redirecting_factory = self::B::• in let self::A::•::T* #typeArg0 = null in let core::num* #typeArg1 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<U extends core::Object* = dynamic, W extends core::Object* = dynamic> extends self::A<self::B::U*> {
-  static final field dynamic _redirecting# = <dynamic>[self::B::•];
-  constructor empty() → self::B<self::B::U*, self::B::W*>*
-    ;
-  static factory •<U extends core::Object* = dynamic, W extends core::Object* = dynamic>() → self::B<self::B::•::U*, self::B::•::W*>*
-    let dynamic #redirecting_factory = self::C::• in let self::B::•::U* #typeArg0 = null in let self::B::•::W* #typeArg1 = null in let core::String* #typeArg2 = null in invalid-expression;
-}
-class C<V extends core::Object* = dynamic, S extends core::Object* = dynamic, R extends core::Object* = dynamic> extends self::B<self::C::V*, self::C::S*> {
-  constructor •() → self::C<self::C::V*, self::C::S*, self::C::R*>*
-    ;
-  method toString() → core::String*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.transformed.expect
deleted file mode 100644
index 30b74d9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments.dart.weak.transformed.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class A<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  constructor empty() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  static factory •<T extends core::Object* = dynamic>() → self::A<self::A::•::T*>*
-    let <U extends core::Object* = dynamic, W extends core::Object* = dynamic>() →* self::B<U*, W*>* #redirecting_factory = self::B::• in let self::A::•::T* #typeArg0 = null in let core::num* #typeArg1 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<U extends core::Object* = dynamic, W extends core::Object* = dynamic> extends self::A<self::B::U*> {
-  static final field dynamic _redirecting# = <dynamic>[self::B::•];
-  constructor empty() → self::B<self::B::U*, self::B::W*>*
-    : super self::A::empty()
-    ;
-  static factory •<U extends core::Object* = dynamic, W extends core::Object* = dynamic>() → self::B<self::B::•::U*, self::B::•::W*>*
-    let<BottomType> #redirecting_factory = self::C::• in let self::B::•::U* #typeArg0 = null in let self::B::•::W* #typeArg1 = null in let core::String* #typeArg2 = null in invalid-expression;
-}
-class C<V extends core::Object* = dynamic, S extends core::Object* = dynamic, R extends core::Object* = dynamic> extends self::B<self::C::V*, self::C::S*> {
-  constructor •() → self::C<self::C::V*, self::C::S*, self::C::R*>*
-    : super self::B::empty()
-    ;
-  method toString() → core::String*
-    return "${self::C::V*},${self::C::S*},${self::C::R*}";
-}
-static method main() → dynamic {
-  exp::Expect::equals("${new self::C::•<core::int*, core::num*, core::String*>()}", "int,num,String");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart
deleted file mode 100644
index fe14f9b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-// The test checks that dependencies of type arguments of targets of redirecting
-// factories on type parameters of the corresponding classes are respected in
-// the resulting type arguments of redirecting factories invocations.
-
-import 'package:expect/expect.dart';
-
-abstract class A<T> {
-  factory A() = B<T, List<T>>;
-  A.empty();
-}
-
-abstract class B<U, W> extends A<U> {
-  factory B() = C<U, W, Map<U, W>>;
-  B.empty() : super.empty();
-}
-
-class C<V, S, R> extends B<V, S> {
-  C() : super.empty();
-  toString() => "${V},${S},${R}";
-}
-
-main() {
-  Expect.equals("${new A<int>()}", "int,List<int>,Map<int, List<int>>");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.textual_outline.expect
deleted file mode 100644
index ccc7cc7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.textual_outline.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-import 'package:expect/expect.dart';
-
-abstract class A<T> {
-  factory A() = B<T, List<T>>;
-  A.empty();
-}
-
-abstract class B<U, W> extends A<U> {
-  factory B() = C<U, W, Map<U, W>>;
-  B.empty() : super.empty();
-}
-
-class C<V, S, R> extends B<V, S> {
-  C() : super.empty();
-  toString() => "${V},${S},${R}";
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.textual_outline_modelled.expect
deleted file mode 100644
index 60429ec..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-// @dart = 2.6
-import 'package:expect/expect.dart';
-
-abstract class A<T> {
-  A.empty();
-  factory A() = B<T, List<T>>;
-}
-
-abstract class B<U, W> extends A<U> {
-  B.empty() : super.empty();
-  factory B() = C<U, W, Map<U, W>>;
-}
-
-class C<V, S, R> extends B<V, S> {
-  C() : super.empty();
-  toString() => "${V},${S},${R}";
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.expect
deleted file mode 100644
index 8f23e49..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  constructor empty() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  static factory •<T extends core::Object* = dynamic>() → self::A<self::A::•::T*>*
-    let dynamic #redirecting_factory = self::B::• in let self::A::•::T* #typeArg0 = null in let core::List<self::A::•::T*>* #typeArg1 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B<U extends core::Object* = dynamic, W extends core::Object* = dynamic> extends self::A<self::B::U*> {
-  static final field dynamic _redirecting# = <dynamic>[self::B::•];
-  constructor empty() → self::B<self::B::U*, self::B::W*>*
-    : super self::A::empty()
-    ;
-  static factory •<U extends core::Object* = dynamic, W extends core::Object* = dynamic>() → self::B<self::B::•::U*, self::B::•::W*>*
-    let dynamic #redirecting_factory = self::C::• in let self::B::•::U* #typeArg0 = null in let self::B::•::W* #typeArg1 = null in let core::Map<self::B::•::U*, self::B::•::W*>* #typeArg2 = null in invalid-expression;
-}
-class C<V extends core::Object* = dynamic, S extends core::Object* = dynamic, R extends core::Object* = dynamic> extends self::B<self::C::V*, self::C::S*> {
-  constructor •() → self::C<self::C::V*, self::C::S*, self::C::R*>*
-    : super self::B::empty()
-    ;
-  method toString() → core::String*
-    return "${self::C::V*},${self::C::S*},${self::C::R*}";
-}
-static method main() → dynamic {
-  exp::Expect::equals("${new self::C::•<core::int*, core::List<core::int*>*, core::Map<core::int*, core::List<core::int*>*>*>()}", "int,List<int>,Map<int, List<int>>");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.outline.expect
deleted file mode 100644
index 9e95322..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.outline.expect
+++ /dev/null
@@ -1,38 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  constructor empty() → self::A<self::A::T*>*
-    ;
-  static factory •<T extends core::Object* = dynamic>() → self::A<self::A::•::T*>*
-    let dynamic #redirecting_factory = self::B::• in let self::A::•::T* #typeArg0 = null in let core::List<self::A::•::T*>* #typeArg1 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B<U extends core::Object* = dynamic, W extends core::Object* = dynamic> extends self::A<self::B::U*> {
-  static final field dynamic _redirecting# = <dynamic>[self::B::•];
-  constructor empty() → self::B<self::B::U*, self::B::W*>*
-    ;
-  static factory •<U extends core::Object* = dynamic, W extends core::Object* = dynamic>() → self::B<self::B::•::U*, self::B::•::W*>*
-    let dynamic #redirecting_factory = self::C::• in let self::B::•::U* #typeArg0 = null in let self::B::•::W* #typeArg1 = null in let core::Map<self::B::•::U*, self::B::•::W*>* #typeArg2 = null in invalid-expression;
-}
-class C<V extends core::Object* = dynamic, S extends core::Object* = dynamic, R extends core::Object* = dynamic> extends self::B<self::C::V*, self::C::S*> {
-  constructor •() → self::C<self::C::V*, self::C::S*, self::C::R*>*
-    ;
-  method toString() → core::String*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.transformed.expect
deleted file mode 100644
index 25434a1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_chain_type_arguments_subst.dart.weak.transformed.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  constructor empty() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  static factory •<T extends core::Object* = dynamic>() → self::A<self::A::•::T*>*
-    let <U extends core::Object* = dynamic, W extends core::Object* = dynamic>() →* self::B<U*, W*>* #redirecting_factory = self::B::• in let self::A::•::T* #typeArg0 = null in let core::List<self::A::•::T*>* #typeArg1 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B<U extends core::Object* = dynamic, W extends core::Object* = dynamic> extends self::A<self::B::U*> {
-  static final field dynamic _redirecting# = <dynamic>[self::B::•];
-  constructor empty() → self::B<self::B::U*, self::B::W*>*
-    : super self::A::empty()
-    ;
-  static factory •<U extends core::Object* = dynamic, W extends core::Object* = dynamic>() → self::B<self::B::•::U*, self::B::•::W*>*
-    let<BottomType> #redirecting_factory = self::C::• in let self::B::•::U* #typeArg0 = null in let self::B::•::W* #typeArg1 = null in let core::Map<self::B::•::U*, self::B::•::W*>* #typeArg2 = null in invalid-expression;
-}
-class C<V extends core::Object* = dynamic, S extends core::Object* = dynamic, R extends core::Object* = dynamic> extends self::B<self::C::V*, self::C::S*> {
-  constructor •() → self::C<self::C::V*, self::C::S*, self::C::R*>*
-    : super self::B::empty()
-    ;
-  method toString() → core::String*
-    return "${self::C::V*},${self::C::S*},${self::C::R*}";
-}
-static method main() → dynamic {
-  exp::Expect::equals("${new self::C::•<core::int*, core::List<core::int*>*, core::Map<core::int*, core::List<core::int*>*>*>()}", "int,List<int>,Map<int, List<int>>");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart
deleted file mode 100644
index abf7219..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2018, 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.md file.
-
-// @dart=2.6
-
-// The test checks that type arguments of the target of redirection factory
-// constructors are preserved.
-
-import 'package:expect/expect.dart';
-
-class A {
-  const factory A() = B<String>;
-  const A.empty();
-}
-
-class B<T> extends A {
-  const B() : super.empty();
-
-  toString() => '${T}';
-}
-
-void main() {
-  Expect.equals("${const A()}", "String");
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.textual_outline.expect
deleted file mode 100644
index 6394a90..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-import 'package:expect/expect.dart';
-
-class A {
-  const factory A() = B<String>;
-  const A.empty();
-}
-
-class B<T> extends A {
-  const B() : super.empty();
-  toString() => '${T}';
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.textual_outline_modelled.expect
deleted file mode 100644
index bc1e553..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-import 'package:expect/expect.dart';
-
-class A {
-  const A.empty();
-  const factory A() = B<String>;
-}
-
-class B<T> extends A {
-  const B() : super.empty();
-  toString() => '${T}';
-}
-
-void main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.expect
deleted file mode 100644
index d6c5a68..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class A extends core::Object /*hasConstConstructor*/  {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  const constructor empty() → self::A*
-    : super core::Object::•()
-    ;
-  static factory •() → self::A*
-    let dynamic #redirecting_factory = self::B::• in let core::String* #typeArg0 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A /*hasConstConstructor*/  {
-  const constructor •() → self::B<self::B::T*>*
-    : super self::A::empty()
-    ;
-  method toString() → core::String*
-    return "${self::B::T*}";
-}
-static method main() → void {
-  exp::Expect::equals("${#C1}", "String");
-}
-
-constants  {
-  #C1 = self::B<core::String*> {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///redirection_type_arguments.dart:
-- B. (from org-dartlang-testcase:///redirection_type_arguments.dart:18:9)
-- A.empty (from org-dartlang-testcase:///redirection_type_arguments.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.outline.expect
deleted file mode 100644
index ca134d1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.outline.expect
+++ /dev/null
@@ -1,33 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-import "package:expect/expect.dart";
-
-class A extends core::Object /*hasConstConstructor*/  {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  const constructor empty() → self::A*
-    : super core::Object::•()
-    ;
-  static factory •() → self::A*
-    let dynamic #redirecting_factory = self::B::• in let core::String* #typeArg0 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A /*hasConstConstructor*/  {
-  const constructor •() → self::B<self::B::T*>*
-    : super self::A::empty()
-    ;
-  method toString() → core::String*
-    ;
-}
-static method main() → void
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.transformed.expect
deleted file mode 100644
index 7119399..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/redirection_type_arguments.dart.weak.transformed.expect
+++ /dev/null
@@ -1,46 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "package:expect/expect.dart" as exp;
-
-import "package:expect/expect.dart";
-
-class A extends core::Object /*hasConstConstructor*/  {
-  static final field dynamic _redirecting# = <dynamic>[self::A::•];
-  const constructor empty() → self::A*
-    : super core::Object::•()
-    ;
-  static factory •() → self::A*
-    let<BottomType> #redirecting_factory = self::B::• in let core::String* #typeArg0 = null in invalid-expression;
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B<T extends core::Object* = dynamic> extends self::A /*hasConstConstructor*/  {
-  const constructor •() → self::B<self::B::T*>*
-    : super self::A::empty()
-    ;
-  method toString() → core::String*
-    return "${self::B::T*}";
-}
-static method main() → void {
-  exp::Expect::equals("${#C1}", "String");
-}
-
-constants  {
-  #C1 = self::B<core::String*> {}
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///redirection_type_arguments.dart:
-- B. (from org-dartlang-testcase:///redirection_type_arguments.dart:18:9)
-- A.empty (from org-dartlang-testcase:///redirection_type_arguments.dart:14:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart b/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart
deleted file mode 100644
index b3bd5d7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// This test checks that generic function types are rejected with an appropriate
-// compile-time error message if encountered in bounds of type variables.
-
-class Hest<TypeX extends TypeY Function<TypeY>(TypeY)> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.textual_outline.expect
deleted file mode 100644
index 72477c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class Hest<TypeX extends TypeY Function<TypeY>(TypeY)> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.textual_outline_modelled.expect
deleted file mode 100644
index 72477c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-class Hest<TypeX extends TypeY Function<TypeY>(TypeY)> {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.expect
deleted file mode 100644
index 94d0cbd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart:10:12: Error: Type variables can't have generic function types in their bounds.
-// class Hest<TypeX extends TypeY Function<TypeY>(TypeY)> {}
-//            ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Hest<TypeX extends <TypeY extends core::Object* = dynamic>(TypeY*) →* TypeY* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Hest<self::Hest::TypeX*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.outline.expect
deleted file mode 100644
index 31da5e4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart:10:12: Error: Type variables can't have generic function types in their bounds.
-// class Hest<TypeX extends TypeY Function<TypeY>(TypeY)> {}
-//            ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Hest<TypeX extends <TypeY extends core::Object* = dynamic>(TypeY*) →* TypeY* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Hest<self::Hest::TypeX*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.transformed.expect
deleted file mode 100644
index 94d0cbd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart.weak.transformed.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/reject_generic_function_types_in_bounds.dart:10:12: Error: Type variables can't have generic function types in their bounds.
-// class Hest<TypeX extends TypeY Function<TypeY>(TypeY)> {}
-//            ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class Hest<TypeX extends <TypeY extends core::Object* = dynamic>(TypeY*) →* TypeY* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Hest<self::Hest::TypeX*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart b/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart
deleted file mode 100644
index 0397dc9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-bool f(List x) {
-  return x.expand((y) {
-    // Since y has type dynamic, y.split(',') has type dynamic, so an implicit
-    // downcast is needed.  The return context is Iterable<?>.  We should
-    // generate an implicit downcast to Iterable<dynamic>.
-    return y.split(',');
-  }).any((y) => y == 'z');
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.textual_outline.expect
deleted file mode 100644
index fcffd7e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-bool f(List x) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.textual_outline_modelled.expect
deleted file mode 100644
index fcffd7e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-bool f(List x) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.expect
deleted file mode 100644
index 4bfac34..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method f(core::List<dynamic>* x) → core::bool* {
-  return x.{core::Iterable::expand}<dynamic>((dynamic y) → core::Iterable<dynamic>* {
-    return y.split(",") as{TypeError,ForDynamic} core::Iterable<dynamic>*;
-  }).{core::Iterable::any}((dynamic y) → core::bool* => y.{core::Object::==}("z"));
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.outline.expect
deleted file mode 100644
index bd4829a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method f(core::List<dynamic>* x) → core::bool*
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.transformed.expect
deleted file mode 100644
index 4bfac34..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/return_with_unknown_type_in_context.dart.weak.transformed.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method f(core::List<dynamic>* x) → core::bool* {
-  return x.{core::Iterable::expand}<dynamic>((dynamic y) → core::Iterable<dynamic>* {
-    return y.split(",") as{TypeError,ForDynamic} core::Iterable<dynamic>*;
-  }).{core::Iterable::any}((dynamic y) → core::bool* => y.{core::Object::==}("z"));
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart b/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart
deleted file mode 100644
index 53d25c4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.6
-
-class C extends Iterable<Object> {
-  // Missing implementation of [iterator] leads to diagnostic which refers to
-  // the SDK. This test is intended to test that such references are displayed
-  // correctly.
-}
-
-test() {
-  print(incorrectArgument: "fisk");
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.textual_outline.expect
deleted file mode 100644
index 2c7d4ce..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class C extends Iterable<Object> {}
-
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9771aa3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class C extends Iterable<Object> {}
-
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.expect
deleted file mode 100644
index 50bca4d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.expect
+++ /dev/null
@@ -1,82 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart:7:7: Error: The non-abstract class 'C' is missing implementations for these members:
-//  - Iterable.iterator
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class C extends Iterable<Object> {
-//       ^
-// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
-//   Iterator<E> get iterator;
-//                   ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart:14:8: Error: Too few positional arguments: 1 required, 0 given.
-//   print(incorrectArgument: "fisk");
-//        ^
-// sdk/lib/core/print.dart:8:6: Context: Found this candidate, but the arguments don't match.
-// void print(Object? object) {
-//      ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Iterable<core::Object*> {
-  synthetic constructor •() → self::C*
-    : super core::Iterable::•()
-    ;
-  abstract member-signature method cast<R extends core::Object* = dynamic>() → core::Iterable<self::C::cast::R*>*; -> core::Iterable::cast
-  abstract member-signature method followedBy(generic-covariant-impl core::Iterable<core::Object*>* other) → core::Iterable<core::Object*>*; -> core::Iterable::followedBy
-  abstract member-signature method map<T extends core::Object* = dynamic>((core::Object*) →* self::C::map::T* f) → core::Iterable<self::C::map::T*>*; -> core::Iterable::map
-  abstract member-signature method where((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::where
-  abstract member-signature method whereType<T extends core::Object* = dynamic>() → core::Iterable<self::C::whereType::T*>*; -> core::Iterable::whereType
-  abstract member-signature method expand<T extends core::Object* = dynamic>((core::Object*) →* core::Iterable<self::C::expand::T*>* f) → core::Iterable<self::C::expand::T*>*; -> core::Iterable::expand
-  abstract member-signature method contains(core::Object* element) → core::bool*; -> core::Iterable::contains
-  abstract member-signature method forEach((core::Object*) →* void f) → void; -> core::Iterable::forEach
-  abstract member-signature method reduce(generic-covariant-impl (core::Object*, core::Object*) →* core::Object* combine) → core::Object*; -> core::Iterable::reduce
-  abstract member-signature method fold<T extends core::Object* = dynamic>(self::C::fold::T* initialValue, (self::C::fold::T*, core::Object*) →* self::C::fold::T* combine) → self::C::fold::T*; -> core::Iterable::fold
-  abstract member-signature method every((core::Object*) →* core::bool* test) → core::bool*; -> core::Iterable::every
-  abstract member-signature method join([core::String* separator = #C1]) → core::String*; -> core::Iterable::join
-  abstract member-signature method any((core::Object*) →* core::bool* test) → core::bool*; -> core::Iterable::any
-  abstract member-signature method toList({core::bool* growable = #C2}) → core::List<core::Object*>*; -> core::Iterable::toList
-  abstract member-signature method toSet() → core::Set<core::Object*>*; -> core::Iterable::toSet
-  abstract member-signature get length() → core::int*; -> core::Iterable::length
-  abstract member-signature get isEmpty() → core::bool*; -> core::Iterable::isEmpty
-  abstract member-signature get isNotEmpty() → core::bool*; -> core::Iterable::isNotEmpty
-  abstract member-signature method take(core::int* count) → core::Iterable<core::Object*>*; -> core::Iterable::take
-  abstract member-signature method takeWhile((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::takeWhile
-  abstract member-signature method skip(core::int* count) → core::Iterable<core::Object*>*; -> core::Iterable::skip
-  abstract member-signature method skipWhile((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::skipWhile
-  abstract member-signature method firstWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse = #C3}) → core::Object*; -> core::Iterable::firstWhere
-  abstract member-signature method lastWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse = #C3}) → core::Object*; -> core::Iterable::lastWhere
-  abstract member-signature method singleWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse = #C3}) → core::Object*; -> core::Iterable::singleWhere
-  abstract member-signature method elementAt(core::int* index) → core::Object*; -> core::Iterable::elementAt
-  abstract member-signature method toString() → core::String*; -> core::Iterable::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract member-signature get iterator() → core::Iterator<core::Object*>*; -> core::Iterable::iterator
-}
-static method test() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart:14:8: Error: Too few positional arguments: 1 required, 0 given.
-  print(incorrectArgument: \"fisk\");
-       ^";
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = ""
-  #C2 = true
-  #C3 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.outline.expect
deleted file mode 100644
index 54d1df8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.outline.expect
+++ /dev/null
@@ -1,66 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart:7:7: Error: The non-abstract class 'C' is missing implementations for these members:
-//  - Iterable.iterator
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class C extends Iterable<Object> {
-//       ^
-// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
-//   Iterator<E> get iterator;
-//                   ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Iterable<core::Object*> {
-  synthetic constructor •() → self::C*
-    ;
-  abstract member-signature method cast<R extends core::Object* = dynamic>() → core::Iterable<self::C::cast::R*>*; -> core::Iterable::cast
-  abstract member-signature method followedBy(generic-covariant-impl core::Iterable<core::Object*>* other) → core::Iterable<core::Object*>*; -> core::Iterable::followedBy
-  abstract member-signature method map<T extends core::Object* = dynamic>((core::Object*) →* self::C::map::T* f) → core::Iterable<self::C::map::T*>*; -> core::Iterable::map
-  abstract member-signature method where((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::where
-  abstract member-signature method whereType<T extends core::Object* = dynamic>() → core::Iterable<self::C::whereType::T*>*; -> core::Iterable::whereType
-  abstract member-signature method expand<T extends core::Object* = dynamic>((core::Object*) →* core::Iterable<self::C::expand::T*>* f) → core::Iterable<self::C::expand::T*>*; -> core::Iterable::expand
-  abstract member-signature method contains(core::Object* element) → core::bool*; -> core::Iterable::contains
-  abstract member-signature method forEach((core::Object*) →* void f) → void; -> core::Iterable::forEach
-  abstract member-signature method reduce(generic-covariant-impl (core::Object*, core::Object*) →* core::Object* combine) → core::Object*; -> core::Iterable::reduce
-  abstract member-signature method fold<T extends core::Object* = dynamic>(self::C::fold::T* initialValue, (self::C::fold::T*, core::Object*) →* self::C::fold::T* combine) → self::C::fold::T*; -> core::Iterable::fold
-  abstract member-signature method every((core::Object*) →* core::bool* test) → core::bool*; -> core::Iterable::every
-  abstract member-signature method join([core::String* separator]) → core::String*; -> core::Iterable::join
-  abstract member-signature method any((core::Object*) →* core::bool* test) → core::bool*; -> core::Iterable::any
-  abstract member-signature method toList({core::bool* growable}) → core::List<core::Object*>*; -> core::Iterable::toList
-  abstract member-signature method toSet() → core::Set<core::Object*>*; -> core::Iterable::toSet
-  abstract member-signature get length() → core::int*; -> core::Iterable::length
-  abstract member-signature get isEmpty() → core::bool*; -> core::Iterable::isEmpty
-  abstract member-signature get isNotEmpty() → core::bool*; -> core::Iterable::isNotEmpty
-  abstract member-signature method take(core::int* count) → core::Iterable<core::Object*>*; -> core::Iterable::take
-  abstract member-signature method takeWhile((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::takeWhile
-  abstract member-signature method skip(core::int* count) → core::Iterable<core::Object*>*; -> core::Iterable::skip
-  abstract member-signature method skipWhile((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::skipWhile
-  abstract member-signature method firstWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse}) → core::Object*; -> core::Iterable::firstWhere
-  abstract member-signature method lastWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse}) → core::Object*; -> core::Iterable::lastWhere
-  abstract member-signature method singleWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse}) → core::Object*; -> core::Iterable::singleWhere
-  abstract member-signature method elementAt(core::int* index) → core::Object*; -> core::Iterable::elementAt
-  abstract member-signature method toString() → core::String*; -> core::Iterable::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract member-signature get iterator() → core::Iterator<core::Object*>*; -> core::Iterable::iterator
-}
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.transformed.expect
deleted file mode 100644
index 50bca4d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart.weak.transformed.expect
+++ /dev/null
@@ -1,82 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart:7:7: Error: The non-abstract class 'C' is missing implementations for these members:
-//  - Iterable.iterator
-// Try to either
-//  - provide an implementation,
-//  - inherit an implementation from a superclass or mixin,
-//  - mark the class as abstract, or
-//  - provide a 'noSuchMethod' implementation.
-//
-// class C extends Iterable<Object> {
-//       ^
-// sdk/lib/core/iterable.dart:148:19: Context: 'Iterable.iterator' is defined here.
-//   Iterator<E> get iterator;
-//                   ^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart:14:8: Error: Too few positional arguments: 1 required, 0 given.
-//   print(incorrectArgument: "fisk");
-//        ^
-// sdk/lib/core/print.dart:8:6: Context: Found this candidate, but the arguments don't match.
-// void print(Object? object) {
-//      ^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Iterable<core::Object*> {
-  synthetic constructor •() → self::C*
-    : super core::Iterable::•()
-    ;
-  abstract member-signature method cast<R extends core::Object* = dynamic>() → core::Iterable<self::C::cast::R*>*; -> core::Iterable::cast
-  abstract member-signature method followedBy(generic-covariant-impl core::Iterable<core::Object*>* other) → core::Iterable<core::Object*>*; -> core::Iterable::followedBy
-  abstract member-signature method map<T extends core::Object* = dynamic>((core::Object*) →* self::C::map::T* f) → core::Iterable<self::C::map::T*>*; -> core::Iterable::map
-  abstract member-signature method where((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::where
-  abstract member-signature method whereType<T extends core::Object* = dynamic>() → core::Iterable<self::C::whereType::T*>*; -> core::Iterable::whereType
-  abstract member-signature method expand<T extends core::Object* = dynamic>((core::Object*) →* core::Iterable<self::C::expand::T*>* f) → core::Iterable<self::C::expand::T*>*; -> core::Iterable::expand
-  abstract member-signature method contains(core::Object* element) → core::bool*; -> core::Iterable::contains
-  abstract member-signature method forEach((core::Object*) →* void f) → void; -> core::Iterable::forEach
-  abstract member-signature method reduce(generic-covariant-impl (core::Object*, core::Object*) →* core::Object* combine) → core::Object*; -> core::Iterable::reduce
-  abstract member-signature method fold<T extends core::Object* = dynamic>(self::C::fold::T* initialValue, (self::C::fold::T*, core::Object*) →* self::C::fold::T* combine) → self::C::fold::T*; -> core::Iterable::fold
-  abstract member-signature method every((core::Object*) →* core::bool* test) → core::bool*; -> core::Iterable::every
-  abstract member-signature method join([core::String* separator = #C1]) → core::String*; -> core::Iterable::join
-  abstract member-signature method any((core::Object*) →* core::bool* test) → core::bool*; -> core::Iterable::any
-  abstract member-signature method toList({core::bool* growable = #C2}) → core::List<core::Object*>*; -> core::Iterable::toList
-  abstract member-signature method toSet() → core::Set<core::Object*>*; -> core::Iterable::toSet
-  abstract member-signature get length() → core::int*; -> core::Iterable::length
-  abstract member-signature get isEmpty() → core::bool*; -> core::Iterable::isEmpty
-  abstract member-signature get isNotEmpty() → core::bool*; -> core::Iterable::isNotEmpty
-  abstract member-signature method take(core::int* count) → core::Iterable<core::Object*>*; -> core::Iterable::take
-  abstract member-signature method takeWhile((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::takeWhile
-  abstract member-signature method skip(core::int* count) → core::Iterable<core::Object*>*; -> core::Iterable::skip
-  abstract member-signature method skipWhile((core::Object*) →* core::bool* test) → core::Iterable<core::Object*>*; -> core::Iterable::skipWhile
-  abstract member-signature method firstWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse = #C3}) → core::Object*; -> core::Iterable::firstWhere
-  abstract member-signature method lastWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse = #C3}) → core::Object*; -> core::Iterable::lastWhere
-  abstract member-signature method singleWhere((core::Object*) →* core::bool* test, {generic-covariant-impl () →* core::Object* orElse = #C3}) → core::Object*; -> core::Iterable::singleWhere
-  abstract member-signature method elementAt(core::int* index) → core::Object*; -> core::Iterable::elementAt
-  abstract member-signature method toString() → core::String*; -> core::Iterable::toString
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  abstract member-signature get iterator() → core::Iterator<core::Object*>*; -> core::Iterable::iterator
-}
-static method test() → dynamic {
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/sdk_diagnostic.dart:14:8: Error: Too few positional arguments: 1 required, 0 given.
-  print(incorrectArgument: \"fisk\");
-       ^";
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = ""
-  #C2 = true
-  #C3 = null
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart
deleted file mode 100644
index ce49cc5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.6
-
-main() {
-  final aList = <int>[
-    1,
-    ...[2],
-    ...?[3]
-  ];
-  final aMap = <int, int>{
-    1: 1,
-    ...{2: 2},
-    ...?{3: 3}
-  };
-  final aSet = <int>{
-    1,
-    ...[2],
-    ...?[3]
-  };
-  final aSetOrMap = {...foo()};
-
-  print(aList);
-  print(aSet);
-  print(aMap);
-}
-
-foo() => null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.textual_outline.expect
deleted file mode 100644
index f5f9183..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-foo() => null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.textual_outline_modelled.expect
deleted file mode 100644
index e69d5d9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-foo() => null;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.expect
deleted file mode 100644
index 3740a07..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart:23:21: Error: Not enough type information to disambiguate between literal set and literal map.
-// Try providing type arguments for the literal explicitly to disambiguate it.
-//   final aSetOrMap = {...foo()};
-//                     ^
-//
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method main() → dynamic {
-  final core::List<core::int*>* aList = block {
-    final core::List<core::int*>* #t1 = <core::int*>[1];
-    #t1.{core::List::addAll}{Invariant}(<core::int*>[2]);
-    final core::Iterable<core::int*>* #t2 = <core::int*>[3];
-    if(!#t2.{core::Object::==}(null))
-      #t1.{core::List::addAll}{Invariant}(#t2);
-  } =>#t1;
-  final core::Map<core::int*, core::int*>* aMap = block {
-    final core::Map<core::int*, core::int*>* #t3 = <core::int*, core::int*>{};
-    #t3.{core::Map::[]=}{Invariant}(1, 1);
-    for (final core::MapEntry<core::int*, core::int*>* #t4 in <core::int*, core::int*>{2: 2}.{core::Map::entries})
-      #t3.{core::Map::[]=}{Invariant}(#t4.{core::MapEntry::key}, #t4.{core::MapEntry::value});
-    final core::Map<core::int*, core::int*>* #t5 = <core::int*, core::int*>{3: 3};
-    if(!#t5.{core::Object::==}(null))
-      for (final core::MapEntry<core::int*, core::int*>* #t6 in #t5.{core::Map::entries})
-        #t3.{core::Map::[]=}{Invariant}(#t6.{core::MapEntry::key}, #t6.{core::MapEntry::value});
-  } =>#t3;
-  final core::Set<core::int*>* aSet = block {
-    final core::Set<core::int*>* #t7 = col::LinkedHashSet::•<core::int*>();
-    #t7.{core::Set::add}{Invariant}(1);
-    #t7.{core::Set::addAll}{Invariant}(<core::int*>[2]);
-    final core::Iterable<core::int*>* #t8 = <core::int*>[3];
-    if(!#t8.{core::Object::==}(null))
-      #t7.{core::Set::addAll}{Invariant}(#t8);
-  } =>#t7;
-  final dynamic aSetOrMap = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart:23:21: Error: Not enough type information to disambiguate between literal set and literal map.
-Try providing type arguments for the literal explicitly to disambiguate it.
-  final aSetOrMap = {...foo()};
-                    ^";
-  core::print(aList);
-  core::print(aSet);
-  core::print(aMap);
-}
-static method foo() → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.outline.expect
deleted file mode 100644
index 4c2eb20..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method main() → dynamic
-  ;
-static method foo() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.transformed.expect
deleted file mode 100644
index a68c3f0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart.weak.transformed.expect
+++ /dev/null
@@ -1,58 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart:23:21: Error: Not enough type information to disambiguate between literal set and literal map.
-// Try providing type arguments for the literal explicitly to disambiguate it.
-//   final aSetOrMap = {...foo()};
-//                     ^
-//
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method main() → dynamic {
-  final core::List<core::int*>* aList = block {
-    final core::List<core::int*>* #t1 = core::_GrowableList::_literal1<core::int*>(1);
-    #t1.{core::List::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(2));
-    final core::Iterable<core::int*>* #t2 = core::_GrowableList::_literal1<core::int*>(3);
-    if(!#t2.{core::Object::==}(null))
-      #t1.{core::List::addAll}{Invariant}(#t2);
-  } =>#t1;
-  final core::Map<core::int*, core::int*>* aMap = block {
-    final core::Map<core::int*, core::int*>* #t3 = <core::int*, core::int*>{};
-    #t3.{core::Map::[]=}{Invariant}(1, 1);
-    {
-      core::Iterator<core::MapEntry<core::int*, core::int*>>* :sync-for-iterator = <core::int*, core::int*>{2: 2}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::int*, core::int*>* #t4 = :sync-for-iterator.{core::Iterator::current};
-        #t3.{core::Map::[]=}{Invariant}(#t4.{core::MapEntry::key}, #t4.{core::MapEntry::value});
-      }
-    }
-    final core::Map<core::int*, core::int*>* #t5 = <core::int*, core::int*>{3: 3};
-    if(!#t5.{core::Object::==}(null)) {
-      core::Iterator<core::MapEntry<core::int*, core::int*>>* :sync-for-iterator = #t5.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::int*, core::int*>* #t6 = :sync-for-iterator.{core::Iterator::current};
-        #t3.{core::Map::[]=}{Invariant}(#t6.{core::MapEntry::key}, #t6.{core::MapEntry::value});
-      }
-    }
-  } =>#t3;
-  final core::Set<core::int*>* aSet = block {
-    final core::Set<core::int*>* #t7 = new col::_CompactLinkedHashSet::•<core::int*>();
-    #t7.{core::Set::add}{Invariant}(1);
-    #t7.{core::Set::addAll}{Invariant}(core::_GrowableList::_literal1<core::int*>(2));
-    final core::Iterable<core::int*>* #t8 = core::_GrowableList::_literal1<core::int*>(3);
-    if(!#t8.{core::Object::==}(null))
-      #t7.{core::Set::addAll}{Invariant}(#t8);
-  } =>#t7;
-  final dynamic aSetOrMap = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection.dart:23:21: Error: Not enough type information to disambiguate between literal set and literal map.
-Try providing type arguments for the literal explicitly to disambiguate it.
-  final aSetOrMap = {...foo()};
-                    ^";
-  core::print(aList);
-  core::print(aSet);
-  core::print(aMap);
-}
-static method foo() → dynamic
-  return null;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart
deleted file mode 100644
index c31e437..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart
+++ /dev/null
@@ -1,168 +0,0 @@
-// 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.6
-
-// This test case checks that inference works for spread collections, and that
-// the errors are reported when necessary.
-
-/*@testedFeatures=inference*/
-
-Map<K, V> bar<K, V>() => null;
-
-foo(dynamic dynVar) {
-  List<int> spread = <int>[1, 2, 3];
-  Map<String, int> mapSpread = <String, int>{"foo": 4, "bar": 2};
-  int notSpreadInt = 42;
-  int Function() notSpreadFunction = null;
-  // Note that all values are actually ints.
-  Map<int, num> mapIntNum = <int, num>{42: 42};
-  List<num> listNum = <num>[42];
-
-  var /*@ type=List<dynamic>* */ lhs10 = /*@ typeArgs=dynamic */ [
-    ...
-    /*@ typeArgs=dynamic */ []
-  ];
-
-  var /*@ type=Set<dynamic>* */ set10 = <dynamic>{
-    ... /*@ typeArgs=dynamic */ []
-  };
-
-  var /*@ type=Map<dynamic, dynamic>* */ map10 = <dynamic, dynamic>{
-    ...
-    /*@ typeArgs=dynamic, dynamic */ {}
-  };
-
-  var /*@ type=Map<dynamic, dynamic>* */ map10ambiguous =
-      /*@ typeArgs=dynamic, dynamic */ {
-    ... /*@ typeArgs=dynamic, dynamic */ {}
-  };
-
-  var /*@ type=List<int*>* */ lhs20 = /*@ typeArgs=int* */ [...spread];
-
-  var /*@ type=Set<int*>* */ set20 = /*@ typeArgs=int* */ {...spread, 42};
-
-  var /*@ type=Set<int*>* */ set20ambiguous = /*@ typeArgs=int* */ {...spread};
-
-  var /*@ type=Map<String*, int*>* */ map20 = /*@ typeArgs=String*, int* */
-      {...mapSpread, "baz": 42};
-
-  var /*@ type=Map<String*, int*>* */ map20ambiguous = /*@ typeArgs=String*, int* */
-      {...mapSpread};
-
-  var /*@ type=List<dynamic>* */ lhs21 = /*@ typeArgs=dynamic */ [
-    ...(spread as dynamic)
-  ];
-
-  var /*@ type=Set<dynamic>* */ set21 = /*@ typeArgs=dynamic */ {
-    ...(spread as dynamic),
-    42
-  };
-
-  var /*@ type=Map<dynamic, dynamic>* */ map21 = /*@ typeArgs=dynamic, dynamic */
-      {...(mapSpread as dynamic), "baz": 42};
-
-  dynamic map21ambiguous = {...(mapSpread as dynamic)};
-
-  List<int> lhs22 = /*@ typeArgs=int* */ [... /*@ typeArgs=int* */ []];
-
-  Set<int> set22 = /*@ typeArgs=int* */ {... /*@ typeArgs=int* */ [], 42};
-
-  Set<int> set22ambiguous = /*@ typeArgs=int* */ {... /*@ typeArgs=int* */ []};
-
-  Map<String, int> map22 = /*@ typeArgs=String*, int* */
-      {... /*@ typeArgs=String*, int* */ {}};
-
-  List<List<int>> lhs23 = /*@ typeArgs=List<int*>* */ [
-    ... /*@ typeArgs=List<int*>* */
-    [/*@ typeArgs=int* */ []]
-  ];
-
-  Set<List<int>> set23 = /*@ typeArgs=List<int*>* */ {
-    ... /*@ typeArgs=List<int*>* */
-    [/*@ typeArgs=int* */ []],
-    <int>[42]
-  };
-
-  Set<List<int>> set23ambiguous = /*@ typeArgs=List<int*>* */
-      {
-    ... /*@ typeArgs=List<int*>* */ [/*@ typeArgs=int* */ []]
-  };
-
-  Map<String, List<int>> map23 = /*@ typeArgs=String*, List<int*>* */
-      {
-    ... /*@ typeArgs=String*, List<int*>* */ {"baz": /*@ typeArgs=int* */ [] }
-  };
-
-  dynamic map24ambiguous = {...spread, ...mapSpread};
-
-  int lhs30 = /*@ typeArgs=int* */ [...spread];
-
-  int set30 = /*@ typeArgs=int* */ {...spread, 42};
-
-  int set30ambiguous = /*@ typeArgs=int* */
-      {...spread};
-
-  int map30 = /*@ typeArgs=String*, int* */
-      {...mapSpread, "baz": 42};
-
-  int map30ambiguous = /*@ typeArgs=String*, int* */
-      {...mapSpread};
-
-  List<dynamic> lhs40 = <dynamic>[...notSpreadInt];
-
-  Set<dynamic> set40 = <dynamic>{...notSpreadInt};
-
-  Map<dynamic, dynamic> map40 = <dynamic, dynamic>{...notSpreadInt};
-
-  List<dynamic> lhs50 = <dynamic>[...notSpreadFunction];
-
-  Set<dynamic> set50 = <dynamic>{...notSpreadFunction};
-
-  Map<dynamic, dynamic> map50 = <dynamic, dynamic>{...notSpreadFunction};
-
-  List<String> lhs60 = <String>[...spread];
-
-  Set<String> set60 = <String>{...spread};
-
-  Map<int, int> map60 = <int, int>{...mapSpread};
-
-  Map<String, String> map61 = <String, String>{...mapSpread};
-
-  List<int> lhs70 = <int>[...null];
-
-  Set<int> set70 = <int>{...null};
-
-  var /*@ type=Set<dynamic>* */ set71ambiguous = /*@ typeArgs=dynamic */
-      {
-    ...null,
-    ... /*@ typeArgs=dynamic */
-    []
-  };
-
-  Map<String, int> map70 = <String, int>{...null};
-
-  List<int> lhs80 = <int>[...?null];
-
-  Set<int> set80 = <int>{...?null};
-
-  var /*@ type=Set<dynamic>* */ set81ambiguous = /*@ typeArgs=dynamic */
-      {...?null, ... /*@ typeArgs=dynamic */ []};
-
-  Map<String, int> map80 = <String, int>{...?null};
-
-  var /*@ type=Map<String*, int*>* */ map90 = <String, int>{
-    ... /*@ typeArgs=String*, int* */ bar()
-  };
-
-  List<int> list100 = <int>[...listNum];
-
-  Map<num, int> map100 = <num, int>{...mapIntNum};
-
-  List<int> list110 = <int>[...dynVar];
-
-  Map<num, int> map110 = <num, int>{...dynVar};
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.textual_outline.expect
deleted file mode 100644
index aea5ba4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-Map<K, V> bar<K, V>() => null;
-foo(dynamic dynVar) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.textual_outline_modelled.expect
deleted file mode 100644
index aea5ba4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-Map<K, V> bar<K, V>() => null;
-foo(dynamic dynVar) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.expect
deleted file mode 100644
index dc07d28..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.expect
+++ /dev/null
@@ -1,380 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:66:28: Error: Not enough type information to disambiguate between literal set and literal map.
-// Try providing type arguments for the literal explicitly to disambiguate it.
-//   dynamic map21ambiguous = {...(mapSpread as dynamic)};
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:98:28: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   dynamic map24ambiguous = {...spread, ...mapSpread};
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:100:36: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
-//  - 'List' is from 'dart:core'.
-//   int lhs30 = /*@ typeArgs=int* */ [...spread];
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:102:36: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
-//  - 'Set' is from 'dart:core'.
-//   int set30 = /*@ typeArgs=int* */ {...spread, 42};
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:105:7: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
-//  - 'Set' is from 'dart:core'.
-//       {...spread};
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:108:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
-//  - 'Map' is from 'dart:core'.
-//       {...mapSpread, "baz": 42};
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:111:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
-//  - 'Map' is from 'dart:core'.
-//       {...mapSpread};
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:113:38: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-//   List<dynamic> lhs40 = <dynamic>[...notSpreadInt];
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:115:37: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-//   Set<dynamic> set40 = <dynamic>{...notSpreadInt};
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:117:55: Error: Unexpected type 'int' of a map spread entry.  Expected 'dynamic' or a Map.
-//   Map<dynamic, dynamic> map40 = <dynamic, dynamic>{...notSpreadInt};
-//                                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:119:38: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-//   List<dynamic> lhs50 = <dynamic>[...notSpreadFunction];
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:121:37: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-//   Set<dynamic> set50 = <dynamic>{...notSpreadFunction};
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:123:55: Error: Unexpected type 'int Function()' of a map spread entry.  Expected 'dynamic' or a Map.
-//   Map<dynamic, dynamic> map50 = <dynamic, dynamic>{...notSpreadFunction};
-//                                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:125:36: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-//   List<String> lhs60 = <String>[...spread];
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:127:35: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-//   Set<String> set60 = <String>{...spread};
-//                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:129:39: Error: Can't assign spread entry keys of type 'String' to map entry keys of type 'int'.
-//   Map<int, int> map60 = <int, int>{...mapSpread};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:131:51: Error: Can't assign spread entry values of type 'int' to map entry values of type 'String'.
-//   Map<String, String> map61 = <String, String>{...mapSpread};
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:133:30: Error: Can't spread a value with static type 'Null'.
-//   List<int> lhs70 = <int>[...null];
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:135:29: Error: Can't spread a value with static type 'Null'.
-//   Set<int> set70 = <int>{...null};
-//                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:139:8: Error: Can't spread a value with static type 'Null'.
-//     ...null,
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:139:8: Error: Expected ',' before this.
-//     ...null,
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:144:45: Error: Can't spread a value with static type 'Null'.
-//   Map<String, int> map70 = <String, int>{...null};
-//                                             ^
-//
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method bar<K extends core::Object* = dynamic, V extends core::Object* = dynamic>() → core::Map<self::bar::K*, self::bar::V*>*
-  return null;
-static method foo(dynamic dynVar) → dynamic {
-  core::List<core::int*>* spread = <core::int*>[1, 2, 3];
-  core::Map<core::String*, core::int*>* mapSpread = <core::String*, core::int*>{"foo": 4, "bar": 2};
-  core::int* notSpreadInt = 42;
-  () →* core::int* notSpreadFunction = null;
-  core::Map<core::int*, core::num*>* mapIntNum = <core::int*, core::num*>{42: 42};
-  core::List<core::num*>* listNum = <core::num*>[42];
-  core::List<dynamic>* lhs10 = block {
-    final core::List<dynamic>* #t1 = core::List::of<dynamic>(<dynamic>[]);
-  } =>#t1;
-  core::Set<dynamic>* set10 = block {
-    final core::Set<dynamic>* #t2 = col::LinkedHashSet::of<dynamic>(<dynamic>[]);
-  } =>#t2;
-  core::Map<dynamic, dynamic>* map10 = block {
-    final core::Map<dynamic, dynamic>* #t3 = <dynamic, dynamic>{};
-    for (final core::MapEntry<dynamic, dynamic>* #t4 in <dynamic, dynamic>{}.{core::Map::entries})
-      #t3.{core::Map::[]=}{Invariant}(#t4.{core::MapEntry::key}, #t4.{core::MapEntry::value});
-  } =>#t3;
-  core::Map<dynamic, dynamic>* map10ambiguous = block {
-    final core::Map<dynamic, dynamic>* #t5 = <dynamic, dynamic>{};
-    for (final core::MapEntry<dynamic, dynamic>* #t6 in <dynamic, dynamic>{}.{core::Map::entries})
-      #t5.{core::Map::[]=}{Invariant}(#t6.{core::MapEntry::key}, #t6.{core::MapEntry::value});
-  } =>#t5;
-  core::List<core::int*>* lhs20 = block {
-    final core::List<core::int*>* #t7 = core::List::of<core::int*>(spread);
-  } =>#t7;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t8 = col::LinkedHashSet::of<core::int*>(spread);
-    #t8.{core::Set::add}{Invariant}(42);
-  } =>#t8;
-  core::Set<core::int*>* set20ambiguous = block {
-    final core::Set<core::int*>* #t9 = col::LinkedHashSet::•<core::int*>();
-    for (final dynamic #t10 in spread) {
-      final core::int* #t11 = #t10 as{TypeError} core::int*;
-      #t9.{core::Set::add}{Invariant}(#t11);
-    }
-  } =>#t9;
-  core::Map<core::String*, core::int*>* map20 = block {
-    final core::Map<core::String*, core::int*>* #t12 = <core::String*, core::int*>{};
-    for (final core::MapEntry<core::String*, core::int*>* #t13 in mapSpread.{core::Map::entries})
-      #t12.{core::Map::[]=}{Invariant}(#t13.{core::MapEntry::key}, #t13.{core::MapEntry::value});
-    #t12.{core::Map::[]=}{Invariant}("baz", 42);
-  } =>#t12;
-  core::Map<core::String*, core::int*>* map20ambiguous = block {
-    final core::Map<core::String*, core::int*>* #t14 = <core::String*, core::int*>{};
-    for (final core::MapEntry<core::String*, core::int*>* #t15 in mapSpread.{core::Map::entries})
-      #t14.{core::Map::[]=}{Invariant}(#t15.{core::MapEntry::key}, #t15.{core::MapEntry::value});
-  } =>#t14;
-  core::List<dynamic>* lhs21 = block {
-    final core::List<dynamic>* #t16 = core::List::of<dynamic>((spread as dynamic) as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-  } =>#t16;
-  core::Set<dynamic>* set21 = block {
-    final core::Set<dynamic>* #t17 = col::LinkedHashSet::of<dynamic>((spread as dynamic) as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t17.{core::Set::add}{Invariant}(42);
-  } =>#t17;
-  core::Map<dynamic, dynamic>* map21 = block {
-    final core::Map<dynamic, dynamic>* #t18 = <dynamic, dynamic>{};
-    for (final core::MapEntry<dynamic, dynamic>* #t19 in ((mapSpread as dynamic) as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries})
-      #t18.{core::Map::[]=}{Invariant}(#t19.{core::MapEntry::key}, #t19.{core::MapEntry::value});
-    #t18.{core::Map::[]=}{Invariant}("baz", 42);
-  } =>#t18;
-  dynamic map21ambiguous = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:66:28: Error: Not enough type information to disambiguate between literal set and literal map.
-Try providing type arguments for the literal explicitly to disambiguate it.
-  dynamic map21ambiguous = {...(mapSpread as dynamic)};
-                           ^";
-  core::List<core::int*>* lhs22 = block {
-    final core::List<core::int*>* #t20 = core::List::of<core::int*>(<core::int*>[]);
-  } =>#t20;
-  core::Set<core::int*>* set22 = block {
-    final core::Set<core::int*>* #t21 = col::LinkedHashSet::of<core::int*>(<core::int*>[]);
-    #t21.{core::Set::add}{Invariant}(42);
-  } =>#t21;
-  core::Set<core::int*>* set22ambiguous = block {
-    final core::Set<core::int*>* #t22 = col::LinkedHashSet::•<core::int*>();
-    for (final dynamic #t23 in <core::int*>[]) {
-      final core::int* #t24 = #t23 as{TypeError} core::int*;
-      #t22.{core::Set::add}{Invariant}(#t24);
-    }
-  } =>#t22;
-  core::Map<core::String*, core::int*>* map22 = block {
-    final core::Map<core::String*, core::int*>* #t25 = <core::String*, core::int*>{};
-    for (final core::MapEntry<core::String*, core::int*>* #t26 in <core::String*, core::int*>{}.{core::Map::entries})
-      #t25.{core::Map::[]=}{Invariant}(#t26.{core::MapEntry::key}, #t26.{core::MapEntry::value});
-  } =>#t25;
-  core::List<core::List<core::int*>*>* lhs23 = block {
-    final core::List<core::List<core::int*>*>* #t27 = core::List::of<core::List<core::int*>*>(<core::List<core::int*>*>[<core::int*>[]]);
-  } =>#t27;
-  core::Set<core::List<core::int*>*>* set23 = block {
-    final core::Set<core::List<core::int*>*>* #t28 = col::LinkedHashSet::of<core::List<core::int*>*>(<core::List<core::int*>*>[<core::int*>[]]);
-    #t28.{core::Set::add}{Invariant}(<core::int*>[42]);
-  } =>#t28;
-  core::Set<core::List<core::int*>*>* set23ambiguous = block {
-    final core::Set<core::List<core::int*>*>* #t29 = col::LinkedHashSet::•<core::List<core::int*>*>();
-    for (final dynamic #t30 in <core::List<core::int*>*>[<core::int*>[]]) {
-      final core::List<core::int*>* #t31 = #t30 as{TypeError} core::List<core::int*>*;
-      #t29.{core::Set::add}{Invariant}(#t31);
-    }
-  } =>#t29;
-  core::Map<core::String*, core::List<core::int*>*>* map23 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t32 = <core::String*, core::List<core::int*>*>{};
-    for (final core::MapEntry<core::String*, core::List<core::int*>*>* #t33 in <core::String*, core::List<core::int*>*>{"baz": <core::int*>[]}.{core::Map::entries})
-      #t32.{core::Map::[]=}{Invariant}(#t33.{core::MapEntry::key}, #t33.{core::MapEntry::value});
-  } =>#t32;
-  dynamic map24ambiguous = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:98:28: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  dynamic map24ambiguous = {...spread, ...mapSpread};
-                           ^";
-  core::int* lhs30 = let final<BottomType> #t34 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:100:36: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
- - 'List' is from 'dart:core'.
-  int lhs30 = /*@ typeArgs=int* */ [...spread];
-                                   ^" in ( block {
-    final core::List<core::int*>* #t35 = core::List::of<core::int*>(spread);
-  } =>#t35) as{TypeError} core::int*;
-  core::int* set30 = let final<BottomType> #t36 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:102:36: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
- - 'Set' is from 'dart:core'.
-  int set30 = /*@ typeArgs=int* */ {...spread, 42};
-                                   ^" in ( block {
-    final core::Set<core::int*>* #t37 = col::LinkedHashSet::of<core::int*>(spread);
-    #t37.{core::Set::add}{Invariant}(42);
-  } =>#t37) as{TypeError} core::int*;
-  core::int* set30ambiguous = let final<BottomType> #t38 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:105:7: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
- - 'Set' is from 'dart:core'.
-      {...spread};
-      ^" in ( block {
-    final core::Set<core::int*>* #t39 = col::LinkedHashSet::•<core::int*>();
-    for (final dynamic #t40 in spread) {
-      final core::int* #t41 = #t40 as{TypeError} core::int*;
-      #t39.{core::Set::add}{Invariant}(#t41);
-    }
-  } =>#t39) as{TypeError} core::int*;
-  core::int* map30 = let final<BottomType> #t42 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:108:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
- - 'Map' is from 'dart:core'.
-      {...mapSpread, \"baz\": 42};
-      ^" in ( block {
-    final core::Map<core::String*, core::int*>* #t43 = <core::String*, core::int*>{};
-    for (final core::MapEntry<core::String*, core::int*>* #t44 in mapSpread.{core::Map::entries})
-      #t43.{core::Map::[]=}{Invariant}(#t44.{core::MapEntry::key}, #t44.{core::MapEntry::value});
-    #t43.{core::Map::[]=}{Invariant}("baz", 42);
-  } =>#t43) as{TypeError} core::int*;
-  core::int* map30ambiguous = let final<BottomType> #t45 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:111:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
- - 'Map' is from 'dart:core'.
-      {...mapSpread};
-      ^" in ( block {
-    final core::Map<core::String*, core::int*>* #t46 = <core::String*, core::int*>{};
-    for (final core::MapEntry<core::String*, core::int*>* #t47 in mapSpread.{core::Map::entries})
-      #t46.{core::Map::[]=}{Invariant}(#t47.{core::MapEntry::key}, #t47.{core::MapEntry::value});
-  } =>#t46) as{TypeError} core::int*;
-  core::List<dynamic>* lhs40 = <dynamic>[invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:113:38: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-  List<dynamic> lhs40 = <dynamic>[...notSpreadInt];
-                                     ^"];
-  core::Set<dynamic>* set40 = block {
-    final core::Set<dynamic>* #t48 = col::LinkedHashSet::•<dynamic>();
-    #t48.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:115:37: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-  Set<dynamic> set40 = <dynamic>{...notSpreadInt};
-                                    ^");
-  } =>#t48;
-  core::Map<dynamic, dynamic>* map40 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:117:55: Error: Unexpected type 'int' of a map spread entry.  Expected 'dynamic' or a Map.
-  Map<dynamic, dynamic> map40 = <dynamic, dynamic>{...notSpreadInt};
-                                                      ^": null};
-  core::List<dynamic>* lhs50 = <dynamic>[invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:119:38: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-  List<dynamic> lhs50 = <dynamic>[...notSpreadFunction];
-                                     ^"];
-  core::Set<dynamic>* set50 = block {
-    final core::Set<dynamic>* #t49 = col::LinkedHashSet::•<dynamic>();
-    #t49.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:121:37: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-  Set<dynamic> set50 = <dynamic>{...notSpreadFunction};
-                                    ^");
-  } =>#t49;
-  core::Map<dynamic, dynamic>* map50 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:123:55: Error: Unexpected type 'int Function()' of a map spread entry.  Expected 'dynamic' or a Map.
-  Map<dynamic, dynamic> map50 = <dynamic, dynamic>{...notSpreadFunction};
-                                                      ^": null};
-  core::List<core::String*>* lhs60 = <core::String*>[invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:125:36: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-  List<String> lhs60 = <String>[...spread];
-                                   ^"];
-  core::Set<core::String*>* set60 = block {
-    final core::Set<core::String*>* #t50 = col::LinkedHashSet::•<core::String*>();
-    #t50.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:127:35: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-  Set<String> set60 = <String>{...spread};
-                                  ^");
-  } =>#t50;
-  core::Map<core::int*, core::int*>* map60 = <core::int*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:129:39: Error: Can't assign spread entry keys of type 'String' to map entry keys of type 'int'.
-  Map<int, int> map60 = <int, int>{...mapSpread};
-                                      ^": null};
-  core::Map<core::String*, core::String*>* map61 = <core::String*, core::String*>{null: invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:131:51: Error: Can't assign spread entry values of type 'int' to map entry values of type 'String'.
-  Map<String, String> map61 = <String, String>{...mapSpread};
-                                                  ^"};
-  core::List<core::int*>* lhs70 = <core::int*>[invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:133:30: Error: Can't spread a value with static type 'Null'.
-  List<int> lhs70 = <int>[...null];
-                             ^"];
-  core::Set<core::int*>* set70 = block {
-    final core::Set<core::int*>* #t51 = col::LinkedHashSet::•<core::int*>();
-    #t51.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:135:29: Error: Can't spread a value with static type 'Null'.
-  Set<int> set70 = <int>{...null};
-                            ^");
-  } =>#t51;
-  core::Set<dynamic>* set71ambiguous = block {
-    final core::Set<dynamic>* #t52 = col::LinkedHashSet::•<dynamic>();
-    #t52.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:139:8: Error: Expected ',' before this.
-    ...null,
-       ^");
-    for (final dynamic #t53 in <dynamic>[]) {
-      final dynamic #t54 = #t53 as{TypeError} dynamic;
-      #t52.{core::Set::add}{Invariant}(#t54);
-    }
-  } =>#t52;
-  core::Map<core::String*, core::int*>* map70 = <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:144:45: Error: Can't spread a value with static type 'Null'.
-  Map<String, int> map70 = <String, int>{...null};
-                                            ^": null};
-  core::List<core::int*>* lhs80 = block {
-    final core::List<core::int*>* #t55 = <core::int*>[];
-    final core::Iterable<core::int*>* #t56 = null;
-    if(!#t56.{core::Object::==}(null))
-      #t55.{core::List::addAll}{Invariant}(#t56);
-  } =>#t55;
-  core::Set<core::int*>* set80 = block {
-    final core::Set<core::int*>* #t57 = col::LinkedHashSet::•<core::int*>();
-    final core::Iterable<core::int*>* #t58 = null;
-    if(!#t58.{core::Object::==}(null))
-      #t57.{core::Set::addAll}{Invariant}(#t58);
-  } =>#t57;
-  core::Set<dynamic>* set81ambiguous = block {
-    final core::Set<dynamic>* #t59 = col::LinkedHashSet::•<dynamic>();
-    final core::Iterable<dynamic>* #t60 = null;
-    if(!#t60.{core::Object::==}(null))
-      for (final dynamic #t61 in #t60) {
-        final dynamic #t62 = #t61 as{TypeError} dynamic;
-        #t59.{core::Set::add}{Invariant}(#t62);
-      }
-    for (final dynamic #t63 in <dynamic>[]) {
-      final dynamic #t64 = #t63 as{TypeError} dynamic;
-      #t59.{core::Set::add}{Invariant}(#t64);
-    }
-  } =>#t59;
-  core::Map<core::String*, core::int*>* map80 = block {
-    final core::Map<core::String*, core::int*>* #t65 = <core::String*, core::int*>{};
-    final core::Map<core::String*, core::int*>* #t66 = null;
-    if(!#t66.{core::Object::==}(null))
-      for (final core::MapEntry<core::String*, core::int*>* #t67 in #t66.{core::Map::entries})
-        #t65.{core::Map::[]=}{Invariant}(#t67.{core::MapEntry::key}, #t67.{core::MapEntry::value});
-  } =>#t65;
-  core::Map<core::String*, core::int*>* map90 = block {
-    final core::Map<core::String*, core::int*>* #t68 = <core::String*, core::int*>{};
-    for (final core::MapEntry<core::String*, core::int*>* #t69 in self::bar<core::String*, core::int*>().{core::Map::entries})
-      #t68.{core::Map::[]=}{Invariant}(#t69.{core::MapEntry::key}, #t69.{core::MapEntry::value});
-  } =>#t68;
-  core::List<core::int*>* list100 = block {
-    final core::List<core::int*>* #t70 = <core::int*>[];
-    for (final dynamic #t71 in listNum) {
-      final core::int* #t72 = #t71 as{TypeError} core::int*;
-      #t70.{core::List::add}{Invariant}(#t72);
-    }
-  } =>#t70;
-  core::Map<core::num*, core::int*>* map100 = block {
-    final core::Map<core::num*, core::int*>* #t73 = <core::num*, core::int*>{};
-    for (final core::MapEntry<dynamic, dynamic>* #t74 in mapIntNum.{core::Map::entries}) {
-      final core::num* #t75 = #t74.{core::MapEntry::key} as{TypeError} core::num*;
-      final core::int* #t76 = #t74.{core::MapEntry::value} as{TypeError} core::int*;
-      #t73.{core::Map::[]=}{Invariant}(#t75, #t76);
-    }
-  } =>#t73;
-  core::List<core::int*>* list110 = block {
-    final core::List<core::int*>* #t77 = <core::int*>[];
-    for (final dynamic #t78 in dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*) {
-      final core::int* #t79 = #t78 as{TypeError} core::int*;
-      #t77.{core::List::add}{Invariant}(#t79);
-    }
-  } =>#t77;
-  core::Map<core::num*, core::int*>* map110 = block {
-    final core::Map<core::num*, core::int*>* #t80 = <core::num*, core::int*>{};
-    for (final core::MapEntry<dynamic, dynamic>* #t81 in (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}) {
-      final core::num* #t82 = #t81.{core::MapEntry::key} as{TypeError} core::num*;
-      final core::int* #t83 = #t81.{core::MapEntry::value} as{TypeError} core::int*;
-      #t80.{core::Map::[]=}{Invariant}(#t82, #t83);
-    }
-  } =>#t80;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.outline.expect
deleted file mode 100644
index 9f3c893..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method bar<K extends core::Object* = dynamic, V extends core::Object* = dynamic>() → core::Map<self::bar::K*, self::bar::V*>*
-  ;
-static method foo(dynamic dynVar) → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.transformed.expect
deleted file mode 100644
index b5daed3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart.weak.transformed.expect
+++ /dev/null
@@ -1,499 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:66:28: Error: Not enough type information to disambiguate between literal set and literal map.
-// Try providing type arguments for the literal explicitly to disambiguate it.
-//   dynamic map21ambiguous = {...(mapSpread as dynamic)};
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:98:28: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-//   dynamic map24ambiguous = {...spread, ...mapSpread};
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:100:36: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
-//  - 'List' is from 'dart:core'.
-//   int lhs30 = /*@ typeArgs=int* */ [...spread];
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:102:36: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
-//  - 'Set' is from 'dart:core'.
-//   int set30 = /*@ typeArgs=int* */ {...spread, 42};
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:105:7: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
-//  - 'Set' is from 'dart:core'.
-//       {...spread};
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:108:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
-//  - 'Map' is from 'dart:core'.
-//       {...mapSpread, "baz": 42};
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:111:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
-//  - 'Map' is from 'dart:core'.
-//       {...mapSpread};
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:113:38: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-//   List<dynamic> lhs40 = <dynamic>[...notSpreadInt];
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:115:37: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-//   Set<dynamic> set40 = <dynamic>{...notSpreadInt};
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:117:55: Error: Unexpected type 'int' of a map spread entry.  Expected 'dynamic' or a Map.
-//   Map<dynamic, dynamic> map40 = <dynamic, dynamic>{...notSpreadInt};
-//                                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:119:38: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-//   List<dynamic> lhs50 = <dynamic>[...notSpreadFunction];
-//                                      ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:121:37: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-//   Set<dynamic> set50 = <dynamic>{...notSpreadFunction};
-//                                     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:123:55: Error: Unexpected type 'int Function()' of a map spread entry.  Expected 'dynamic' or a Map.
-//   Map<dynamic, dynamic> map50 = <dynamic, dynamic>{...notSpreadFunction};
-//                                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:125:36: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-//   List<String> lhs60 = <String>[...spread];
-//                                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:127:35: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-//   Set<String> set60 = <String>{...spread};
-//                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:129:39: Error: Can't assign spread entry keys of type 'String' to map entry keys of type 'int'.
-//   Map<int, int> map60 = <int, int>{...mapSpread};
-//                                       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:131:51: Error: Can't assign spread entry values of type 'int' to map entry values of type 'String'.
-//   Map<String, String> map61 = <String, String>{...mapSpread};
-//                                                   ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:133:30: Error: Can't spread a value with static type 'Null'.
-//   List<int> lhs70 = <int>[...null];
-//                              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:135:29: Error: Can't spread a value with static type 'Null'.
-//   Set<int> set70 = <int>{...null};
-//                             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:139:8: Error: Can't spread a value with static type 'Null'.
-//     ...null,
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:139:8: Error: Expected ',' before this.
-//     ...null,
-//        ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:144:45: Error: Can't spread a value with static type 'Null'.
-//   Map<String, int> map70 = <String, int>{...null};
-//                                             ^
-//
-import self as self;
-import "dart:core" as core;
-import "dart:collection" as col;
-
-static method bar<K extends core::Object* = dynamic, V extends core::Object* = dynamic>() → core::Map<self::bar::K*, self::bar::V*>*
-  return null;
-static method foo(dynamic dynVar) → dynamic {
-  core::List<core::int*>* spread = core::_GrowableList::_literal3<core::int*>(1, 2, 3);
-  core::Map<core::String*, core::int*>* mapSpread = <core::String*, core::int*>{"foo": 4, "bar": 2};
-  core::int* notSpreadInt = 42;
-  () →* core::int* notSpreadFunction = null;
-  core::Map<core::int*, core::num*>* mapIntNum = <core::int*, core::num*>{42: 42};
-  core::List<core::num*>* listNum = core::_GrowableList::_literal1<core::num*>(42);
-  core::List<dynamic>* lhs10 = block {
-    final core::List<dynamic>* #t1 = core::List::of<dynamic>(core::_GrowableList::•<dynamic>(0));
-  } =>#t1;
-  core::Set<dynamic>* set10 = block {
-    final core::Set<dynamic>* #t2 = col::LinkedHashSet::of<dynamic>(core::_GrowableList::•<dynamic>(0));
-  } =>#t2;
-  core::Map<dynamic, dynamic>* map10 = block {
-    final core::Map<dynamic, dynamic>* #t3 = <dynamic, dynamic>{};
-    {
-      core::Iterator<core::MapEntry<dynamic, dynamic>>* :sync-for-iterator = <dynamic, dynamic>{}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<dynamic, dynamic>* #t4 = :sync-for-iterator.{core::Iterator::current};
-        #t3.{core::Map::[]=}{Invariant}(#t4.{core::MapEntry::key}, #t4.{core::MapEntry::value});
-      }
-    }
-  } =>#t3;
-  core::Map<dynamic, dynamic>* map10ambiguous = block {
-    final core::Map<dynamic, dynamic>* #t5 = <dynamic, dynamic>{};
-    {
-      core::Iterator<core::MapEntry<dynamic, dynamic>>* :sync-for-iterator = <dynamic, dynamic>{}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<dynamic, dynamic>* #t6 = :sync-for-iterator.{core::Iterator::current};
-        #t5.{core::Map::[]=}{Invariant}(#t6.{core::MapEntry::key}, #t6.{core::MapEntry::value});
-      }
-    }
-  } =>#t5;
-  core::List<core::int*>* lhs20 = block {
-    final core::List<core::int*>* #t7 = core::List::of<core::int*>(spread);
-  } =>#t7;
-  core::Set<core::int*>* set20 = block {
-    final core::Set<core::int*>* #t8 = col::LinkedHashSet::of<core::int*>(spread);
-    #t8.{core::Set::add}{Invariant}(42);
-  } =>#t8;
-  core::Set<core::int*>* set20ambiguous = block {
-    final core::Set<core::int*>* #t9 = new col::_CompactLinkedHashSet::•<core::int*>();
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = spread.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t10 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t11 = #t10 as{TypeError} core::int*;
-          #t9.{core::Set::add}{Invariant}(#t11);
-        }
-      }
-    }
-  } =>#t9;
-  core::Map<core::String*, core::int*>* map20 = block {
-    final core::Map<core::String*, core::int*>* #t12 = <core::String*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapSpread.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t13 = :sync-for-iterator.{core::Iterator::current};
-        #t12.{core::Map::[]=}{Invariant}(#t13.{core::MapEntry::key}, #t13.{core::MapEntry::value});
-      }
-    }
-    #t12.{core::Map::[]=}{Invariant}("baz", 42);
-  } =>#t12;
-  core::Map<core::String*, core::int*>* map20ambiguous = block {
-    final core::Map<core::String*, core::int*>* #t14 = <core::String*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapSpread.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t15 = :sync-for-iterator.{core::Iterator::current};
-        #t14.{core::Map::[]=}{Invariant}(#t15.{core::MapEntry::key}, #t15.{core::MapEntry::value});
-      }
-    }
-  } =>#t14;
-  core::List<dynamic>* lhs21 = block {
-    final core::List<dynamic>* #t16 = core::List::of<dynamic>((spread as dynamic) as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-  } =>#t16;
-  core::Set<dynamic>* set21 = block {
-    final core::Set<dynamic>* #t17 = col::LinkedHashSet::of<dynamic>((spread as dynamic) as{TypeError,ForDynamic} core::Iterable<dynamic>*);
-    #t17.{core::Set::add}{Invariant}(42);
-  } =>#t17;
-  core::Map<dynamic, dynamic>* map21 = block {
-    final core::Map<dynamic, dynamic>* #t18 = <dynamic, dynamic>{};
-    {
-      core::Iterator<core::MapEntry<dynamic, dynamic>>* :sync-for-iterator = ((mapSpread as dynamic) as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<dynamic, dynamic>* #t19 = :sync-for-iterator.{core::Iterator::current};
-        #t18.{core::Map::[]=}{Invariant}(#t19.{core::MapEntry::key}, #t19.{core::MapEntry::value});
-      }
-    }
-    #t18.{core::Map::[]=}{Invariant}("baz", 42);
-  } =>#t18;
-  dynamic map21ambiguous = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:66:28: Error: Not enough type information to disambiguate between literal set and literal map.
-Try providing type arguments for the literal explicitly to disambiguate it.
-  dynamic map21ambiguous = {...(mapSpread as dynamic)};
-                           ^";
-  core::List<core::int*>* lhs22 = block {
-    final core::List<core::int*>* #t20 = core::List::of<core::int*>(core::_GrowableList::•<core::int*>(0));
-  } =>#t20;
-  core::Set<core::int*>* set22 = block {
-    final core::Set<core::int*>* #t21 = col::LinkedHashSet::of<core::int*>(core::_GrowableList::•<core::int*>(0));
-    #t21.{core::Set::add}{Invariant}(42);
-  } =>#t21;
-  core::Set<core::int*>* set22ambiguous = block {
-    final core::Set<core::int*>* #t22 = new col::_CompactLinkedHashSet::•<core::int*>();
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = core::_GrowableList::•<core::int*>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t23 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t24 = #t23 as{TypeError} core::int*;
-          #t22.{core::Set::add}{Invariant}(#t24);
-        }
-      }
-    }
-  } =>#t22;
-  core::Map<core::String*, core::int*>* map22 = block {
-    final core::Map<core::String*, core::int*>* #t25 = <core::String*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = <core::String*, core::int*>{}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t26 = :sync-for-iterator.{core::Iterator::current};
-        #t25.{core::Map::[]=}{Invariant}(#t26.{core::MapEntry::key}, #t26.{core::MapEntry::value});
-      }
-    }
-  } =>#t25;
-  core::List<core::List<core::int*>*>* lhs23 = block {
-    final core::List<core::List<core::int*>*>* #t27 = core::List::of<core::List<core::int*>*>(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-  } =>#t27;
-  core::Set<core::List<core::int*>*>* set23 = block {
-    final core::Set<core::List<core::int*>*>* #t28 = col::LinkedHashSet::of<core::List<core::int*>*>(core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)));
-    #t28.{core::Set::add}{Invariant}(core::_GrowableList::_literal1<core::int*>(42));
-  } =>#t28;
-  core::Set<core::List<core::int*>*>* set23ambiguous = block {
-    final core::Set<core::List<core::int*>*>* #t29 = new col::_CompactLinkedHashSet::•<core::List<core::int*>*>();
-    {
-      core::Iterator<core::List<core::int*>*>* :sync-for-iterator = core::_GrowableList::_literal1<core::List<core::int*>*>(core::_GrowableList::•<core::int*>(0)).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t30 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::List<core::int*>* #t31 = #t30 as{TypeError} core::List<core::int*>*;
-          #t29.{core::Set::add}{Invariant}(#t31);
-        }
-      }
-    }
-  } =>#t29;
-  core::Map<core::String*, core::List<core::int*>*>* map23 = block {
-    final core::Map<core::String*, core::List<core::int*>*>* #t32 = <core::String*, core::List<core::int*>*>{};
-    {
-      core::Iterator<core::MapEntry<core::String*, core::List<core::int*>*>>* :sync-for-iterator = <core::String*, core::List<core::int*>*>{"baz": core::_GrowableList::•<core::int*>(0)}.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::List<core::int*>*>* #t33 = :sync-for-iterator.{core::Iterator::current};
-        #t32.{core::Map::[]=}{Invariant}(#t33.{core::MapEntry::key}, #t33.{core::MapEntry::value});
-      }
-    }
-  } =>#t32;
-  dynamic map24ambiguous = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:98:28: Error: Both Iterable and Map spread elements encountered in ambiguous literal.
-  dynamic map24ambiguous = {...spread, ...mapSpread};
-                           ^";
-  core::int* lhs30 = let final<BottomType> #t34 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:100:36: Error: A value of type 'List<int>' can't be assigned to a variable of type 'int'.
- - 'List' is from 'dart:core'.
-  int lhs30 = /*@ typeArgs=int* */ [...spread];
-                                   ^" in ( block {
-    final core::List<core::int*>* #t35 = core::List::of<core::int*>(spread);
-  } =>#t35) as{TypeError} core::int*;
-  core::int* set30 = let final<BottomType> #t36 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:102:36: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
- - 'Set' is from 'dart:core'.
-  int set30 = /*@ typeArgs=int* */ {...spread, 42};
-                                   ^" in ( block {
-    final core::Set<core::int*>* #t37 = col::LinkedHashSet::of<core::int*>(spread);
-    #t37.{core::Set::add}{Invariant}(42);
-  } =>#t37) as{TypeError} core::int*;
-  core::int* set30ambiguous = let final<BottomType> #t38 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:105:7: Error: A value of type 'Set<int>' can't be assigned to a variable of type 'int'.
- - 'Set' is from 'dart:core'.
-      {...spread};
-      ^" in ( block {
-    final core::Set<core::int*>* #t39 = new col::_CompactLinkedHashSet::•<core::int*>();
-    {
-      core::Iterator<core::int*>* :sync-for-iterator = spread.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t40 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t41 = #t40 as{TypeError} core::int*;
-          #t39.{core::Set::add}{Invariant}(#t41);
-        }
-      }
-    }
-  } =>#t39) as{TypeError} core::int*;
-  core::int* map30 = let final<BottomType> #t42 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:108:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
- - 'Map' is from 'dart:core'.
-      {...mapSpread, \"baz\": 42};
-      ^" in ( block {
-    final core::Map<core::String*, core::int*>* #t43 = <core::String*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapSpread.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t44 = :sync-for-iterator.{core::Iterator::current};
-        #t43.{core::Map::[]=}{Invariant}(#t44.{core::MapEntry::key}, #t44.{core::MapEntry::value});
-      }
-    }
-    #t43.{core::Map::[]=}{Invariant}("baz", 42);
-  } =>#t43) as{TypeError} core::int*;
-  core::int* map30ambiguous = let final<BottomType> #t45 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:111:7: Error: A value of type 'Map<String, int>' can't be assigned to a variable of type 'int'.
- - 'Map' is from 'dart:core'.
-      {...mapSpread};
-      ^" in ( block {
-    final core::Map<core::String*, core::int*>* #t46 = <core::String*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = mapSpread.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t47 = :sync-for-iterator.{core::Iterator::current};
-        #t46.{core::Map::[]=}{Invariant}(#t47.{core::MapEntry::key}, #t47.{core::MapEntry::value});
-      }
-    }
-  } =>#t46) as{TypeError} core::int*;
-  core::List<dynamic>* lhs40 = core::_GrowableList::_literal1<dynamic>(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:113:38: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-  List<dynamic> lhs40 = <dynamic>[...notSpreadInt];
-                                     ^");
-  core::Set<dynamic>* set40 = block {
-    final core::Set<dynamic>* #t48 = new col::_CompactLinkedHashSet::•<dynamic>();
-    #t48.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:115:37: Error: Unexpected type 'int' of a spread.  Expected 'dynamic' or an Iterable.
-  Set<dynamic> set40 = <dynamic>{...notSpreadInt};
-                                    ^");
-  } =>#t48;
-  core::Map<dynamic, dynamic>* map40 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:117:55: Error: Unexpected type 'int' of a map spread entry.  Expected 'dynamic' or a Map.
-  Map<dynamic, dynamic> map40 = <dynamic, dynamic>{...notSpreadInt};
-                                                      ^": null};
-  core::List<dynamic>* lhs50 = core::_GrowableList::_literal1<dynamic>(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:119:38: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-  List<dynamic> lhs50 = <dynamic>[...notSpreadFunction];
-                                     ^");
-  core::Set<dynamic>* set50 = block {
-    final core::Set<dynamic>* #t49 = new col::_CompactLinkedHashSet::•<dynamic>();
-    #t49.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:121:37: Error: Unexpected type 'int Function()' of a spread.  Expected 'dynamic' or an Iterable.
-  Set<dynamic> set50 = <dynamic>{...notSpreadFunction};
-                                    ^");
-  } =>#t49;
-  core::Map<dynamic, dynamic>* map50 = <dynamic, dynamic>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:123:55: Error: Unexpected type 'int Function()' of a map spread entry.  Expected 'dynamic' or a Map.
-  Map<dynamic, dynamic> map50 = <dynamic, dynamic>{...notSpreadFunction};
-                                                      ^": null};
-  core::List<core::String*>* lhs60 = core::_GrowableList::_literal1<core::String*>(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:125:36: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-  List<String> lhs60 = <String>[...spread];
-                                   ^");
-  core::Set<core::String*>* set60 = block {
-    final core::Set<core::String*>* #t50 = new col::_CompactLinkedHashSet::•<core::String*>();
-    #t50.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:127:35: Error: Can't assign spread elements of type 'int' to collection elements of type 'String'.
-  Set<String> set60 = <String>{...spread};
-                                  ^");
-  } =>#t50;
-  core::Map<core::int*, core::int*>* map60 = <core::int*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:129:39: Error: Can't assign spread entry keys of type 'String' to map entry keys of type 'int'.
-  Map<int, int> map60 = <int, int>{...mapSpread};
-                                      ^": null};
-  core::Map<core::String*, core::String*>* map61 = <core::String*, core::String*>{null: invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:131:51: Error: Can't assign spread entry values of type 'int' to map entry values of type 'String'.
-  Map<String, String> map61 = <String, String>{...mapSpread};
-                                                  ^"};
-  core::List<core::int*>* lhs70 = core::_GrowableList::_literal1<core::int*>(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:133:30: Error: Can't spread a value with static type 'Null'.
-  List<int> lhs70 = <int>[...null];
-                             ^");
-  core::Set<core::int*>* set70 = block {
-    final core::Set<core::int*>* #t51 = new col::_CompactLinkedHashSet::•<core::int*>();
-    #t51.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:135:29: Error: Can't spread a value with static type 'Null'.
-  Set<int> set70 = <int>{...null};
-                            ^");
-  } =>#t51;
-  core::Set<dynamic>* set71ambiguous = block {
-    final core::Set<dynamic>* #t52 = new col::_CompactLinkedHashSet::•<dynamic>();
-    #t52.{core::Set::add}{Invariant}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:139:8: Error: Expected ',' before this.
-    ...null,
-       ^");
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t53 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final dynamic #t54 = #t53 as{TypeError} dynamic;
-          #t52.{core::Set::add}{Invariant}(#t54);
-        }
-      }
-    }
-  } =>#t52;
-  core::Map<core::String*, core::int*>* map70 = <core::String*, core::int*>{invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/spread_collection_inference.dart:144:45: Error: Can't spread a value with static type 'Null'.
-  Map<String, int> map70 = <String, int>{...null};
-                                            ^": null};
-  core::List<core::int*>* lhs80 = block {
-    final core::List<core::int*>* #t55 = core::_GrowableList::•<core::int*>(0);
-    final core::Iterable<core::int*>* #t56 = null;
-    if(!#t56.{core::Object::==}(null))
-      #t55.{core::List::addAll}{Invariant}(#t56);
-  } =>#t55;
-  core::Set<core::int*>* set80 = block {
-    final core::Set<core::int*>* #t57 = new col::_CompactLinkedHashSet::•<core::int*>();
-    final core::Iterable<core::int*>* #t58 = null;
-    if(!#t58.{core::Object::==}(null))
-      #t57.{core::Set::addAll}{Invariant}(#t58);
-  } =>#t57;
-  core::Set<dynamic>* set81ambiguous = block {
-    final core::Set<dynamic>* #t59 = new col::_CompactLinkedHashSet::•<dynamic>();
-    final core::Iterable<dynamic>* #t60 = null;
-    if(!#t60.{core::Object::==}(null)) {
-      core::Iterator<dynamic>* :sync-for-iterator = #t60.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t61 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final dynamic #t62 = #t61 as{TypeError} dynamic;
-          #t59.{core::Set::add}{Invariant}(#t62);
-        }
-      }
-    }
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::•<dynamic>(0).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t63 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final dynamic #t64 = #t63 as{TypeError} dynamic;
-          #t59.{core::Set::add}{Invariant}(#t64);
-        }
-      }
-    }
-  } =>#t59;
-  core::Map<core::String*, core::int*>* map80 = block {
-    final core::Map<core::String*, core::int*>* #t65 = <core::String*, core::int*>{};
-    final core::Map<core::String*, core::int*>* #t66 = null;
-    if(!#t66.{core::Object::==}(null)) {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = #t66.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t67 = :sync-for-iterator.{core::Iterator::current};
-        #t65.{core::Map::[]=}{Invariant}(#t67.{core::MapEntry::key}, #t67.{core::MapEntry::value});
-      }
-    }
-  } =>#t65;
-  core::Map<core::String*, core::int*>* map90 = block {
-    final core::Map<core::String*, core::int*>* #t68 = <core::String*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<core::String*, core::int*>>* :sync-for-iterator = self::bar<core::String*, core::int*>().{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<core::String*, core::int*>* #t69 = :sync-for-iterator.{core::Iterator::current};
-        #t68.{core::Map::[]=}{Invariant}(#t69.{core::MapEntry::key}, #t69.{core::MapEntry::value});
-      }
-    }
-  } =>#t68;
-  core::List<core::int*>* list100 = block {
-    final core::List<core::int*>* #t70 = core::_GrowableList::•<core::int*>(0);
-    {
-      core::Iterator<core::num*>* :sync-for-iterator = listNum.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t71 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t72 = #t71 as{TypeError} core::int*;
-          #t70.{core::List::add}{Invariant}(#t72);
-        }
-      }
-    }
-  } =>#t70;
-  core::Map<core::num*, core::int*>* map100 = block {
-    final core::Map<core::num*, core::int*>* #t73 = <core::num*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<core::int*, core::num*>>* :sync-for-iterator = mapIntNum.{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<dynamic, dynamic>* #t74 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::num* #t75 = #t74.{core::MapEntry::key} as{TypeError} core::num*;
-          final core::int* #t76 = #t74.{core::MapEntry::value} as{TypeError} core::int*;
-          #t73.{core::Map::[]=}{Invariant}(#t75, #t76);
-        }
-      }
-    }
-  } =>#t73;
-  core::List<core::int*>* list110 = block {
-    final core::List<core::int*>* #t77 = core::_GrowableList::•<core::int*>(0);
-    {
-      core::Iterator<dynamic>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Iterable<dynamic>*).{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final dynamic #t78 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::int* #t79 = #t78 as{TypeError} core::int*;
-          #t77.{core::List::add}{Invariant}(#t79);
-        }
-      }
-    }
-  } =>#t77;
-  core::Map<core::num*, core::int*>* map110 = block {
-    final core::Map<core::num*, core::int*>* #t80 = <core::num*, core::int*>{};
-    {
-      core::Iterator<core::MapEntry<dynamic, dynamic>>* :sync-for-iterator = (dynVar as{TypeError,ForDynamic} core::Map<dynamic, dynamic>*).{core::Map::entries}.{core::Iterable::iterator};
-      for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-        final core::MapEntry<dynamic, dynamic>* #t81 = :sync-for-iterator.{core::Iterator::current};
-        {
-          final core::num* #t82 = #t81.{core::MapEntry::key} as{TypeError} core::num*;
-          final core::int* #t83 = #t81.{core::MapEntry::value} as{TypeError} core::int*;
-          #t80.{core::Map::[]=}{Invariant}(#t82, #t83);
-        }
-      }
-    }
-  } =>#t80;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart b/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart
deleted file mode 100644
index a0ce9703..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-foo() {
-  try {
-    return;
-  } finally {
-    print("Hello from finally block!");
-  }
-}
-
-bar(d) async* {
-  await for (var x in d) {
-    yield x;
-    yield* x;
-  }
-}
-
-main() {
-  do {
-    print("Hello from do-while!");
-  } while (false);
-  do var x = print("Hello from do-while!"); while (false);
-
-  for (String s in ["Hello from for-in!"]) {
-    print(s);
-  }
-  for (String s in ["Hello from for-in without block!"]) print(s);
-  var s;
-  for (s in ["Hello from for-in without decl!"]) {
-    print(s);
-  }
-  for (s in ["Hello from for-in without decl and block!"]) print(s);
-  a:
-  b:
-  c:
-  print("Hello from labeled statement!");
-  try {
-    try {
-      throw "Hello from rethrow!";
-    } catch (e) {
-      rethrow;
-    }
-  } catch (e) {
-    print(e);
-  }
-  foo();
-  bool done = false;
-  while (!done) {
-    done = true;
-    print("Hello from while!");
-  }
-  ; // Testing empty statement.
-  assert(true);
-  assert(true, "Hello from assert!");
-  try {
-    assert(false, "Hello from assert!");
-  } catch (e) {
-    print(e);
-  }
-  switch (1) {
-    case 1:
-    case 2:
-      print("Hello from switch case!");
-      break;
-    default:
-      break;
-  }
-  switch (4) {
-    L2:
-    case 2:
-      print("Hello from case 2!");
-      break;
-    L1:
-    case 1:
-      print("Hello from case 1!");
-      continue L2;
-    L0:
-    case 0:
-      print("Hello from case 0!");
-      continue L1;
-    case 4:
-      print("Hello from case 4!");
-      continue LD;
-    LD:
-    default:
-      continue L0;
-  }
-  switch (4) {
-    L0:
-    case 1:
-      print("Hello from next case 1");
-      break;
-    default:
-      continue L0;
-  }
-  int i = 0;
-  do {
-    print("Hello from do-while!");
-    if (++i < 3) continue;
-    break;
-  } while (true);
-  i = 0;
-  OUTER:
-  while (true) {
-    print("Hello from while!");
-    if (++i < 3) continue OUTER;
-    break OUTER;
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.textual_outline.expect
deleted file mode 100644
index 2d96fe8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-foo() {}
-bar(d) async* {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.textual_outline_modelled.expect
deleted file mode 100644
index 04d19df..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-bar(d) async* {}
-foo() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.expect
deleted file mode 100644
index 7e7194b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.expect
+++ /dev/null
@@ -1,159 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-
-static method foo() → dynamic {
-  try {
-    return;
-  }
-  finally {
-    core::print("Hello from finally block!");
-  }
-}
-static method bar(dynamic d) → dynamic async* {
-  await for (dynamic x in d as{TypeError,ForDynamic} asy::Stream<dynamic>*) {
-    yield x;
-    yield* x as{TypeError,ForDynamic} asy::Stream<dynamic>*;
-  }
-}
-static method main() → dynamic {
-  do {
-    core::print("Hello from do-while!");
-  }
-  while (false)
-  do {
-    void x = core::print("Hello from do-while!");
-  }
-  while (false)
-  for (core::String* s in <core::String*>["Hello from for-in!"]) {
-    core::print(s);
-  }
-  for (core::String* s in <core::String*>["Hello from for-in without block!"])
-    core::print(s);
-  dynamic s;
-  for (final dynamic #t1 in <dynamic>["Hello from for-in without decl!"]) {
-    s = #t1;
-    core::print(s);
-  }
-  for (final dynamic #t2 in <dynamic>["Hello from for-in without decl and block!"]) {
-    s = #t2;
-    core::print(s);
-  }
-  core::print("Hello from labeled statement!");
-  try {
-    try {
-      throw "Hello from rethrow!";
-    }
-    on dynamic catch(final dynamic e) {
-      rethrow;
-    }
-  }
-  on dynamic catch(final dynamic e) {
-    core::print(e);
-  }
-  self::foo();
-  core::bool* done = false;
-  while (!done) {
-    done = true;
-    core::print("Hello from while!");
-  }
-  ;
-  assert(true);
-  assert(true, "Hello from assert!");
-  try {
-    assert(false, "Hello from assert!");
-  }
-  on dynamic catch(final dynamic e) {
-    core::print(e);
-  }
-  #L1:
-  switch(1) {
-    #L2:
-    case #C1:
-    case #C2:
-      {
-        core::print("Hello from switch case!");
-        break #L1;
-      }
-    #L3:
-    default:
-      {
-        break #L1;
-      }
-  }
-  #L4:
-  switch(4) {
-    #L5:
-    case #C2:
-      {
-        core::print("Hello from case 2!");
-        break #L4;
-      }
-    #L6:
-    case #C1:
-      {
-        core::print("Hello from case 1!");
-        continue #L5;
-      }
-    #L7:
-    case #C3:
-      {
-        core::print("Hello from case 0!");
-        continue #L6;
-      }
-    #L8:
-    case #C4:
-      {
-        core::print("Hello from case 4!");
-        continue #L9;
-      }
-    #L9:
-    default:
-      {
-        continue #L7;
-      }
-  }
-  #L10:
-  switch(4) {
-    #L11:
-    case #C1:
-      {
-        core::print("Hello from next case 1");
-        break #L10;
-      }
-    #L12:
-    default:
-      {
-        continue #L11;
-      }
-  }
-  core::int* i = 0;
-  #L13:
-  do
-    #L14:
-    {
-      core::print("Hello from do-while!");
-      if((i = i.{core::num::+}(1)).{core::num::<}(3))
-        break #L14;
-      break #L13;
-    }
-  while (true)
-  i = 0;
-  #L15:
-  while (true)
-    #L16:
-    {
-      core::print("Hello from while!");
-      if((i = i.{core::num::+}(1)).{core::num::<}(3))
-        break #L16;
-      break #L15;
-    }
-}
-
-constants  {
-  #C1 = 1
-  #C2 = 2
-  #C3 = 0
-  #C4 = 4
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.outline.expect
deleted file mode 100644
index d66ca8e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-
-static method foo() → dynamic
-  ;
-static method bar(dynamic d) → dynamic async* 
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.transformed.expect
deleted file mode 100644
index dd17252..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/statements.dart.weak.transformed.expect
+++ /dev/null
@@ -1,239 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-import "dart:async" as asy;
-import "dart:_internal" as _in;
-
-static method foo() → dynamic {
-  try {
-    return;
-  }
-  finally {
-    core::print("Hello from finally block!");
-  }
-}
-static method bar(dynamic d) → dynamic /* originally async* */ {
-  asy::_AsyncStarStreamController<dynamic>* :controller;
-  dynamic :controller_stream;
-  (dynamic) →* dynamic :async_op_then;
-  (core::Object*, core::StackTrace*) →* dynamic :async_op_error;
-  core::int* :await_jump_var = 0;
-  dynamic :await_ctx_var;
-  dynamic :saved_try_context_var0;
-  dynamic :saved_try_context_var1;
-  dynamic :saved_try_context_var2;
-  dynamic :exception0;
-  dynamic :stack_trace0;
-  function :async_op([dynamic :result, dynamic :exception, dynamic :stack_trace]) → dynamic yielding 
-    try
-      try {
-        #L1:
-        {
-          {
-            asy::Stream<dynamic>* :stream = d as{TypeError,ForDynamic} asy::Stream<dynamic>*;
-            asy::_StreamIterator<dynamic>* :for-iterator = new asy::_StreamIterator::•<dynamic>(:stream);
-            try
-              #L2:
-              while (true) {
-                dynamic #t1 = asy::_asyncStarMoveNextHelper(:stream);
-                [yield] let dynamic #t2 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::moveNext}(), :async_op_then, :async_op_error, :async_op) in null;
-                if(_in::unsafeCast<core::bool>(:result)) {
-                  dynamic x = :for-iterator.{asy::_StreamIterator::current};
-                  {
-                    if(:controller.{asy::_AsyncStarStreamController::add}(x))
-                      return null;
-                    else
-                      [yield] null;
-                    if(:controller.{asy::_AsyncStarStreamController::addStream}(x as{TypeError,ForDynamic} asy::Stream<dynamic>*))
-                      return null;
-                    else
-                      [yield] null;
-                  }
-                }
-                else
-                  break #L2;
-              }
-            finally
-              if(!:for-iterator.{asy::_StreamIterator::_subscription}.{core::Object::==}(null)) {
-                [yield] let dynamic #t3 = asy::_awaitHelper(:for-iterator.{asy::_StreamIterator::cancel}(), :async_op_then, :async_op_error, :async_op) in null;
-                :result;
-              }
-          }
-        }
-        return;
-      }
-      on dynamic catch(dynamic exception, core::StackTrace* stack_trace) {
-        :controller.{asy::_AsyncStarStreamController::addError}(exception, stack_trace);
-      }
-    finally {
-      :controller.{asy::_AsyncStarStreamController::close}();
-    }
-  :async_op_then = asy::_asyncThenWrapperHelper(:async_op);
-  :async_op_error = asy::_asyncErrorWrapperHelper(:async_op);
-  :controller = new asy::_AsyncStarStreamController::•<dynamic>(:async_op);
-  :controller_stream = :controller.{asy::_AsyncStarStreamController::stream};
-  return :controller_stream;
-}
-static method main() → dynamic {
-  do {
-    core::print("Hello from do-while!");
-  }
-  while (false)
-  do {
-    void x = core::print("Hello from do-while!");
-  }
-  while (false)
-  {
-    core::Iterator<core::String*>* :sync-for-iterator = core::_GrowableList::_literal1<core::String*>("Hello from for-in!").{core::Iterable::iterator};
-    for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-      core::String* s = :sync-for-iterator.{core::Iterator::current};
-      {
-        core::print(s);
-      }
-    }
-  }
-  {
-    core::Iterator<core::String*>* :sync-for-iterator = core::_GrowableList::_literal1<core::String*>("Hello from for-in without block!").{core::Iterable::iterator};
-    for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-      core::String* s = :sync-for-iterator.{core::Iterator::current};
-      core::print(s);
-    }
-  }
-  dynamic s;
-  {
-    core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::_literal1<dynamic>("Hello from for-in without decl!").{core::Iterable::iterator};
-    for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-      final dynamic #t4 = :sync-for-iterator.{core::Iterator::current};
-      {
-        s = #t4;
-        core::print(s);
-      }
-    }
-  }
-  {
-    core::Iterator<dynamic>* :sync-for-iterator = core::_GrowableList::_literal1<dynamic>("Hello from for-in without decl and block!").{core::Iterable::iterator};
-    for (; :sync-for-iterator.{core::Iterator::moveNext}(); ) {
-      final dynamic #t5 = :sync-for-iterator.{core::Iterator::current};
-      {
-        s = #t5;
-        core::print(s);
-      }
-    }
-  }
-  core::print("Hello from labeled statement!");
-  try {
-    try {
-      throw "Hello from rethrow!";
-    }
-    on dynamic catch(final dynamic e) {
-      rethrow;
-    }
-  }
-  on dynamic catch(final dynamic e) {
-    core::print(e);
-  }
-  self::foo();
-  core::bool* done = false;
-  while (!done) {
-    done = true;
-    core::print("Hello from while!");
-  }
-  ;
-  assert(true);
-  assert(true, "Hello from assert!");
-  try {
-    assert(false, "Hello from assert!");
-  }
-  on dynamic catch(final dynamic e) {
-    core::print(e);
-  }
-  #L3:
-  switch(1) {
-    #L4:
-    case #C1:
-    case #C2:
-      {
-        core::print("Hello from switch case!");
-        break #L3;
-      }
-    #L5:
-    default:
-      {
-        break #L3;
-      }
-  }
-  #L6:
-  switch(4) {
-    #L7:
-    case #C2:
-      {
-        core::print("Hello from case 2!");
-        break #L6;
-      }
-    #L8:
-    case #C1:
-      {
-        core::print("Hello from case 1!");
-        continue #L7;
-      }
-    #L9:
-    case #C3:
-      {
-        core::print("Hello from case 0!");
-        continue #L8;
-      }
-    #L10:
-    case #C4:
-      {
-        core::print("Hello from case 4!");
-        continue #L11;
-      }
-    #L11:
-    default:
-      {
-        continue #L9;
-      }
-  }
-  #L12:
-  switch(4) {
-    #L13:
-    case #C1:
-      {
-        core::print("Hello from next case 1");
-        break #L12;
-      }
-    #L14:
-    default:
-      {
-        continue #L13;
-      }
-  }
-  core::int* i = 0;
-  #L15:
-  do
-    #L16:
-    {
-      core::print("Hello from do-while!");
-      if((i = i.{core::num::+}(1)).{core::num::<}(3))
-        break #L16;
-      break #L15;
-    }
-  while (true)
-  i = 0;
-  #L17:
-  while (true)
-    #L18:
-    {
-      core::print("Hello from while!");
-      if((i = i.{core::num::+}(1)).{core::num::<}(3))
-        break #L18;
-      break #L17;
-    }
-}
-
-constants  {
-  #C1 = 1
-  #C2 = 2
-  #C3 = 0
-  #C4 = 4
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart b/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart
deleted file mode 100644
index 2e1c6de..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Foo {}
-
-set foo(x) {}
-
-main() {
-  foo = new Foo();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.textual_outline.expect
deleted file mode 100644
index 8d98297..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class Foo {}
-
-set foo(x) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.textual_outline_modelled.expect
deleted file mode 100644
index 42cccc3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class Foo {}
-
-main() {}
-set foo(x) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.expect
deleted file mode 100644
index 33c8de3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static set foo(dynamic x) → void {}
-static method main() → dynamic {
-  self::foo = new self::Foo::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.outline.expect
deleted file mode 100644
index 950e232..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.outline.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static set foo(dynamic x) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.transformed.expect
deleted file mode 100644
index 33c8de3..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/static_setter.dart.weak.transformed.expect
+++ /dev/null
@@ -1,23 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static set foo(dynamic x) → void {}
-static method main() → dynamic {
-  self::foo = new self::Foo::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart b/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart
deleted file mode 100644
index 528d6ca..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class Foo {
-  var _field;
-}
-
-class FooValue {}
-
-class Bar {
-  var _field; // Same name.
-}
-
-class BarValue {}
-
-main() {
-  var foo = new Foo();
-  foo._field = new FooValue();
-  var fooValue = foo._field;
-  print(fooValue);
-
-  var bar = new Bar();
-  bar._field = new BarValue();
-  var barValue = bar._field;
-  print(barValue);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.textual_outline.expect
deleted file mode 100644
index 1ecc972..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.textual_outline.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class Foo {
-  var _field;
-}
-
-class FooValue {}
-
-class Bar {
-  var _field;
-}
-
-class BarValue {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.textual_outline_modelled.expect
deleted file mode 100644
index fe6cd34..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-// @dart = 2.6
-class Bar {
-  var _field;
-}
-
-class BarValue {}
-
-class Foo {
-  var _field;
-}
-
-class FooValue {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.expect
deleted file mode 100644
index a6c7200..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field dynamic _field = null;
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class FooValue extends core::Object {
-  synthetic constructor •() → self::FooValue*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  field dynamic _field = null;
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class BarValue extends core::Object {
-  synthetic constructor •() → self::BarValue*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  foo.{self::Foo::_field} = new self::FooValue::•();
-  dynamic fooValue = foo.{self::Foo::_field};
-  core::print(fooValue);
-  self::Bar* bar = new self::Bar::•();
-  bar.{self::Bar::_field} = new self::BarValue::•();
-  dynamic barValue = bar.{self::Bar::_field};
-  core::print(barValue);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.outline.expect
deleted file mode 100644
index 6aaf967..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.outline.expect
+++ /dev/null
@@ -1,64 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field dynamic _field;
-  synthetic constructor •() → self::Foo*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class FooValue extends core::Object {
-  synthetic constructor •() → self::FooValue*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  field dynamic _field;
-  synthetic constructor •() → self::Bar*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class BarValue extends core::Object {
-  synthetic constructor •() → self::BarValue*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.transformed.expect
deleted file mode 100644
index a6c7200..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/store_load.dart.weak.transformed.expect
+++ /dev/null
@@ -1,76 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field dynamic _field = null;
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class FooValue extends core::Object {
-  synthetic constructor •() → self::FooValue*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object {
-  field dynamic _field = null;
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class BarValue extends core::Object {
-  synthetic constructor •() → self::BarValue*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::Foo* foo = new self::Foo::•();
-  foo.{self::Foo::_field} = new self::FooValue::•();
-  dynamic fooValue = foo.{self::Foo::_field};
-  core::print(fooValue);
-  self::Bar* bar = new self::Bar::•();
-  bar.{self::Bar::_field} = new self::BarValue::•();
-  dynamic barValue = bar.{self::Bar::_field};
-  core::print(barValue);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart b/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart
deleted file mode 100644
index 4d7a3a7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-var color = 'brown';
-var thing = 'lazy dog';
-var phrase = "The quick $color fox\njumped over the $thing.\n";
-var adjacent = '$color$color$color';
-var linebreaks = '$color\n$color\n$color';
-var other = '$color\n is \n$color';
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.textual_outline.expect
deleted file mode 100644
index e79dab7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-var color = 'brown';
-var thing = 'lazy dog';
-var phrase = "The quick $color fox\njumped over the $thing.\n";
-var adjacent = '$color$color$color';
-var linebreaks = '$color\n$color\n$color';
-var other = '$color\n is \n$color';
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.textual_outline_modelled.expect
deleted file mode 100644
index dc991f6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-main() {}
-var adjacent = '$color$color$color';
-var color = 'brown';
-var linebreaks = '$color\n$color\n$color';
-var other = '$color\n is \n$color';
-var phrase = "The quick $color fox\njumped over the $thing.\n";
-var thing = 'lazy dog';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.expect
deleted file mode 100644
index 6af4e00..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static field core::String* color = "brown";
-static field core::String* thing = "lazy dog";
-static field core::String* phrase = "The quick ${self::color} fox
-jumped over the ${self::thing}.
-";
-static field core::String* adjacent = "${self::color}${self::color}${self::color}";
-static field core::String* linebreaks = "${self::color}
-${self::color}
-${self::color}";
-static field core::String* other = "${self::color}
- is 
-${self::color}";
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.outline.expect
deleted file mode 100644
index 0c2680f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static field core::String* color;
-static field core::String* thing;
-static field core::String* phrase;
-static field core::String* adjacent;
-static field core::String* linebreaks;
-static field core::String* other;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.transformed.expect
deleted file mode 100644
index 6af4e00..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/stringliteral.dart.weak.transformed.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static field core::String* color = "brown";
-static field core::String* thing = "lazy dog";
-static field core::String* phrase = "The quick ${self::color} fox
-jumped over the ${self::thing}.
-";
-static field core::String* adjacent = "${self::color}${self::color}${self::color}";
-static field core::String* linebreaks = "${self::color}
-${self::color}
-${self::color}";
-static field core::String* other = "${self::color}
- is 
-${self::color}";
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart b/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart
deleted file mode 100644
index 03ebdc9..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class A {
-  int call(int x) => x * 2;
-}
-
-class B extends A {
-  int call(int x) => x * 3;
-
-  int call_super() {
-    // Assumes that super() means super.call().
-    // In reality, it is illegal to use it this way.
-    return super(5);
-  }
-}
-
-main() {
-  assert(new B().call_super() == 10);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.textual_outline.expect
deleted file mode 100644
index 25ae6c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class A {
-  int call(int x) => x * 2;
-}
-
-class B extends A {
-  int call(int x) => x * 3;
-  int call_super() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.textual_outline_modelled.expect
deleted file mode 100644
index 25ae6c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class A {
-  int call(int x) => x * 2;
-}
-
-class B extends A {
-  int call(int x) => x * 3;
-  int call_super() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.expect
deleted file mode 100644
index 72eb534..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart:17:12: Error: Can't use 'super' as an expression.
-// To delegate a constructor to a super constructor, put the super call as an initializer.
-//     return super(5);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method call(core::int* x) → core::int*
-    return x.{core::num::*}(2);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method call(core::int* x) → core::int*
-    return x.{core::num::*}(3);
-  method call_super() → core::int* {
-    return invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart:17:12: Error: Can't use 'super' as an expression.
-To delegate a constructor to a super constructor, put the super call as an initializer.
-    return super(5);
-           ^" as{TypeError,ForDynamic} core::int*;
-  }
-}
-static method main() → dynamic {
-  assert(new self::B::•().{self::B::call_super}().{core::num::==}(10));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.outline.expect
deleted file mode 100644
index 5ec03c1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.outline.expect
+++ /dev/null
@@ -1,30 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  method call(core::int* x) → core::int*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    ;
-  method call(core::int* x) → core::int*
-    ;
-  method call_super() → core::int*
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.transformed.expect
deleted file mode 100644
index 82cee86..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart:17:12: Error: Can't use 'super' as an expression.
-// To delegate a constructor to a super constructor, put the super call as an initializer.
-//     return super(5);
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  method call(core::int* x) → core::int*
-    return x.{core::num::*}(2);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends self::A {
-  synthetic constructor •() → self::B*
-    : super self::A::•()
-    ;
-  method call(core::int* x) → core::int*
-    return x.{core::num::*}(3);
-  method call_super() → core::int* {
-    return invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/super_call.dart:17:12: Error: Can't use 'super' as an expression.
-To delegate a constructor to a super constructor, put the super call as an initializer.
-    return super(5);
-           ^";
-  }
-}
-static method main() → dynamic {
-  assert(new self::B::•().{self::B::call_super}().{core::num::==}(10));
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart b/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart
deleted file mode 100644
index 568a43e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-abstract class I {
-  interfaceMethod();
-}
-
-class C implements I {
-  noSuchMethod(_) => "C";
-}
-
-class D extends C {
-  noSuchMethod(_) => "D";
-  dMethod() => super.interfaceMethod();
-}
-
-main() {
-  var result = new D().dMethod();
-  if (result != "D") throw "Expected 'D' but got: '$result'";
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.textual_outline.expect
deleted file mode 100644
index 6f8142a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.textual_outline.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-abstract class I {
-  interfaceMethod();
-}
-
-class C implements I {
-  noSuchMethod(_) => "C";
-}
-
-class D extends C {
-  noSuchMethod(_) => "D";
-  dMethod() => super.interfaceMethod();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9e8ad96..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,15 +0,0 @@
-// @dart = 2.6
-abstract class I {
-  interfaceMethod();
-}
-
-class C implements I {
-  noSuchMethod(_) => "C";
-}
-
-class D extends C {
-  dMethod() => super.interfaceMethod();
-  noSuchMethod(_) => "D";
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.expect
deleted file mode 100644
index 0924671..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class I extends core::Object {
-  synthetic constructor •() → self::I*
-    : super core::Object::•()
-    ;
-  abstract method interfaceMethod() → dynamic;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object implements self::I {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    return "C";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder method interfaceMethod() → dynamic
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4))) as{TypeError,ForDynamic} dynamic;
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    return "D";
-  method dMethod() → dynamic
-    return super.{self::C::interfaceMethod}();
-}
-static method main() → dynamic {
-  dynamic result = new self::D::•().{self::D::dMethod}();
-  if(!result.{core::Object::==}("D"))
-    throw "Expected 'D' but got: '${result}'";
-}
-
-constants  {
-  #C1 = #interfaceMethod
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.outline.expect
deleted file mode 100644
index 1b6a098..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.outline.expect
+++ /dev/null
@@ -1,54 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class I extends core::Object {
-  synthetic constructor •() → self::I*
-    ;
-  abstract method interfaceMethod() → dynamic;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object implements self::I {
-  synthetic constructor •() → self::C*
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder method interfaceMethod() → dynamic
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#interfaceMethod, 0, const <core::Type*>[], const <dynamic>[], core::Map::unmodifiable<core::Symbol*, dynamic>(const <core::Symbol*, dynamic>{}))) as{TypeError,ForDynamic} dynamic;
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    ;
-  method dMethod() → dynamic
-    ;
-}
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: SymbolLiteral @ org-dartlang-testcase:///super_nsm.dart:8:3 -> SymbolConstant(#interfaceMethod)
-Evaluated: ListLiteral @ org-dartlang-testcase:///super_nsm.dart:8:3 -> ListConstant(const <Type*>[])
-Evaluated: ListLiteral @ org-dartlang-testcase:///super_nsm.dart:8:3 -> ListConstant(const <dynamic>[])
-Evaluated: MapLiteral @ org-dartlang-testcase:///super_nsm.dart:8:3 -> InstanceConstant(const _ImmutableMap<Symbol*, dynamic>{_ImmutableMap._kvPairs: const <dynamic>[]})
-Extra constant evaluation: evaluated: 9, effectively constant: 4
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.transformed.expect
deleted file mode 100644
index 0924671..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/super_nsm.dart.weak.transformed.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class I extends core::Object {
-  synthetic constructor •() → self::I*
-    : super core::Object::•()
-    ;
-  abstract method interfaceMethod() → dynamic;
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends core::Object implements self::I {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    return "C";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-  no-such-method-forwarder method interfaceMethod() → dynamic
-    return this.{self::C::noSuchMethod}(new core::_InvocationMirror::_withType(#C1, 0, #C2, #C3, core::Map::unmodifiable<core::Symbol*, dynamic>(#C4))) as{TypeError,ForDynamic} dynamic;
-}
-class D extends self::C {
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  method noSuchMethod(core::Invocation* _) → dynamic
-    return "D";
-  method dMethod() → dynamic
-    return super.{self::C::interfaceMethod}();
-}
-static method main() → dynamic {
-  dynamic result = new self::D::•().{self::D::dMethod}();
-  if(!result.{core::Object::==}("D"))
-    throw "Expected 'D' but got: '${result}'";
-}
-
-constants  {
-  #C1 = #interfaceMethod
-  #C2 = <core::Type*>[]
-  #C3 = <dynamic>[]
-  #C4 = core::_ImmutableMap<core::Symbol*, dynamic> {_kvPairs:#C3}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart b/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart
deleted file mode 100644
index 5923991..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-// Test that error messages are indented correctly
-// in the presence of tabs.
-
-test() {
-  print(one);
-  print(two);
-  print(three);
-  print(four);
-  print(five);
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.textual_outline.expect
deleted file mode 100644
index 5cf5db8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-test() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.textual_outline_modelled.expect
deleted file mode 100644
index 94295cd..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-main() {}
-test() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.expect
deleted file mode 100644
index 51168d7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:11:9: Error: Getter not found: 'one'.
-//   print(one);
-//         ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:12:9: Error: Getter not found: 'two'.
-//   print(two);
-//         ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:13:9: Error: Getter not found: 'three'.
-//   print(three);
-//         ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:14:9: Error: Getter not found: 'four'.
-//   print(four);
-//         ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:15:9: Error: Getter not found: 'five'.
-//   print(five);
-//         ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-static method test() → dynamic {
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:11:9: Error: Getter not found: 'one'.
-  print(one);
-        ^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:12:9: Error: Getter not found: 'two'.
-  print(two);
-        ^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:13:9: Error: Getter not found: 'three'.
-  print(three);
-        ^^^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:14:9: Error: Getter not found: 'four'.
-  print(four);
-        ^^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:15:9: Error: Getter not found: 'five'.
-  print(five);
-        ^^^^");
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.outline.expect
deleted file mode 100644
index a29647d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method test() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.transformed.expect
deleted file mode 100644
index 51168d7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:11:9: Error: Getter not found: 'one'.
-//   print(one);
-//         ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:12:9: Error: Getter not found: 'two'.
-//   print(two);
-//         ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:13:9: Error: Getter not found: 'three'.
-//   print(three);
-//         ^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:14:9: Error: Getter not found: 'four'.
-//   print(four);
-//         ^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:15:9: Error: Getter not found: 'five'.
-//   print(five);
-//         ^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-static method test() → dynamic {
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:11:9: Error: Getter not found: 'one'.
-  print(one);
-        ^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:12:9: Error: Getter not found: 'two'.
-  print(two);
-        ^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:13:9: Error: Getter not found: 'three'.
-  print(three);
-        ^^^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:14:9: Error: Getter not found: 'four'.
-  print(four);
-        ^^^^");
-  core::print(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/tabs.dart:15:9: Error: Getter not found: 'five'.
-  print(five);
-        ^^^^");
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart b/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart
deleted file mode 100644
index b7bf70c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.6
-
-// The test for recursive typedef declaration involving multiple typedefs.
-
-typedef Foo<T> = void Function(Bar<T>);
-typedef Bar<T> = void Function(Baz<T>);
-typedef Baz<T> = void Function(Foo<T>);
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.textual_outline.expect
deleted file mode 100644
index 8c08006..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-typedef Foo<T> = void Function(Bar<T>);
-typedef Bar<T> = void Function(Baz<T>);
-typedef Baz<T> = void Function(Foo<T>);
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6beff18..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-main() {}
-typedef Bar<T> = void Function(Baz<T>);
-typedef Baz<T> = void Function(Foo<T>);
-typedef Foo<T> = void Function(Bar<T>);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.expect
deleted file mode 100644
index d648775a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart:10:9: Error: The typedef 'Bar' has a reference to itself.
-// typedef Bar<T> = void Function(Baz<T>);
-//         ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart:9:9: Error: The typedef 'Foo' has a reference to itself.
-// typedef Foo<T> = void Function(Bar<T>);
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef Foo<unrelated T extends core::Object* = dynamic> = invalid-type;
-typedef Bar<unrelated T extends core::Object* = dynamic> = ((invalid-type) →* void) →* void;
-typedef Baz<unrelated T extends core::Object* = dynamic> = (invalid-type) →* void;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.outline.expect
deleted file mode 100644
index d86340f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.outline.expect
+++ /dev/null
@@ -1,20 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart:10:9: Error: The typedef 'Bar' has a reference to itself.
-// typedef Bar<T> = void Function(Baz<T>);
-//         ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart:9:9: Error: The typedef 'Foo' has a reference to itself.
-// typedef Foo<T> = void Function(Bar<T>);
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef Foo<unrelated T extends core::Object* = dynamic> = invalid-type;
-typedef Bar<unrelated T extends core::Object* = dynamic> = ((invalid-type) →* void) →* void;
-typedef Baz<unrelated T extends core::Object* = dynamic> = (invalid-type) →* void;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.transformed.expect
deleted file mode 100644
index d648775a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart.weak.transformed.expect
+++ /dev/null
@@ -1,19 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart:10:9: Error: The typedef 'Bar' has a reference to itself.
-// typedef Bar<T> = void Function(Baz<T>);
-//         ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/three_typedefs_loop.dart:9:9: Error: The typedef 'Foo' has a reference to itself.
-// typedef Foo<T> = void Function(Bar<T>);
-//         ^
-//
-import self as self;
-import "dart:core" as core;
-
-typedef Foo<unrelated T extends core::Object* = dynamic> = invalid-type;
-typedef Bar<unrelated T extends core::Object* = dynamic> = ((invalid-type) →* void) →* void;
-typedef Baz<unrelated T extends core::Object* = dynamic> = (invalid-type) →* void;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart
deleted file mode 100644
index 1cd5f27..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-library top_level_accessors;
-
-part 'top_level_accessors_part.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.textual_outline.expect
deleted file mode 100644
index 14ca2ae..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.textual_outline.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-library top_level_accessors;
-
-part 'top_level_accessors_part.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.textual_outline_modelled.expect
deleted file mode 100644
index 14ca2ae..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,4 +0,0 @@
-// @dart = 2.6
-library top_level_accessors;
-
-part 'top_level_accessors_part.dart';
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.expect
deleted file mode 100644
index 9898bf6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-library top_level_accessors;
-import self as self;
-import "dart:core" as core;
-
-part top_level_accessors_part.dart;
-static set /* from org-dartlang-testcase:///top_level_accessors_part.dart */ exitCode(core::int* code) → void {
-  core::print(code);
-}
-static get /* from org-dartlang-testcase:///top_level_accessors_part.dart */ exitCode() → core::int*
-  return 0;
-static method /* from org-dartlang-testcase:///top_level_accessors_part.dart */ main() → dynamic {
-  self::exitCode = 42;
-  core::print(self::exitCode);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.outline.expect
deleted file mode 100644
index bbdb2a7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-library top_level_accessors;
-import self as self;
-import "dart:core" as core;
-
-part top_level_accessors_part.dart;
-static set /* from org-dartlang-testcase:///top_level_accessors_part.dart */ exitCode(core::int* code) → void
-  ;
-static get /* from org-dartlang-testcase:///top_level_accessors_part.dart */ exitCode() → core::int*
-  ;
-static method /* from org-dartlang-testcase:///top_level_accessors_part.dart */ main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.transformed.expect
deleted file mode 100644
index 9898bf6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors.dart.weak.transformed.expect
+++ /dev/null
@@ -1,14 +0,0 @@
-library top_level_accessors;
-import self as self;
-import "dart:core" as core;
-
-part top_level_accessors_part.dart;
-static set /* from org-dartlang-testcase:///top_level_accessors_part.dart */ exitCode(core::int* code) → void {
-  core::print(code);
-}
-static get /* from org-dartlang-testcase:///top_level_accessors_part.dart */ exitCode() → core::int*
-  return 0;
-static method /* from org-dartlang-testcase:///top_level_accessors_part.dart */ main() → dynamic {
-  self::exitCode = 42;
-  core::print(self::exitCode);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors_part.dart b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors_part.dart
deleted file mode 100644
index 5245170..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_accessors_part.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-part of top_level_accessors;
-
-void set exitCode(int code) {
-  print(code);
-}
-
-int get exitCode => 0;
-
-main() {
-  exitCode = 42;
-  print(exitCode);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart
deleted file mode 100644
index 1af7a29..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-library() {
-  print("Hello, World!");
-}
-
-main() => library();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.textual_outline.expect
deleted file mode 100644
index 9a2faad..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.textual_outline.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-library() {}
-main() => library();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9a2faad..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,3 +0,0 @@
-// @dart = 2.6
-library() {}
-main() => library();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.expect
deleted file mode 100644
index f23119a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method library() → dynamic {
-  core::print("Hello, World!");
-}
-static method main() → dynamic
-  return self::library();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.outline.expect
deleted file mode 100644
index f51ba5a0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-library;
-import self as self;
-
-static method library() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.transformed.expect
deleted file mode 100644
index f23119a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/top_level_library_method.dart.weak.transformed.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method library() → dynamic {
-  core::print("Hello, World!");
-}
-static method main() → dynamic
-  return self::library();
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart b/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart
deleted file mode 100644
index bc4d17f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.6
-
-class A {
-  const A();
-}
-
-@A
-class B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.textual_outline.expect
deleted file mode 100644
index 83562c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  const A();
-}
-
-@A
-class B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.textual_outline_modelled.expect
deleted file mode 100644
index 83562c7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class A {
-  const A();
-}
-
-@A
-class B {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.expect
deleted file mode 100644
index e1e789f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart:11:2: Error: This can't be used as an annotation; an annotation should be a reference to a compile-time constant variable, or a call to a constant constructor.
-// @A
-//  ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-@invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart:11:2: Error: This can't be used as an annotation; an annotation should be a reference to a compile-time constant variable, or a call to a constant constructor.
-@A
- ^"
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.outline.expect
deleted file mode 100644
index d5acf35..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.outline.expect
+++ /dev/null
@@ -1,50 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart:11:2: Error: This can't be used as an annotation; an annotation should be a reference to a compile-time constant variable, or a call to a constant constructor.
-// @A
-//  ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-@let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart:11:2: Error: This can't be used as an annotation; an annotation should be a reference to a compile-time constant variable, or a call to a constant constructor.
-@A
- ^" in self::A*
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
-
-
-Extra constant evaluation status:
-Evaluated: TypeLiteral @ org-dartlang-testcase:///type_literal_as_metadata.dart:11:2 -> TypeLiteralConstant(A*)
-Extra constant evaluation: evaluated: 2, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.transformed.expect
deleted file mode 100644
index e1e789f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart.weak.transformed.expect
+++ /dev/null
@@ -1,45 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart:11:2: Error: This can't be used as an annotation; an annotation should be a reference to a compile-time constant variable, or a call to a constant constructor.
-// @A
-//  ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-@invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/type_literal_as_metadata.dart:11:2: Error: This can't be used as an annotation; an annotation should be a reference to a compile-time constant variable, or a call to a constant constructor.
-@A
- ^"
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart b/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart
deleted file mode 100644
index 71a7a5b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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.6
-
-/*@testedFeatures=inference*/
-T map<T>(T Function() f1, T Function() f2) {}
-
-id<T>(T t) => t;
-
-Null foo() => null;
-
-main() {
-  /*@ typeArgs=Null */ map(/*@ returnType=Null */ () {},
-      /*@ returnType=<BottomType> */ () => throw "hello");
-  /*@ typeArgs=Null */ map(/*@ returnType=<BottomType> */ () => throw "hello",
-      /*@ returnType=Null */ () {});
-  Null Function() f = /*@ returnType=Null */ () {};
-  /*@ typeArgs=Null */ map(
-      foo, /*@ returnType=<BottomType> */ () => throw "hello");
-  /*@ typeArgs=Null */ map(
-      /*@ returnType=<BottomType> */ () => throw "hello", foo);
-  /*@ typeArgs=Null */ map(/*@ returnType=Null */ () {
-    return null;
-  }, /*@ returnType=<BottomType> */ () => throw "hello");
-
-  /*@ typeArgs=Null */ map(/*@ returnType=<BottomType> */ () => throw "hello",
-      /*@ returnType=Null */ () {
-    return null;
-  });
-  /*@ typeArgs=() ->* Null */ id(/*@ returnType=Null */ () {});
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.textual_outline.expect
deleted file mode 100644
index 312495f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-T map<T>(T Function() f1, T Function() f2) {}
-id<T>(T t) => t;
-Null foo() => null;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.textual_outline_modelled.expect
deleted file mode 100644
index 444071f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-Null foo() => null;
-T map<T>(T Function() f1, T Function() f2) {}
-id<T>(T t) => t;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.expect
deleted file mode 100644
index 335ccc5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method map<T extends core::Object* = dynamic>(() →* self::map::T* f1, () →* self::map::T* f2) → self::map::T* {}
-static method id<T extends core::Object* = dynamic>(self::id::T* t) → dynamic
-  return t;
-static method foo() → Null
-  return null;
-static method main() → dynamic {
-  self::map<Null>(() → Null {}, () → <BottomType>=> throw "hello");
-  self::map<Null>(() → <BottomType>=> throw "hello", () → Null {});
-  () →* Null f = () → Null {};
-  self::map<Null>(#C1, () → <BottomType>=> throw "hello");
-  self::map<Null>(() → <BottomType>=> throw "hello", #C1);
-  self::map<Null>(() → Null {
-    return null;
-  }, () → <BottomType>=> throw "hello");
-  self::map<Null>(() → <BottomType>=> throw "hello", () → Null {
-    return null;
-  });
-  self::id<() →* Null>(() → Null {});
-}
-
-constants  {
-  #C1 = tearoff self::foo
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.outline.expect
deleted file mode 100644
index b7c00566..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.outline.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method map<T extends core::Object* = dynamic>(() →* self::map::T* f1, () →* self::map::T* f2) → self::map::T*
-  ;
-static method id<T extends core::Object* = dynamic>(self::id::T* t) → dynamic
-  ;
-static method foo() → Null
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.transformed.expect
deleted file mode 100644
index 335ccc5..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_of_null.dart.weak.transformed.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-static method map<T extends core::Object* = dynamic>(() →* self::map::T* f1, () →* self::map::T* f2) → self::map::T* {}
-static method id<T extends core::Object* = dynamic>(self::id::T* t) → dynamic
-  return t;
-static method foo() → Null
-  return null;
-static method main() → dynamic {
-  self::map<Null>(() → Null {}, () → <BottomType>=> throw "hello");
-  self::map<Null>(() → <BottomType>=> throw "hello", () → Null {});
-  () →* Null f = () → Null {};
-  self::map<Null>(#C1, () → <BottomType>=> throw "hello");
-  self::map<Null>(() → <BottomType>=> throw "hello", #C1);
-  self::map<Null>(() → Null {
-    return null;
-  }, () → <BottomType>=> throw "hello");
-  self::map<Null>(() → <BottomType>=> throw "hello", () → Null {
-    return null;
-  });
-  self::id<() →* Null>(() → Null {});
-}
-
-constants  {
-  #C1 = tearoff self::foo
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart b/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart
deleted file mode 100644
index 2c66ccf..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// 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.6
-
-abstract class Foo<T> {
-  List<T> get list;
-  void setList<T>(List<T> value);
-}
-
-class Bar implements Foo<int> {
-  List<int> list;
-  void setList<int>(List<int> value) {
-    list = value;
-  }
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.textual_outline.expect
deleted file mode 100644
index 0f82905..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class Foo<T> {
-  List<T> get list;
-  void setList<T>(List<T> value);
-}
-
-class Bar implements Foo<int> {
-  List<int> list;
-  void setList<int>(List<int> value) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.textual_outline_modelled.expect
deleted file mode 100644
index 0f82905..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class Foo<T> {
-  List<T> get list;
-  void setList<T>(List<T> value);
-}
-
-class Bar implements Foo<int> {
-  List<int> list;
-  void setList<int>(List<int> value) {}
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.expect
deleted file mode 100644
index 0e01251..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart:15:12: Error: A value of type 'List<int/*1*/>' can't be assigned to a variable of type 'List<int/*2*/>'.
-//  - 'List' is from 'dart:core'.
-//  - 'int/*1*/' is from 'pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart'.
-//  - 'int/*2*/' is from 'dart:core'.
-//     list = value;
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class Foo<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Foo<self::Foo::T*>*
-    : super core::Object::•()
-    ;
-  abstract get list() → core::List<self::Foo::T*>*;
-  abstract method setList<T extends core::Object* = dynamic>(core::List<self::Foo::setList::T*>* value) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object implements self::Foo<core::int*> {
-  field core::List<core::int*>* list = null;
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  method setList<int extends core::Object* = dynamic>(core::List<self::Bar::setList::int*>* value) → void {
-    this.{self::Bar::list} = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart:15:12: Error: A value of type 'List<int/*1*/>' can't be assigned to a variable of type 'List<int/*2*/>'.
- - 'List' is from 'dart:core'.
- - 'int/*1*/' is from 'pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart'.
- - 'int/*2*/' is from 'dart:core'.
-    list = value;
-           ^" in value as{TypeError} core::List<core::int*>*;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.outline.expect
deleted file mode 100644
index c0e0f1c..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.outline.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-abstract class Foo<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Foo<self::Foo::T*>*
-    ;
-  abstract get list() → core::List<self::Foo::T*>*;
-  abstract method setList<T extends core::Object* = dynamic>(core::List<self::Foo::setList::T*>* value) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object implements self::Foo<core::int*> {
-  field core::List<core::int*>* list;
-  synthetic constructor •() → self::Bar*
-    ;
-  method setList<int extends core::Object* = dynamic>(core::List<self::Bar::setList::int*>* value) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.transformed.expect
deleted file mode 100644
index 0e01251..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart.weak.transformed.expect
+++ /dev/null
@@ -1,55 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart:15:12: Error: A value of type 'List<int/*1*/>' can't be assigned to a variable of type 'List<int/*2*/>'.
-//  - 'List' is from 'dart:core'.
-//  - 'int/*1*/' is from 'pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart'.
-//  - 'int/*2*/' is from 'dart:core'.
-//     list = value;
-//            ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class Foo<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::Foo<self::Foo::T*>*
-    : super core::Object::•()
-    ;
-  abstract get list() → core::List<self::Foo::T*>*;
-  abstract method setList<T extends core::Object* = dynamic>(core::List<self::Foo::setList::T*>* value) → void;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Bar extends core::Object implements self::Foo<core::int*> {
-  field core::List<core::int*>* list = null;
-  synthetic constructor •() → self::Bar*
-    : super core::Object::•()
-    ;
-  method setList<int extends core::Object* = dynamic>(core::List<self::Bar::setList::int*>* value) → void {
-    this.{self::Bar::list} = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart:15:12: Error: A value of type 'List<int/*1*/>' can't be assigned to a variable of type 'List<int/*2*/>'.
- - 'List' is from 'dart:core'.
- - 'int/*1*/' is from 'pkg/front_end/testcases/general_nnbd_opt_out/type_parameter_type_named_int.dart'.
- - 'int/*2*/' is from 'dart:core'.
-    list = value;
-           ^" in value as{TypeError} core::List<core::int*>*;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart
deleted file mode 100644
index 3dc92a2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-abstract class A<T> extends T {}
-
-abstract class B<T> extends T {
-  B();
-}
-
-class C<T> extends T {}
-
-main() {
-  new A();
-  new B();
-  new C();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.textual_outline.expect
deleted file mode 100644
index 829888b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.textual_outline.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class A<T> extends T {}
-
-abstract class B<T> extends T {
-  B();
-}
-
-class C<T> extends T {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.textual_outline_modelled.expect
deleted file mode 100644
index 829888b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,10 +0,0 @@
-// @dart = 2.6
-abstract class A<T> extends T {}
-
-abstract class B<T> extends T {
-  B();
-}
-
-class C<T> extends T {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.expect
deleted file mode 100644
index 6d83a21..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:7:16: Error: The type variable 'T' can't be used as supertype.
-// abstract class A<T> extends T {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:9:16: Error: The type variable 'T' can't be used as supertype.
-// abstract class B<T> extends T {
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:13:7: Error: The type variable 'T' can't be used as supertype.
-// class C<T> extends T {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:16:7: Error: The class 'A' is abstract and can't be instantiated.
-//   new A();
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:17:7: Error: The class 'B' is abstract and can't be instantiated.
-//   new B();
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B<T extends core::Object* = dynamic> extends core::Object {
-  constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  throw new core::AbstractClassInstantiationError::•("A");
-  throw new core::AbstractClassInstantiationError::•("B");
-  new self::C::•<dynamic>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.outline.expect
deleted file mode 100644
index 92a6a18..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.outline.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:7:16: Error: The type variable 'T' can't be used as supertype.
-// abstract class A<T> extends T {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:9:16: Error: The type variable 'T' can't be used as supertype.
-// abstract class B<T> extends T {
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:13:7: Error: The type variable 'T' can't be used as supertype.
-// class C<T> extends T {}
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B<T extends core::Object* = dynamic> extends core::Object {
-  constructor •() → self::B<self::B::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.transformed.expect
deleted file mode 100644
index 6d83a21..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart.weak.transformed.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:7:16: Error: The type variable 'T' can't be used as supertype.
-// abstract class A<T> extends T {}
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:9:16: Error: The type variable 'T' can't be used as supertype.
-// abstract class B<T> extends T {
-//                ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:13:7: Error: The type variable 'T' can't be used as supertype.
-// class C<T> extends T {}
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:16:7: Error: The class 'A' is abstract and can't be instantiated.
-//   new A();
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_as_super.dart:17:7: Error: The class 'B' is abstract and can't be instantiated.
-//   new B();
-//       ^
-//
-import self as self;
-import "dart:core" as core;
-
-abstract class A<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::A<self::A::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class B<T extends core::Object* = dynamic> extends core::Object {
-  constructor •() → self::B<self::B::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  throw new core::AbstractClassInstantiationError::•("A");
-  throw new core::AbstractClassInstantiationError::•("B");
-  new self::C::•<dynamic>();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart
deleted file mode 100644
index dd99cbe..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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.6
-
-class DynamicClass<T extends dynamic, S extends T> {
-  T field1;
-  T field2;
-
-  DynamicClass(this.field1, this.field2);
-
-  method() => field1 * field2;
-}
-
-class NumClass<T extends num, S extends T> {
-  T field1;
-  S field2;
-
-  NumClass(this.field1, this.field2);
-
-  num method1() => field1 * field2;
-
-  num method2() => field1 + field2.length;
-}
-
-main() {
-  new DynamicClass<num, int>(0.5, 2).method();
-  new NumClass<num, double>(2, 0.5).method1();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.textual_outline.expect
deleted file mode 100644
index 60421d4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.textual_outline.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-class DynamicClass<T extends dynamic, S extends T> {
-  T field1;
-  T field2;
-  DynamicClass(this.field1, this.field2);
-  method() => field1 * field2;
-}
-
-class NumClass<T extends num, S extends T> {
-  T field1;
-  S field2;
-  NumClass(this.field1, this.field2);
-  num method1() => field1 * field2;
-  num method2() => field1 + field2.length;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.textual_outline_modelled.expect
deleted file mode 100644
index 65451d7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,17 +0,0 @@
-// @dart = 2.6
-class DynamicClass<T extends dynamic, S extends T> {
-  DynamicClass(this.field1, this.field2);
-  T field1;
-  T field2;
-  method() => field1 * field2;
-}
-
-class NumClass<T extends num, S extends T> {
-  NumClass(this.field1, this.field2);
-  S field2;
-  T field1;
-  num method1() => field1 * field2;
-  num method2() => field1 + field2.length;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.expect
deleted file mode 100644
index 0feb0ae..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart:24:36: Error: The getter 'length' isn't defined for the class 'num'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
-//   num method2() => field1 + field2.length;
-//                                    ^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class DynamicClass<T extends dynamic = dynamic, S extends self::DynamicClass::T* = dynamic> extends core::Object {
-  generic-covariant-impl field self::DynamicClass::T* field1;
-  generic-covariant-impl field self::DynamicClass::T* field2;
-  constructor •(self::DynamicClass::T* field1, self::DynamicClass::T* field2) → self::DynamicClass<self::DynamicClass::T*, self::DynamicClass::S*>*
-    : self::DynamicClass::field1 = field1, self::DynamicClass::field2 = field2, super core::Object::•()
-    ;
-  method method() → dynamic
-    return this.{self::DynamicClass::field1}.*(this.{self::DynamicClass::field2});
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class NumClass<T extends core::num* = core::num*, S extends self::NumClass::T* = core::num*> extends core::Object {
-  generic-covariant-impl field self::NumClass::T* field1;
-  generic-covariant-impl field self::NumClass::S* field2;
-  constructor •(self::NumClass::T* field1, self::NumClass::S* field2) → self::NumClass<self::NumClass::T*, self::NumClass::S*>*
-    : self::NumClass::field1 = field1, self::NumClass::field2 = field2, super core::Object::•()
-    ;
-  method method1() → core::num*
-    return this.{self::NumClass::field1}.{core::num::*}(this.{self::NumClass::field2});
-  method method2() → core::num*
-    return this.{self::NumClass::field1}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart:24:36: Error: The getter 'length' isn't defined for the class 'num'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
-  num method2() => field1 + field2.length;
-                                   ^^^^^^" as{TypeError,ForDynamic} core::num*);
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::DynamicClass::•<core::num*, core::int*>(0.5, 2).{self::DynamicClass::method}();
-  new self::NumClass::•<core::num*, core::double*>(2, 0.5).{self::NumClass::method1}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.outline.expect
deleted file mode 100644
index 699a660..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.outline.expect
+++ /dev/null
@@ -1,44 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class DynamicClass<T extends dynamic = dynamic, S extends self::DynamicClass::T* = dynamic> extends core::Object {
-  generic-covariant-impl field self::DynamicClass::T* field1;
-  generic-covariant-impl field self::DynamicClass::T* field2;
-  constructor •(self::DynamicClass::T* field1, self::DynamicClass::T* field2) → self::DynamicClass<self::DynamicClass::T*, self::DynamicClass::S*>*
-    ;
-  method method() → dynamic
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class NumClass<T extends core::num* = core::num*, S extends self::NumClass::T* = core::num*> extends core::Object {
-  generic-covariant-impl field self::NumClass::T* field1;
-  generic-covariant-impl field self::NumClass::S* field2;
-  constructor •(self::NumClass::T* field1, self::NumClass::S* field2) → self::NumClass<self::NumClass::T*, self::NumClass::S*>*
-    ;
-  method method1() → core::num*
-    ;
-  method method2() → core::num*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.transformed.expect
deleted file mode 100644
index a7cabde..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart.weak.transformed.expect
+++ /dev/null
@@ -1,59 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart:24:36: Error: The getter 'length' isn't defined for the class 'num'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
-//   num method2() => field1 + field2.length;
-//                                    ^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class DynamicClass<T extends dynamic = dynamic, S extends self::DynamicClass::T* = dynamic> extends core::Object {
-  generic-covariant-impl field self::DynamicClass::T* field1;
-  generic-covariant-impl field self::DynamicClass::T* field2;
-  constructor •(self::DynamicClass::T* field1, self::DynamicClass::T* field2) → self::DynamicClass<self::DynamicClass::T*, self::DynamicClass::S*>*
-    : self::DynamicClass::field1 = field1, self::DynamicClass::field2 = field2, super core::Object::•()
-    ;
-  method method() → dynamic
-    return this.{self::DynamicClass::field1}.*(this.{self::DynamicClass::field2});
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class NumClass<T extends core::num* = core::num*, S extends self::NumClass::T* = core::num*> extends core::Object {
-  generic-covariant-impl field self::NumClass::T* field1;
-  generic-covariant-impl field self::NumClass::S* field2;
-  constructor •(self::NumClass::T* field1, self::NumClass::S* field2) → self::NumClass<self::NumClass::T*, self::NumClass::S*>*
-    : self::NumClass::field1 = field1, self::NumClass::field2 = field2, super core::Object::•()
-    ;
-  method method1() → core::num*
-    return this.{self::NumClass::field1}.{core::num::*}(this.{self::NumClass::field2});
-  method method2() → core::num*
-    return this.{self::NumClass::field1}.{core::num::+}(invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/type_variable_bound_access.dart:24:36: Error: The getter 'length' isn't defined for the class 'num'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'length'.
-  num method2() => field1 + field2.length;
-                                   ^^^^^^");
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::DynamicClass::•<core::num*, core::int*>(0.5, 2).{self::DynamicClass::method}();
-  new self::NumClass::•<core::num*, core::double*>(2, 0.5).{self::NumClass::method1}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart
deleted file mode 100644
index d622ec2..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-import "dart:core" as T;
-
-class C<T> {
-  T.String method() => "Hello, World!";
-}
-
-main() {
-  T.String s = new C().method();
-  T.print(s);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.textual_outline.expect
deleted file mode 100644
index 8ce9e43..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-import "dart:core" as T;
-
-class C<T> {
-  T.String method() => "Hello, World!";
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.textual_outline_modelled.expect
deleted file mode 100644
index 8ce9e43..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-import "dart:core" as T;
-
-class C<T> {
-  T.String method() => "Hello, World!";
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.expect
deleted file mode 100644
index 9722383..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart:10:3: Error: 'T.String' can't be used as a type because 'T' doesn't refer to an import prefix.
-//   T.String method() => "Hello, World!";
-//   ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "dart:core" as T;
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  method method() → invalid-type
-    return "Hello, World!";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::String* s = new self::C::•<dynamic>().{self::C::method}();
-  core::print(s);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.outline.expect
deleted file mode 100644
index aa9c40d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.outline.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart:10:3: Error: 'T.String' can't be used as a type because 'T' doesn't refer to an import prefix.
-//   T.String method() => "Hello, World!";
-//   ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "dart:core" as T;
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    ;
-  method method() → invalid-type
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.transformed.expect
deleted file mode 100644
index 9722383..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart.weak.transformed.expect
+++ /dev/null
@@ -1,34 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_prefix.dart:10:3: Error: 'T.String' can't be used as a type because 'T' doesn't refer to an import prefix.
-//   T.String method() => "Hello, World!";
-//   ^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-import "dart:core" as T;
-
-class C<T extends core::Object* = dynamic> extends core::Object {
-  synthetic constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  method method() → invalid-type
-    return "Hello, World!";
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  core::String* s = new self::C::•<dynamic>().{self::C::method}();
-  core::print(s);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart
deleted file mode 100644
index fcb72d1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class C<T> {
-  const C();
-  static C<T> staticMethod() {
-    print(T);
-    T t;
-    C<T> l;
-    C<C<T>> ll;
-    const C<T>();
-    const <T>[];
-    const <C<T>>[];
-    const <Object>[T];
-    const <Object>[const C<T>()];
-  }
-
-  C<T> instanceMethod() {
-    print(T);
-    T t;
-    C<T> l;
-    C<C<T>> ll;
-    const C<T>();
-    const <T>[];
-    const <C<T>>[];
-    const <Object>[T];
-    const <Object>[const C<T>()];
-  }
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.textual_outline.expect
deleted file mode 100644
index f26d098..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class C<T> {
-  const C();
-  static C<T> staticMethod() {}
-  C<T> instanceMethod() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.textual_outline_modelled.expect
deleted file mode 100644
index 39e4742..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class C<T> {
-  C<T> instanceMethod() {}
-  const C();
-  static C<T> staticMethod() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.expect
deleted file mode 100644
index ddc2500..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.expect
+++ /dev/null
@@ -1,120 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:9:15: Error: Can only use type variables in instance methods.
-//   static C<T> staticMethod() {
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:10:11: Error: Type variables can't be used in static members.
-//     print(T);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:11:5: Error: Type variables can't be used in static members.
-//     T t;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:12:7: Error: Type variables can't be used in static members.
-//     C<T> l;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:13:9: Error: Type variables can't be used in static members.
-//     C<C<T>> ll;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:14:13: Error: Type variables can't be used in static members.
-//     const C<T>();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:15:12: Error: Type variables can't be used in static members.
-//     const <T>[];
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:16:14: Error: Type variables can't be used in static members.
-//     const <C<T>>[];
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:17:20: Error: Type variables can't be used in static members.
-//     const <Object>[T];
-//                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:18:28: Error: Type variables can't be used in static members.
-//     const <Object>[const C<T>()];
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:26:13: Error: Type variables can't be used as constants.
-//     const C<T>();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:27:12: Error: Type variables can't be used as constants.
-//     const <T>[];
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:28:14: Error: Type variables can't be used as constants.
-//     const <C<T>>[];
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:29:20: Error: Type variables can't be used as constants.
-//     const <Object>[T];
-//                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:30:28: Error: Type variables can't be used as constants.
-//     const <Object>[const C<T>()];
-//                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  static method staticMethod() → self::C<dynamic>* {
-    core::print(#C1);
-    invalid-type t;
-    self::C<invalid-type>* l;
-    self::C<self::C<invalid-type>*>* ll;
-    #C2;
-    #C3;
-    #C4;
-    #C5;
-    #C6;
-  }
-  method instanceMethod() → self::C<self::C::T*>* {
-    core::print(self::C::T*);
-    self::C::T* t;
-    self::C<self::C::T*>* l;
-    self::C<self::C<self::C::T*>*>* ll;
-    #C2;
-    #C3;
-    #C4;
-    #C5;
-    #C6;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = TypeLiteralConstant(invalid-type)
-  #C2 = self::C<invalid-type> {}
-  #C3 = <invalid-type>[]
-  #C4 = <self::C<invalid-type>*>[]
-  #C5 = <core::Object*>[#C1]
-  #C6 = <core::Object*>[#C2]
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///type_variable_uses.dart:
-- C. (from org-dartlang-testcase:///type_variable_uses.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.outline.expect
deleted file mode 100644
index 634d0c0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.outline.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:9:15: Error: Can only use type variables in instance methods.
-//   static C<T> staticMethod() {
-//               ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  static method staticMethod() → self::C<dynamic>*
-    ;
-  method instanceMethod() → self::C<self::C::T*>*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.transformed.expect
deleted file mode 100644
index ddc2500..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart.weak.transformed.expect
+++ /dev/null
@@ -1,120 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:9:15: Error: Can only use type variables in instance methods.
-//   static C<T> staticMethod() {
-//               ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:10:11: Error: Type variables can't be used in static members.
-//     print(T);
-//           ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:11:5: Error: Type variables can't be used in static members.
-//     T t;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:12:7: Error: Type variables can't be used in static members.
-//     C<T> l;
-//       ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:13:9: Error: Type variables can't be used in static members.
-//     C<C<T>> ll;
-//         ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:14:13: Error: Type variables can't be used in static members.
-//     const C<T>();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:15:12: Error: Type variables can't be used in static members.
-//     const <T>[];
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:16:14: Error: Type variables can't be used in static members.
-//     const <C<T>>[];
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:17:20: Error: Type variables can't be used in static members.
-//     const <Object>[T];
-//                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:18:28: Error: Type variables can't be used in static members.
-//     const <Object>[const C<T>()];
-//                            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:26:13: Error: Type variables can't be used as constants.
-//     const C<T>();
-//             ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:27:12: Error: Type variables can't be used as constants.
-//     const <T>[];
-//            ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:28:14: Error: Type variables can't be used as constants.
-//     const <C<T>>[];
-//              ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:29:20: Error: Type variables can't be used as constants.
-//     const <Object>[T];
-//                    ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/type_variable_uses.dart:30:28: Error: Type variables can't be used as constants.
-//     const <Object>[const C<T>()];
-//                            ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C<T extends core::Object* = dynamic> extends core::Object /*hasConstConstructor*/  {
-  const constructor •() → self::C<self::C::T*>*
-    : super core::Object::•()
-    ;
-  static method staticMethod() → self::C<dynamic>* {
-    core::print(#C1);
-    invalid-type t;
-    self::C<invalid-type>* l;
-    self::C<self::C<invalid-type>*>* ll;
-    #C2;
-    #C3;
-    #C4;
-    #C5;
-    #C6;
-  }
-  method instanceMethod() → self::C<self::C::T*>* {
-    core::print(self::C::T*);
-    self::C::T* t;
-    self::C<self::C::T*>* l;
-    self::C<self::C<self::C::T*>*>* ll;
-    #C2;
-    #C3;
-    #C4;
-    #C5;
-    #C6;
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {}
-
-constants  {
-  #C1 = TypeLiteralConstant(invalid-type)
-  #C2 = self::C<invalid-type> {}
-  #C3 = <invalid-type>[]
-  #C4 = <self::C<invalid-type>*>[]
-  #C5 = <core::Object*>[#C1]
-  #C6 = <core::Object*>[#C2]
-}
-
-
-Constructor coverage from constants:
-org-dartlang-testcase:///type_variable_uses.dart:
-- C. (from org-dartlang-testcase:///type_variable_uses.dart:8:9)
-- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart b/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart
deleted file mode 100644
index 8ec17bb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-typedef _NullaryFunction();
-typedef _UnaryFunction(args);
-typedef _BinaryFunction(args, message);
-
-main() {
-  print(main is _NullaryFunction);
-  print(main is _UnaryFunction);
-  print(main is _BinaryFunction);
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.textual_outline.expect
deleted file mode 100644
index 3e2bcc6..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-typedef _NullaryFunction();
-typedef _UnaryFunction(args);
-typedef _BinaryFunction(args, message);
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6e9e640..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-main() {}
-typedef _BinaryFunction(args, message);
-typedef _NullaryFunction();
-typedef _UnaryFunction(args);
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.expect
deleted file mode 100644
index 979f6c8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.expect
+++ /dev/null
@@ -1,16 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef _NullaryFunction = () →* dynamic;
-typedef _UnaryFunction = (dynamic) →* dynamic;
-typedef _BinaryFunction = (dynamic, dynamic) →* dynamic;
-static method main() → dynamic {
-  core::print((#C1) is () →* dynamic);
-  core::print((#C1) is (dynamic) →* dynamic);
-  core::print((#C1) is (dynamic, dynamic) →* dynamic);
-}
-
-constants  {
-  #C1 = tearoff self::main
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.outline.expect
deleted file mode 100644
index b50eefb..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-library;
-import self as self;
-
-typedef _NullaryFunction = () →* dynamic;
-typedef _UnaryFunction = (dynamic) →* dynamic;
-typedef _BinaryFunction = (dynamic, dynamic) →* dynamic;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.transformed.expect
deleted file mode 100644
index 6176ac4..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/typedef.dart.weak.transformed.expect
+++ /dev/null
@@ -1,22 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-typedef _NullaryFunction = () →* dynamic;
-typedef _UnaryFunction = (dynamic) →* dynamic;
-typedef _BinaryFunction = (dynamic, dynamic) →* dynamic;
-static method main() → dynamic {
-  core::print((#C1) is () →* dynamic);
-  core::print((#C1) is (dynamic) →* dynamic);
-  core::print((#C1) is (dynamic, dynamic) →* dynamic);
-}
-
-constants  {
-  #C1 = tearoff self::main
-}
-
-Extra constant evaluation status:
-Evaluated: IsExpression @ org-dartlang-testcase:///typedef.dart:12:14 -> BoolConstant(true)
-Evaluated: IsExpression @ org-dartlang-testcase:///typedef.dart:13:14 -> BoolConstant(false)
-Evaluated: IsExpression @ org-dartlang-testcase:///typedef.dart:14:14 -> BoolConstant(false)
-Extra constant evaluation: evaluated: 6, effectively constant: 3
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart b/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart
deleted file mode 100644
index a95fa08..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class C {
-  var x;
-  void f() {}
-}
-
-void test(C c) {
-  c.x;
-  c.y;
-  c.f();
-  c.g();
-  c.x = null;
-  c.y = null;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.textual_outline.expect
deleted file mode 100644
index 9fd10ce..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.textual_outline.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class C {
-  var x;
-  void f() {}
-}
-
-void test(C c) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.textual_outline_modelled.expect
deleted file mode 100644
index 646c90b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,8 +0,0 @@
-// @dart = 2.6
-class C {
-  var x;
-  void f() {}
-}
-
-main() {}
-void test(C c) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.expect
deleted file mode 100644
index f26ef78..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:14:5: Error: The getter 'y' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
-//   c.y;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:16:5: Error: The method 'g' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'g'.
-//   c.g();
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:18:5: Error: The setter 'y' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
-//   c.y = null;
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic x = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method f() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(self::C* c) → void {
-  c.{self::C::x};
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:14:5: Error: The getter 'y' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
-  c.y;
-    ^";
-  c.{self::C::f}();
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:16:5: Error: The method 'g' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'g'.
-  c.g();
-    ^";
-  c.{self::C::x} = null;
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:18:5: Error: The setter 'y' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
-  c.y = null;
-    ^";
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.outline.expect
deleted file mode 100644
index 83a27aa..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.outline.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic x;
-  synthetic constructor •() → self::C*
-    ;
-  method f() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(self::C* c) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.transformed.expect
deleted file mode 100644
index f26ef78..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart.weak.transformed.expect
+++ /dev/null
@@ -1,63 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:14:5: Error: The getter 'y' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
-//   c.y;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:16:5: Error: The method 'g' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'g'.
-//   c.g();
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:18:5: Error: The setter 'y' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
-//   c.y = null;
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic x = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method f() → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(self::C* c) → void {
-  c.{self::C::x};
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:14:5: Error: The getter 'y' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'y'.
-  c.y;
-    ^";
-  c.{self::C::f}();
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:16:5: Error: The method 'g' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'g'.
-  c.g();
-    ^";
-  c.{self::C::x} = null;
-  invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart:18:5: Error: The setter 'y' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'y'.
-  c.y = null;
-    ^";
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart b/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart
deleted file mode 100644
index e26819b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class C {
-  void set x(value) {}
-}
-
-void test(C c) {
-  c.x = 1; // Ok
-  c.x += 1;
-  c.x ??= 1;
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.textual_outline.expect
deleted file mode 100644
index d78b4c8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.textual_outline.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class C {
-  void set x(value) {}
-}
-
-void test(C c) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.textual_outline_modelled.expect
deleted file mode 100644
index e21b39a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,7 +0,0 @@
-// @dart = 2.6
-class C {
-  void set x(value) {}
-}
-
-main() {}
-void test(C c) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.expect
deleted file mode 100644
index acb645f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:13:5: Error: The getter 'x' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-//   c.x += 1;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:14:5: Error: The getter 'x' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-//   c.x ??= 1;
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  set x(dynamic value) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(self::C* c) → void {
-  c.{self::C::x} = 1;
-  let final self::C* #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:13:5: Error: The getter 'x' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-  c.x += 1;
-    ^".+(1);
-  let final self::C* #t2 = c in invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:14:5: Error: The getter 'x' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-  c.x ??= 1;
-    ^".{core::Object::==}(null) ?{dynamic} #t2.{self::C::x} = 1 : null;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.outline.expect
deleted file mode 100644
index 93a68f8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    ;
-  set x(dynamic value) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(self::C* c) → void
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.transformed.expect
deleted file mode 100644
index acb645f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart.weak.transformed.expect
+++ /dev/null
@@ -1,49 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:13:5: Error: The getter 'x' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-//   c.x += 1;
-//     ^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:14:5: Error: The getter 'x' isn't defined for the class 'C'.
-//  - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-//   c.x ??= 1;
-//     ^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  set x(dynamic value) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method test(self::C* c) → void {
-  c.{self::C::x} = 1;
-  let final self::C* #t1 = c in #t1.{self::C::x} = invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:13:5: Error: The getter 'x' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-  c.x += 1;
-    ^".+(1);
-  let final self::C* #t2 = c in invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart:14:5: Error: The getter 'x' isn't defined for the class 'C'.
- - 'C' is from 'pkg/front_end/testcases/general_nnbd_opt_out/undefined_getter_in_compound_assignment.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'x'.
-  c.x ??= 1;
-    ^".{core::Object::==}(null) ?{dynamic} #t2.{self::C::x} = 1 : null;
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart b/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart
deleted file mode 100644
index f785241..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2016, 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.6
-
-class Uninitialized {
-  int x;
-}
-
-class PartiallyInitialized {
-  int x;
-  PartiallyInitialized(this.x);
-  PartiallyInitialized.noInitializer();
-}
-
-class Initialized {
-  int x;
-  Initialized(this.x);
-}
-
-class Forwarding {
-  int x;
-  Forwarding.initialize(this.x);
-  Forwarding(int arg) : this.initialize(arg);
-}
-
-int uninitializedTopLevel;
-int initializedTopLevel = 4;
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.textual_outline.expect
deleted file mode 100644
index ae51bee..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.textual_outline.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-// @dart = 2.6
-class Uninitialized {
-  int x;
-}
-
-class PartiallyInitialized {
-  int x;
-  PartiallyInitialized(this.x);
-  PartiallyInitialized.noInitializer();
-}
-
-class Initialized {
-  int x;
-  Initialized(this.x);
-}
-
-class Forwarding {
-  int x;
-  Forwarding.initialize(this.x);
-  Forwarding(int arg) : this.initialize(arg);
-}
-
-int uninitializedTopLevel;
-int initializedTopLevel = 4;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.textual_outline_modelled.expect
deleted file mode 100644
index 7bd0081..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,25 +0,0 @@
-// @dart = 2.6
-class Forwarding {
-  Forwarding(int arg) : this.initialize(arg);
-  Forwarding.initialize(this.x);
-  int x;
-}
-
-class Initialized {
-  Initialized(this.x);
-  int x;
-}
-
-class PartiallyInitialized {
-  PartiallyInitialized(this.x);
-  PartiallyInitialized.noInitializer();
-  int x;
-}
-
-class Uninitialized {
-  int x;
-}
-
-int initializedTopLevel = 4;
-int uninitializedTopLevel;
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.expect
deleted file mode 100644
index 66c109b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Uninitialized extends core::Object {
-  field core::int* x = null;
-  synthetic constructor •() → self::Uninitialized*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class PartiallyInitialized extends core::Object {
-  field core::int* x;
-  constructor •(core::int* x) → self::PartiallyInitialized*
-    : self::PartiallyInitialized::x = x, super core::Object::•()
-    ;
-  constructor noInitializer() → self::PartiallyInitialized*
-    : self::PartiallyInitialized::x = null, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Initialized extends core::Object {
-  field core::int* x;
-  constructor •(core::int* x) → self::Initialized*
-    : self::Initialized::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Forwarding extends core::Object {
-  field core::int* x;
-  constructor initialize(core::int* x) → self::Forwarding*
-    : self::Forwarding::x = x, super core::Object::•()
-    ;
-  constructor •(core::int* arg) → self::Forwarding*
-    : this self::Forwarding::initialize(arg)
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* uninitializedTopLevel;
-static field core::int* initializedTopLevel = 4;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.outline.expect
deleted file mode 100644
index 0c30a7d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.outline.expect
+++ /dev/null
@@ -1,72 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Uninitialized extends core::Object {
-  field core::int* x;
-  synthetic constructor •() → self::Uninitialized*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class PartiallyInitialized extends core::Object {
-  field core::int* x;
-  constructor •(core::int* x) → self::PartiallyInitialized*
-    ;
-  constructor noInitializer() → self::PartiallyInitialized*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Initialized extends core::Object {
-  field core::int* x;
-  constructor •(core::int* x) → self::Initialized*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Forwarding extends core::Object {
-  field core::int* x;
-  constructor initialize(core::int* x) → self::Forwarding*
-    ;
-  constructor •(core::int* arg) → self::Forwarding*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* uninitializedTopLevel;
-static field core::int* initializedTopLevel;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.transformed.expect
deleted file mode 100644
index 66c109b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/uninitialized_fields.dart.weak.transformed.expect
+++ /dev/null
@@ -1,77 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Uninitialized extends core::Object {
-  field core::int* x = null;
-  synthetic constructor •() → self::Uninitialized*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class PartiallyInitialized extends core::Object {
-  field core::int* x;
-  constructor •(core::int* x) → self::PartiallyInitialized*
-    : self::PartiallyInitialized::x = x, super core::Object::•()
-    ;
-  constructor noInitializer() → self::PartiallyInitialized*
-    : self::PartiallyInitialized::x = null, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Initialized extends core::Object {
-  field core::int* x;
-  constructor •(core::int* x) → self::Initialized*
-    : self::Initialized::x = x, super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class Forwarding extends core::Object {
-  field core::int* x;
-  constructor initialize(core::int* x) → self::Forwarding*
-    : self::Forwarding::x = x, super core::Object::•()
-    ;
-  constructor •(core::int* arg) → self::Forwarding*
-    : this self::Forwarding::initialize(arg)
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static field core::int* uninitializedTopLevel;
-static field core::int* initializedTopLevel = 4;
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart b/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart
deleted file mode 100644
index 0ab22e8..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart
+++ /dev/null
@@ -1,36 +0,0 @@
-// 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.6
-
-class A {}
-
-class B {}
-
-class C extends B implements A {}
-
-List<A> list;
-
-List<T> g<T extends A>(T t) {
-  list = <T>[];
-  print(list.runtimeType);
-  return list;
-}
-
-List<S> f<S>(S s) {
-  if (s is A) {
-    var list = g(s);
-    return list;
-  }
-  return null;
-}
-
-main() {
-  f<B>(new C());
-  print(list.runtimeType);
-  List<A> aList;
-  aList = list;
-  Object o = aList;
-  aList = o;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.textual_outline.expect
deleted file mode 100644
index fe7b0e7..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.textual_outline.expect
+++ /dev/null
@@ -1,11 +0,0 @@
-// @dart = 2.6
-class A {}
-
-class B {}
-
-class C extends B implements A {}
-
-List<A> list;
-List<T> g<T extends A>(T t) {}
-List<S> f<S>(S s) {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.textual_outline_modelled.expect
deleted file mode 100644
index 6664ade..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,12 +0,0 @@
-// @dart = 2.6
-List<A> list;
-List<S> f<S>(S s) {}
-List<T> g<T extends A>(T t) {}
-
-class A {}
-
-class B {}
-
-class C extends B implements A {}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.weak.expect
deleted file mode 100644
index e428097..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.weak.expect
+++ /dev/null
@@ -1,72 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart:23:16: Error: Inferred type argument 'S' doesn't conform to the bound 'A' of the type variable 'T' on 'g'.
-//  - 'A' is from 'pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart'.
-// Try specifying type arguments explicitly so that they conform to the bounds.
-//     var list = g(s);
-//                ^
-// pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart:15:11: Context: This is the type variable whose bound isn't conformed to.
-// List<T> g<T extends A>(T t) {
-//           ^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B implements self::A {
-  synthetic constructor •() → self::C*
-    : super self::B::•()
-    ;
-}
-static field core::List<self::A*>* list;
-static method g<T extends self::A* = self::A*>(self::g::T* t) → core::List<self::g::T*>* {
-  self::list = <self::g::T*>[];
-  core::print(self::list.{core::Object::runtimeType});
-  return self::list as{TypeError} core::List<self::g::T*>*;
-}
-static method f<S extends core::Object* = dynamic>(self::f::S* s) → core::List<self::f::S*>* {
-  if(s is self::A*) {
-    core::List<self::f::S*>* list = self::g<self::f::S*>(s{self::f::S* & self::A* /* '*' & '*' = '*' */});
-    return list;
-  }
-  return null;
-}
-static method main() → dynamic {
-  self::f<self::B*>(new self::C::•());
-  core::print(self::list.{core::Object::runtimeType});
-  core::List<self::A*>* aList;
-  aList = self::list;
-  core::Object* o = aList;
-  aList = o as{TypeError} core::List<self::A*>*;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.weak.outline.expect
deleted file mode 100644
index 4d2b9c0..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unsound_promotion.dart.weak.outline.expect
+++ /dev/null
@@ -1,43 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class B extends core::Object {
-  synthetic constructor •() → self::B*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class C extends self::B implements self::A {
-  synthetic constructor •() → self::C*
-    ;
-}
-static field core::List<self::A*>* list;
-static method g<T extends self::A* = self::A*>(self::g::T* t) → core::List<self::g::T*>*
-  ;
-static method f<S extends core::Object* = dynamic>(self::f::S* s) → core::List<self::f::S*>*
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart b/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart
deleted file mode 100644
index 2ad3b52..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class UnusedClass {
-  UnusedClass() {
-    print('Unused');
-  }
-}
-
-abstract class UsedAsBaseClass {
-  void usedInSubclass() {
-    print('Unused');
-  }
-
-  void calledFromB() {
-    this.calledFromSubclass();
-  }
-
-  void calledFromSubclass() {
-    print('Unused');
-  }
-}
-
-class UsedAsInterface {
-  void usedInSubclass() {
-    print('Unused');
-  }
-}
-
-class InstantiatedButMethodsUnused {
-  void usedInSubclass() {
-    print('Unused');
-  }
-}
-
-class ClassA extends UsedAsBaseClass
-    implements UsedAsInterface, InstantiatedButMethodsUnused {
-  void usedInSubclass() {
-    print('A');
-  }
-}
-
-class ClassB extends UsedAsBaseClass
-    implements UsedAsInterface, InstantiatedButMethodsUnused {
-  void usedInSubclass() {
-    print('B');
-    calledFromB();
-  }
-
-  void calledFromSubclass() {}
-}
-
-void baseClassCall(UsedAsBaseClass object) {
-  object.usedInSubclass();
-}
-
-void interfaceCall(UsedAsInterface object) {
-  object.usedInSubclass();
-}
-
-void exactCallA(ClassA object) {
-  object.usedInSubclass();
-}
-
-void exactCallB(ClassB object) {
-  object.usedInSubclass();
-}
-
-unusedTopLevel() {
-  print('Unused');
-}
-
-usedTopLevel() {}
-
-main() {
-  usedTopLevel();
-
-  ClassA a = new ClassA();
-  exactCallA(a);
-  baseClassCall(a);
-  interfaceCall(a);
-
-  ClassB b = new ClassB();
-  exactCallB(b);
-  baseClassCall(b);
-  interfaceCall(b);
-
-  new InstantiatedButMethodsUnused();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.textual_outline.expect
deleted file mode 100644
index 5bbb73f..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.textual_outline.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-// @dart = 2.6
-class UnusedClass {
-  UnusedClass() {}
-}
-
-abstract class UsedAsBaseClass {
-  void usedInSubclass() {}
-  void calledFromB() {}
-  void calledFromSubclass() {}
-}
-
-class UsedAsInterface {
-  void usedInSubclass() {}
-}
-
-class InstantiatedButMethodsUnused {
-  void usedInSubclass() {}
-}
-
-class ClassA extends UsedAsBaseClass
-    implements UsedAsInterface, InstantiatedButMethodsUnused {
-  void usedInSubclass() {}
-}
-
-class ClassB extends UsedAsBaseClass
-    implements UsedAsInterface, InstantiatedButMethodsUnused {
-  void usedInSubclass() {}
-  void calledFromSubclass() {}
-}
-
-void baseClassCall(UsedAsBaseClass object) {}
-void interfaceCall(UsedAsInterface object) {}
-void exactCallA(ClassA object) {}
-void exactCallB(ClassB object) {}
-unusedTopLevel() {}
-usedTopLevel() {}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.textual_outline_modelled.expect
deleted file mode 100644
index 9d94c52..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,37 +0,0 @@
-// @dart = 2.6
-abstract class UsedAsBaseClass {
-  void calledFromB() {}
-  void calledFromSubclass() {}
-  void usedInSubclass() {}
-}
-
-class ClassA extends UsedAsBaseClass
-    implements UsedAsInterface, InstantiatedButMethodsUnused {
-  void usedInSubclass() {}
-}
-
-class ClassB extends UsedAsBaseClass
-    implements UsedAsInterface, InstantiatedButMethodsUnused {
-  void calledFromSubclass() {}
-  void usedInSubclass() {}
-}
-
-class InstantiatedButMethodsUnused {
-  void usedInSubclass() {}
-}
-
-class UnusedClass {
-  UnusedClass() {}
-}
-
-class UsedAsInterface {
-  void usedInSubclass() {}
-}
-
-main() {}
-unusedTopLevel() {}
-usedTopLevel() {}
-void baseClassCall(UsedAsBaseClass object) {}
-void exactCallA(ClassA object) {}
-void exactCallB(ClassB object) {}
-void interfaceCall(UsedAsInterface object) {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.expect
deleted file mode 100644
index e571d37..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.expect
+++ /dev/null
@@ -1,126 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class UnusedClass extends core::Object {
-  constructor •() → self::UnusedClass*
-    : super core::Object::•() {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class UsedAsBaseClass extends core::Object {
-  synthetic constructor •() → self::UsedAsBaseClass*
-    : super core::Object::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("Unused");
-  }
-  method calledFromB() → void {
-    this.{self::UsedAsBaseClass::calledFromSubclass}();
-  }
-  method calledFromSubclass() → void {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class UsedAsInterface extends core::Object {
-  synthetic constructor •() → self::UsedAsInterface*
-    : super core::Object::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class InstantiatedButMethodsUnused extends core::Object {
-  synthetic constructor •() → self::InstantiatedButMethodsUnused*
-    : super core::Object::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassA extends self::UsedAsBaseClass implements self::UsedAsInterface, self::InstantiatedButMethodsUnused {
-  synthetic constructor •() → self::ClassA*
-    : super self::UsedAsBaseClass::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("A");
-  }
-}
-class ClassB extends self::UsedAsBaseClass implements self::UsedAsInterface, self::InstantiatedButMethodsUnused {
-  synthetic constructor •() → self::ClassB*
-    : super self::UsedAsBaseClass::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("B");
-    this.{self::UsedAsBaseClass::calledFromB}();
-  }
-  method calledFromSubclass() → void {}
-}
-static method baseClassCall(self::UsedAsBaseClass* object) → void {
-  object.{self::UsedAsBaseClass::usedInSubclass}();
-}
-static method interfaceCall(self::UsedAsInterface* object) → void {
-  object.{self::UsedAsInterface::usedInSubclass}();
-}
-static method exactCallA(self::ClassA* object) → void {
-  object.{self::ClassA::usedInSubclass}();
-}
-static method exactCallB(self::ClassB* object) → void {
-  object.{self::ClassB::usedInSubclass}();
-}
-static method unusedTopLevel() → dynamic {
-  core::print("Unused");
-}
-static method usedTopLevel() → dynamic {}
-static method main() → dynamic {
-  self::usedTopLevel();
-  self::ClassA* a = new self::ClassA::•();
-  self::exactCallA(a);
-  self::baseClassCall(a);
-  self::interfaceCall(a);
-  self::ClassB* b = new self::ClassB::•();
-  self::exactCallB(b);
-  self::baseClassCall(b);
-  self::interfaceCall(b);
-  new self::InstantiatedButMethodsUnused::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.outline.expect
deleted file mode 100644
index 1ddee56..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.outline.expect
+++ /dev/null
@@ -1,98 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class UnusedClass extends core::Object {
-  constructor •() → self::UnusedClass*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class UsedAsBaseClass extends core::Object {
-  synthetic constructor •() → self::UsedAsBaseClass*
-    ;
-  method usedInSubclass() → void
-    ;
-  method calledFromB() → void
-    ;
-  method calledFromSubclass() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class UsedAsInterface extends core::Object {
-  synthetic constructor •() → self::UsedAsInterface*
-    ;
-  method usedInSubclass() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class InstantiatedButMethodsUnused extends core::Object {
-  synthetic constructor •() → self::InstantiatedButMethodsUnused*
-    ;
-  method usedInSubclass() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassA extends self::UsedAsBaseClass implements self::UsedAsInterface, self::InstantiatedButMethodsUnused {
-  synthetic constructor •() → self::ClassA*
-    ;
-  method usedInSubclass() → void
-    ;
-}
-class ClassB extends self::UsedAsBaseClass implements self::UsedAsInterface, self::InstantiatedButMethodsUnused {
-  synthetic constructor •() → self::ClassB*
-    ;
-  method usedInSubclass() → void
-    ;
-  method calledFromSubclass() → void
-    ;
-}
-static method baseClassCall(self::UsedAsBaseClass* object) → void
-  ;
-static method interfaceCall(self::UsedAsInterface* object) → void
-  ;
-static method exactCallA(self::ClassA* object) → void
-  ;
-static method exactCallB(self::ClassB* object) → void
-  ;
-static method unusedTopLevel() → dynamic
-  ;
-static method usedTopLevel() → dynamic
-  ;
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.transformed.expect
deleted file mode 100644
index e571d37..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/unused_methods.dart.weak.transformed.expect
+++ /dev/null
@@ -1,126 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class UnusedClass extends core::Object {
-  constructor •() → self::UnusedClass*
-    : super core::Object::•() {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-abstract class UsedAsBaseClass extends core::Object {
-  synthetic constructor •() → self::UsedAsBaseClass*
-    : super core::Object::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("Unused");
-  }
-  method calledFromB() → void {
-    this.{self::UsedAsBaseClass::calledFromSubclass}();
-  }
-  method calledFromSubclass() → void {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class UsedAsInterface extends core::Object {
-  synthetic constructor •() → self::UsedAsInterface*
-    : super core::Object::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class InstantiatedButMethodsUnused extends core::Object {
-  synthetic constructor •() → self::InstantiatedButMethodsUnused*
-    : super core::Object::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("Unused");
-  }
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class ClassA extends self::UsedAsBaseClass implements self::UsedAsInterface, self::InstantiatedButMethodsUnused {
-  synthetic constructor •() → self::ClassA*
-    : super self::UsedAsBaseClass::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("A");
-  }
-}
-class ClassB extends self::UsedAsBaseClass implements self::UsedAsInterface, self::InstantiatedButMethodsUnused {
-  synthetic constructor •() → self::ClassB*
-    : super self::UsedAsBaseClass::•()
-    ;
-  method usedInSubclass() → void {
-    core::print("B");
-    this.{self::UsedAsBaseClass::calledFromB}();
-  }
-  method calledFromSubclass() → void {}
-}
-static method baseClassCall(self::UsedAsBaseClass* object) → void {
-  object.{self::UsedAsBaseClass::usedInSubclass}();
-}
-static method interfaceCall(self::UsedAsInterface* object) → void {
-  object.{self::UsedAsInterface::usedInSubclass}();
-}
-static method exactCallA(self::ClassA* object) → void {
-  object.{self::ClassA::usedInSubclass}();
-}
-static method exactCallB(self::ClassB* object) → void {
-  object.{self::ClassB::usedInSubclass}();
-}
-static method unusedTopLevel() → dynamic {
-  core::print("Unused");
-}
-static method usedTopLevel() → dynamic {}
-static method main() → dynamic {
-  self::usedTopLevel();
-  self::ClassA* a = new self::ClassA::•();
-  self::exactCallA(a);
-  self::baseClassCall(a);
-  self::interfaceCall(a);
-  self::ClassB* b = new self::ClassB::•();
-  self::exactCallB(b);
-  self::baseClassCall(b);
-  self::interfaceCall(b);
-  new self::InstantiatedButMethodsUnused::•();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart b/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart
deleted file mode 100644
index 381135e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) 2018, 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.6
-
-class A {
-  Map<String, var> m;
-}
-
-main() {
-  var a = new A();
-  a.m = null;
-}
-
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.textual_outline.expect
deleted file mode 100644
index a86e669..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.textual_outline.expect
+++ /dev/null
@@ -1,5 +0,0 @@
-// @dart = 2.6
-class A {
-  Map<String, var> m;
-}
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.expect
deleted file mode 100644
index bca5d90..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: The keyword 'var' can't be used as a type name.
-//   Map<String, var> m;
-//               ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: Type 'var' not found.
-//   Map<String, var> m;
-//               ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: 'var' isn't a type.
-//   Map<String, var> m;
-//               ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::Map<core::String*, invalid-type>* m = null;
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::A* a = new self::A::•();
-  a.{self::A::m} = null;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.outline.expect
deleted file mode 100644
index 0208ae1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.outline.expect
+++ /dev/null
@@ -1,32 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: The keyword 'var' can't be used as a type name.
-//   Map<String, var> m;
-//               ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: Type 'var' not found.
-//   Map<String, var> m;
-//               ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::Map<core::String*, invalid-type>* m;
-  synthetic constructor •() → self::A*
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.transformed.expect
deleted file mode 100644
index bca5d90..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart.weak.transformed.expect
+++ /dev/null
@@ -1,39 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: The keyword 'var' can't be used as a type name.
-//   Map<String, var> m;
-//               ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: Type 'var' not found.
-//   Map<String, var> m;
-//               ^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/var_as_type_name.dart:8:15: Error: 'var' isn't a type.
-//   Map<String, var> m;
-//               ^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class A extends core::Object {
-  field core::Map<core::String*, invalid-type>* m = null;
-  synthetic constructor •() → self::A*
-    : super core::Object::•()
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  self::A* a = new self::A::•();
-  a.{self::A::m} = null;
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart b/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart
deleted file mode 100644
index 159228d..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class Foo {
-  List list = [1, 2, 3];
-  set first(x) => list[0] = x;
-  operator []=(x, y) => list[x] = y;
-  void clear() => list.clear();
-}
-
-main() {
-  new Foo().first = 4;
-  new Foo()[3] = 4;
-  new Foo().clear();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.textual_outline.expect
deleted file mode 100644
index 2121500..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.textual_outline.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class Foo {
-  List list = [1, 2, 3];
-  set first(x) => list[0] = x;
-  operator []=(x, y) => list[x] = y;
-  void clear() => list.clear();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.textual_outline_modelled.expect
deleted file mode 100644
index e233a9b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,9 +0,0 @@
-// @dart = 2.6
-class Foo {
-  List list = [1, 2, 3];
-  operator []=(x, y) => list[x] = y;
-  set first(x) => list[0] = x;
-  void clear() => list.clear();
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.expect
deleted file mode 100644
index 70705a1..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.expect
+++ /dev/null
@@ -1,31 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field core::List<dynamic>* list = <dynamic>[1, 2, 3];
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  set first(dynamic x) → void
-    return let final core::List<dynamic>* #t1 = this.{self::Foo::list} in let final core::int* #t2 = 0 in let final dynamic #t3 = x in let final void #t4 = #t1.{core::List::[]=}(#t2, #t3) in #t3;
-  operator []=(dynamic x, dynamic y) → void
-    return let final core::List<dynamic>* #t5 = this.{self::Foo::list} in let final dynamic #t6 = x as{TypeError,ForDynamic} core::int* in let final dynamic #t7 = y in let final void #t8 = #t5.{core::List::[]=}(#t6, #t7) in #t7;
-  method clear() → void
-    return this.{self::Foo::list}.{core::List::clear}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::Foo::•().{self::Foo::first} = 4;
-  new self::Foo::•().{self::Foo::[]=}(3, 4);
-  new self::Foo::•().{self::Foo::clear}();
-}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.outline.expect
deleted file mode 100644
index af66f5b..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.outline.expect
+++ /dev/null
@@ -1,27 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field core::List<dynamic>* list;
-  synthetic constructor •() → self::Foo*
-    ;
-  set first(dynamic x) → void
-    ;
-  operator []=(dynamic x, dynamic y) → void
-    ;
-  method clear() → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.transformed.expect
deleted file mode 100644
index 7332e9e..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/void_methods.dart.weak.transformed.expect
+++ /dev/null
@@ -1,36 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class Foo extends core::Object {
-  field core::List<dynamic>* list = core::_GrowableList::_literal3<dynamic>(1, 2, 3);
-  synthetic constructor •() → self::Foo*
-    : super core::Object::•()
-    ;
-  set first(dynamic x) → void
-    return let final core::List<dynamic>* #t1 = this.{self::Foo::list} in let final core::int* #t2 = 0 in let final dynamic #t3 = x in let final void #t4 = #t1.{core::List::[]=}(#t2, #t3) in #t3;
-  operator []=(dynamic x, dynamic y) → void
-    return let final core::List<dynamic>* #t5 = this.{self::Foo::list} in let final core::int* #t6 = x as{TypeError,ForDynamic} core::int* in let final dynamic #t7 = y in let final void #t8 = #t5.{core::List::[]=}(#t6, #t7) in #t7;
-  method clear() → void
-    return this.{self::Foo::list}.{core::List::clear}();
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-static method main() → dynamic {
-  new self::Foo::•().{self::Foo::first} = 4;
-  new self::Foo::•().{self::Foo::[]=}(3, 4);
-  new self::Foo::•().{self::Foo::clear}();
-}
-
-
-Extra constant evaluation status:
-Evaluated: VariableGet @ org-dartlang-testcase:///void_methods.dart:9:24 -> IntConstant(0)
-Extra constant evaluation: evaluated: 36, effectively constant: 1
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart
deleted file mode 100644
index f97c551..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright (c) 2017, 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.6
-
-class C {
-  var superField;
-  superMethod() {}
-
-  get setterOnly => null;
-  void set setterOnly(_) {}
-
-  get getterOnly => null;
-  void set getterOnly(_) {}
-}
-
-class D extends C {
-  var field;
-
-  void set setterOnly(_) {}
-
-  get getterOnly => null;
-
-  method() {}
-
-  void test() {
-    this.field;
-    this.superField;
-    this.field = 0;
-    this.superField = 0;
-    this.method();
-    this.superMethod();
-    this.setterOnly;
-    this.setterOnly = 0;
-    this.getterOnly;
-    this.getterOnly = 0;
-
-    field;
-    superField;
-    field = 0;
-    superField = 0;
-    method();
-    superMethod();
-    setterOnly;
-    setterOnly = 0;
-    getterOnly;
-    getterOnly = 0;
-
-    this.missingField;
-    this.missingField = 0;
-    this.missingMethod();
-
-    missingField;
-    missingField = 0;
-    missingMethod();
-  }
-}
-
-class E extends D {
-  var missingField;
-  void missingMethod() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.textual_outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.textual_outline.expect
deleted file mode 100644
index a0231de..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.textual_outline.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-class C {
-  var superField;
-  superMethod() {}
-  get setterOnly => null;
-  void set setterOnly(_) {}
-  get getterOnly => null;
-  void set getterOnly(_) {}
-}
-
-class D extends C {
-  var field;
-  void set setterOnly(_) {}
-  get getterOnly => null;
-  method() {}
-  void test() {}
-}
-
-class E extends D {
-  var missingField;
-  void missingMethod() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.textual_outline_modelled.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.textual_outline_modelled.expect
deleted file mode 100644
index cce7cbc..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.textual_outline_modelled.expect
+++ /dev/null
@@ -1,24 +0,0 @@
-// @dart = 2.6
-class C {
-  get getterOnly => null;
-  get setterOnly => null;
-  superMethod() {}
-  var superField;
-  void set getterOnly(_) {}
-  void set setterOnly(_) {}
-}
-
-class D extends C {
-  get getterOnly => null;
-  method() {}
-  var field;
-  void set setterOnly(_) {}
-  void test() {}
-}
-
-class E extends D {
-  var missingField;
-  void missingMethod() {}
-}
-
-main() {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.expect
deleted file mode 100644
index 0377d66..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.expect
+++ /dev/null
@@ -1,136 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-//     this.missingField;
-//          ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-//     this.missingField = 0;
-//          ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-//     this.missingMethod();
-//          ^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-//     missingField;
-//     ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-//     missingField = 0;
-//     ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-//     missingMethod();
-//     ^^^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic superField = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method superMethod() → dynamic {}
-  get setterOnly() → dynamic
-    return null;
-  set setterOnly(dynamic _) → void {}
-  get getterOnly() → dynamic
-    return null;
-  set getterOnly(dynamic _) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  field dynamic field = null;
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  set setterOnly(dynamic _) → void {}
-  get getterOnly() → dynamic
-    return null;
-  method method() → dynamic {}
-  method test() → void {
-    this.{self::D::field};
-    this.{self::C::superField};
-    this.{self::D::field} = 0;
-    this.{self::C::superField} = 0;
-    this.{self::D::method}();
-    this.{self::C::superMethod}();
-    this.{self::C::setterOnly};
-    this.{self::D::setterOnly} = 0;
-    this.{self::D::getterOnly};
-    this.{self::C::getterOnly} = 0;
-    this.{self::D::field};
-    this.{self::C::superField};
-    this.{self::D::field} = 0;
-    this.{self::C::superField} = 0;
-    this.{self::D::method}();
-    this.{self::C::superMethod}();
-    this.{self::C::setterOnly};
-    this.{self::D::setterOnly} = 0;
-    this.{self::D::getterOnly};
-    this.{self::C::getterOnly} = 0;
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-    this.missingField;
-         ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-    this.missingField = 0;
-         ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-    this.missingMethod();
-         ^^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-    missingField;
-    ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-    missingField = 0;
-    ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-    missingMethod();
-    ^^^^^^^^^^^^^";
-  }
-}
-class E extends self::D {
-  field dynamic missingField = null;
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-  method missingMethod() → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.outline.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.outline.expect
deleted file mode 100644
index ef5e55a..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.outline.expect
+++ /dev/null
@@ -1,51 +0,0 @@
-library;
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic superField;
-  synthetic constructor •() → self::C*
-    ;
-  method superMethod() → dynamic
-    ;
-  get setterOnly() → dynamic
-    ;
-  set setterOnly(dynamic _) → void
-    ;
-  get getterOnly() → dynamic
-    ;
-  set getterOnly(dynamic _) → void
-    ;
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  field dynamic field;
-  synthetic constructor •() → self::D*
-    ;
-  set setterOnly(dynamic _) → void
-    ;
-  get getterOnly() → dynamic
-    ;
-  method method() → dynamic
-    ;
-  method test() → void
-    ;
-}
-class E extends self::D {
-  field dynamic missingField;
-  synthetic constructor •() → self::E*
-    ;
-  method missingMethod() → void
-    ;
-}
-static method main() → dynamic
-  ;
diff --git a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.transformed.expect b/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.transformed.expect
deleted file mode 100644
index 0377d66..0000000
--- a/pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart.weak.transformed.expect
+++ /dev/null
@@ -1,136 +0,0 @@
-library;
-//
-// Problems in library:
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-//     this.missingField;
-//          ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-//     this.missingField = 0;
-//          ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-//     this.missingMethod();
-//          ^^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-//     missingField;
-//     ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-//     missingField = 0;
-//     ^^^^^^^^^^^^
-//
-// pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
-//  - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-// Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-//     missingMethod();
-//     ^^^^^^^^^^^^^
-//
-import self as self;
-import "dart:core" as core;
-
-class C extends core::Object {
-  field dynamic superField = null;
-  synthetic constructor •() → self::C*
-    : super core::Object::•()
-    ;
-  method superMethod() → dynamic {}
-  get setterOnly() → dynamic
-    return null;
-  set setterOnly(dynamic _) → void {}
-  get getterOnly() → dynamic
-    return null;
-  set getterOnly(dynamic _) → void {}
-  abstract member-signature get _identityHashCode() → core::int*; -> core::Object::_identityHashCode
-  abstract member-signature method _instanceOf(dynamic instantiatorTypeArguments, dynamic functionTypeArguments, dynamic type) → core::bool*; -> core::Object::_instanceOf
-  abstract member-signature method _simpleInstanceOf(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOf
-  abstract member-signature method _simpleInstanceOfTrue(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfTrue
-  abstract member-signature method _simpleInstanceOfFalse(dynamic type) → core::bool*; -> core::Object::_simpleInstanceOfFalse
-  abstract member-signature operator ==(dynamic other) → core::bool*; -> core::Object::==
-  abstract member-signature get hashCode() → core::int*; -> core::Object::hashCode
-  abstract member-signature method toString() → core::String*; -> core::Object::toString
-  abstract member-signature method noSuchMethod(core::Invocation* invocation) → dynamic; -> core::Object::noSuchMethod
-  abstract member-signature get runtimeType() → core::Type*; -> core::Object::runtimeType
-}
-class D extends self::C {
-  field dynamic field = null;
-  synthetic constructor •() → self::D*
-    : super self::C::•()
-    ;
-  set setterOnly(dynamic _) → void {}
-  get getterOnly() → dynamic
-    return null;
-  method method() → dynamic {}
-  method test() → void {
-    this.{self::D::field};
-    this.{self::C::superField};
-    this.{self::D::field} = 0;
-    this.{self::C::superField} = 0;
-    this.{self::D::method}();
-    this.{self::C::superMethod}();
-    this.{self::C::setterOnly};
-    this.{self::D::setterOnly} = 0;
-    this.{self::D::getterOnly};
-    this.{self::C::getterOnly} = 0;
-    this.{self::D::field};
-    this.{self::C::superField};
-    this.{self::D::field} = 0;
-    this.{self::C::superField} = 0;
-    this.{self::D::method}();
-    this.{self::C::superMethod}();
-    this.{self::C::setterOnly};
-    this.{self::D::setterOnly} = 0;
-    this.{self::D::getterOnly};
-    this.{self::C::getterOnly} = 0;
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:50:10: Error: The getter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-    this.missingField;
-         ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:51:10: Error: The setter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-    this.missingField = 0;
-         ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:52:10: Error: The method 'missingMethod' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-    this.missingMethod();
-         ^^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:54:5: Error: The getter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing getter, or defining a getter or field named 'missingField'.
-    missingField;
-    ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:55:5: Error: The setter 'missingField' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing setter, or defining a setter or field named 'missingField'.
-    missingField = 0;
-    ^^^^^^^^^^^^";
-    invalid-expression "pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart:56:5: Error: The method 'missingMethod' isn't defined for the class 'D'.
- - 'D' is from 'pkg/front_end/testcases/general_nnbd_opt_out/warn_unresolved_sends.dart'.
-Try correcting the name to the name of an existing method, or defining a method named 'missingMethod'.
-    missingMethod();
-    ^^^^^^^^^^^^^";
-  }
-}
-class E extends self::D {
-  field dynamic missingField = null;
-  synthetic constructor •() → self::E*
-    : super self::D::•()
-    ;
-  method missingMethod() → void {}
-}
-static method main() → dynamic {}
diff --git a/pkg/front_end/testcases/generic_metadata/folder.options b/pkg/front_end/testcases/generic_metadata/folder.options
new file mode 100644
index 0000000..2d13171
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/folder.options
@@ -0,0 +1 @@
+--enable-experiment=generic-metadata
\ No newline at end of file
diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart
new file mode 100644
index 0000000..15c1065
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart
@@ -0,0 +1,37 @@
+// Copyright (c) 2021, 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.
+
+class A<T> {
+  const A();
+}
+
+class B<S, T> {
+  const B();
+}
+
+class C<T extends num> {
+  const C();
+}
+
+class D<S extends num, T extends S> {
+  const D();
+}
+
+@A<int, num>() // error
+@B<int>() // error
+@C<String>() // error
+@D<int, num>() // error
+test() {}
+
+@A() // ok
+@A<int>() // ok
+@B() // ok
+@B<int, String>() // ok
+@C() // ok
+@C<num>() // ok
+@C<int>() // ok
+@D() // ok
+@D<num, num>() // ok
+@D<num, int>() // ok
+main() {}
\ No newline at end of file
diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.expect
new file mode 100644
index 0000000..d7ddced
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.expect
@@ -0,0 +1,99 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+// @A<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:6:9: Context: Found this candidate, but the arguments don't match.
+//   const A();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+// @B<int>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:10:9: Context: Found this candidate, but the arguments don't match.
+//   const B();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:23:2: Error: Type argument 'String' doesn't conform to the bound 'num' of the type variable 'T' on 'C'.
+// Try changing type arguments so that they conform to the bounds.
+// @C<String>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:13:9: Context: This is the type variable whose bound isn't conformed to.
+// class C<T extends num> {
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:24:2: Error: Type argument 'num' doesn't conform to the bound 'S' of the type variable 'T' on 'D'.
+// Try changing type arguments so that they conform to the bounds.
+// @D<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:17:24: Context: This is the type variable whose bound isn't conformed to.
+// class D<S extends num, T extends S> {
+//                        ^
+//
+import self as self;
+import "dart:core" as core;
+
+class A<T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::A<self::A::T%>
+    : super core::Object::•()
+    ;
+}
+class B<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::B<self::B::S%, self::B::T%>
+    : super core::Object::•()
+    ;
+}
+class C<T extends core::num = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::C<self::C::T>
+    : super core::Object::•()
+    ;
+}
+class D<S extends core::num = core::num, T extends self::D::S = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::D<self::D::S, self::D::T>
+    : super core::Object::•()
+    ;
+}
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+@A<int, num>() // error
+ ^"
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+@B<int>() // error
+ ^"
+@#C1
+@#C2
+static method test() → dynamic {}
+@#C3
+@#C4
+@#C5
+@#C6
+@#C7
+@#C7
+@#C8
+@#C9
+@#C9
+@#C10
+static method main() → dynamic {}
+
+constants  {
+  #C1 = self::C<core::String> {}
+  #C2 = self::D<core::int, core::num> {}
+  #C3 = self::A<dynamic> {}
+  #C4 = self::A<core::int> {}
+  #C5 = self::B<dynamic, dynamic> {}
+  #C6 = self::B<core::int, core::String> {}
+  #C7 = self::C<core::num> {}
+  #C8 = self::C<core::int> {}
+  #C9 = self::D<core::num, core::num> {}
+  #C10 = self::D<core::num, core::int> {}
+}
+
+
+Constructor coverage from constants:
+org-dartlang-testcase:///generic_metadata.dart:
+- C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
+- A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
+- B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)
diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.transformed.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.transformed.expect
new file mode 100644
index 0000000..d7ddced
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.strong.transformed.expect
@@ -0,0 +1,99 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+// @A<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:6:9: Context: Found this candidate, but the arguments don't match.
+//   const A();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+// @B<int>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:10:9: Context: Found this candidate, but the arguments don't match.
+//   const B();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:23:2: Error: Type argument 'String' doesn't conform to the bound 'num' of the type variable 'T' on 'C'.
+// Try changing type arguments so that they conform to the bounds.
+// @C<String>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:13:9: Context: This is the type variable whose bound isn't conformed to.
+// class C<T extends num> {
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:24:2: Error: Type argument 'num' doesn't conform to the bound 'S' of the type variable 'T' on 'D'.
+// Try changing type arguments so that they conform to the bounds.
+// @D<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:17:24: Context: This is the type variable whose bound isn't conformed to.
+// class D<S extends num, T extends S> {
+//                        ^
+//
+import self as self;
+import "dart:core" as core;
+
+class A<T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::A<self::A::T%>
+    : super core::Object::•()
+    ;
+}
+class B<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::B<self::B::S%, self::B::T%>
+    : super core::Object::•()
+    ;
+}
+class C<T extends core::num = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::C<self::C::T>
+    : super core::Object::•()
+    ;
+}
+class D<S extends core::num = core::num, T extends self::D::S = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::D<self::D::S, self::D::T>
+    : super core::Object::•()
+    ;
+}
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+@A<int, num>() // error
+ ^"
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+@B<int>() // error
+ ^"
+@#C1
+@#C2
+static method test() → dynamic {}
+@#C3
+@#C4
+@#C5
+@#C6
+@#C7
+@#C7
+@#C8
+@#C9
+@#C9
+@#C10
+static method main() → dynamic {}
+
+constants  {
+  #C1 = self::C<core::String> {}
+  #C2 = self::D<core::int, core::num> {}
+  #C3 = self::A<dynamic> {}
+  #C4 = self::A<core::int> {}
+  #C5 = self::B<dynamic, dynamic> {}
+  #C6 = self::B<core::int, core::String> {}
+  #C7 = self::C<core::num> {}
+  #C8 = self::C<core::int> {}
+  #C9 = self::D<core::num, core::num> {}
+  #C10 = self::D<core::num, core::int> {}
+}
+
+
+Constructor coverage from constants:
+org-dartlang-testcase:///generic_metadata.dart:
+- C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
+- A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
+- B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)
diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.textual_outline.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.textual_outline.expect
new file mode 100644
index 0000000..e109be7
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.textual_outline.expect
@@ -0,0 +1,28 @@
+class A<T> {
+  const A();
+}
+class B<S, T> {
+  const B();
+}
+class C<T extends num> {
+  const C();
+}
+class D<S extends num, T extends S> {
+  const D();
+}
+@A<int, num>()
+@B<int>()
+@C<String>()
+@D<int, num>()
+test() {}
+@A()
+@A<int>()
+@B()
+@B<int, String>()
+@C()
+@C<num>()
+@C<int>()
+@D()
+@D<num, num>()
+@D<num, int>()
+main() {}
diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.expect
new file mode 100644
index 0000000..338bb8d
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.expect
@@ -0,0 +1,99 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+// @A<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:6:9: Context: Found this candidate, but the arguments don't match.
+//   const A();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+// @B<int>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:10:9: Context: Found this candidate, but the arguments don't match.
+//   const B();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:23:2: Error: Type argument 'String' doesn't conform to the bound 'num' of the type variable 'T' on 'C'.
+// Try changing type arguments so that they conform to the bounds.
+// @C<String>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:13:9: Context: This is the type variable whose bound isn't conformed to.
+// class C<T extends num> {
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:24:2: Error: Type argument 'num' doesn't conform to the bound 'S' of the type variable 'T' on 'D'.
+// Try changing type arguments so that they conform to the bounds.
+// @D<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:17:24: Context: This is the type variable whose bound isn't conformed to.
+// class D<S extends num, T extends S> {
+//                        ^
+//
+import self as self;
+import "dart:core" as core;
+
+class A<T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::A<self::A::T%>
+    : super core::Object::•()
+    ;
+}
+class B<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::B<self::B::S%, self::B::T%>
+    : super core::Object::•()
+    ;
+}
+class C<T extends core::num = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::C<self::C::T>
+    : super core::Object::•()
+    ;
+}
+class D<S extends core::num = core::num, T extends self::D::S = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::D<self::D::S, self::D::T>
+    : super core::Object::•()
+    ;
+}
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+@A<int, num>() // error
+ ^"
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+@B<int>() // error
+ ^"
+@#C1
+@#C2
+static method test() → dynamic {}
+@#C3
+@#C4
+@#C5
+@#C6
+@#C7
+@#C7
+@#C8
+@#C9
+@#C9
+@#C10
+static method main() → dynamic {}
+
+constants  {
+  #C1 = self::C<core::String*> {}
+  #C2 = self::D<core::int*, core::num*> {}
+  #C3 = self::A<dynamic> {}
+  #C4 = self::A<core::int*> {}
+  #C5 = self::B<dynamic, dynamic> {}
+  #C6 = self::B<core::int*, core::String*> {}
+  #C7 = self::C<core::num*> {}
+  #C8 = self::C<core::int*> {}
+  #C9 = self::D<core::num*, core::num*> {}
+  #C10 = self::D<core::num*, core::int*> {}
+}
+
+
+Constructor coverage from constants:
+org-dartlang-testcase:///generic_metadata.dart:
+- C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
+- A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
+- B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)
diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.outline.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.outline.expect
new file mode 100644
index 0000000..229b1bb
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.outline.expect
@@ -0,0 +1,95 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+// @A<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:6:9: Context: Found this candidate, but the arguments don't match.
+//   const A();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+// @B<int>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:10:9: Context: Found this candidate, but the arguments don't match.
+//   const B();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:23:2: Error: Type argument 'String' doesn't conform to the bound 'num' of the type variable 'T' on 'C'.
+// Try changing type arguments so that they conform to the bounds.
+// @C<String>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:13:9: Context: This is the type variable whose bound isn't conformed to.
+// class C<T extends num> {
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:24:2: Error: Type argument 'num' doesn't conform to the bound 'S' of the type variable 'T' on 'D'.
+// Try changing type arguments so that they conform to the bounds.
+// @D<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:17:24: Context: This is the type variable whose bound isn't conformed to.
+// class D<S extends num, T extends S> {
+//                        ^
+//
+import self as self;
+import "dart:core" as core;
+
+class A<T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::A<self::A::T%>
+    : super core::Object::•()
+    ;
+}
+class B<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::B<self::B::S%, self::B::T%>
+    : super core::Object::•()
+    ;
+}
+class C<T extends core::num = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::C<self::C::T>
+    : super core::Object::•()
+    ;
+}
+class D<S extends core::num = core::num, T extends self::D::S = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::D<self::D::S, self::D::T>
+    : super core::Object::•()
+    ;
+}
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+@A<int, num>() // error
+ ^"
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+@B<int>() // error
+ ^"
+@self::C::•<core::String>()
+@self::D::•<core::int, core::num>()
+static method test() → dynamic
+  ;
+@self::A::•<dynamic>()
+@self::A::•<core::int>()
+@self::B::•<dynamic, dynamic>()
+@self::B::•<core::int, core::String>()
+@self::C::•<core::num>()
+@self::C::•<core::num>()
+@self::C::•<core::int>()
+@self::D::•<core::num, core::num>()
+@self::D::•<core::num, core::num>()
+@self::D::•<core::num, core::int>()
+static method main() → dynamic
+  ;
+
+
+Extra constant evaluation status:
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:23:2 -> InstanceConstant(const C<String*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:24:2 -> InstanceConstant(const D<int*, num*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:27:2 -> InstanceConstant(const A<dynamic>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:28:2 -> InstanceConstant(const A<int*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:29:2 -> InstanceConstant(const B<dynamic, dynamic>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:30:2 -> InstanceConstant(const B<int*, String*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:31:2 -> InstanceConstant(const C<num*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:32:2 -> InstanceConstant(const C<num*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:33:2 -> InstanceConstant(const C<int*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:34:2 -> InstanceConstant(const D<num*, num*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:35:2 -> InstanceConstant(const D<num*, num*>{})
+Evaluated: ConstructorInvocation @ org-dartlang-testcase:///generic_metadata.dart:36:2 -> InstanceConstant(const D<num*, int*>{})
+Extra constant evaluation: evaluated: 12, effectively constant: 12
diff --git a/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.transformed.expect b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.transformed.expect
new file mode 100644
index 0000000..338bb8d
--- /dev/null
+++ b/pkg/front_end/testcases/generic_metadata/generic_metadata.dart.weak.transformed.expect
@@ -0,0 +1,99 @@
+library /*isNonNullableByDefault*/;
+//
+// Problems in library:
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+// @A<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:6:9: Context: Found this candidate, but the arguments don't match.
+//   const A();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+// @B<int>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:10:9: Context: Found this candidate, but the arguments don't match.
+//   const B();
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:23:2: Error: Type argument 'String' doesn't conform to the bound 'num' of the type variable 'T' on 'C'.
+// Try changing type arguments so that they conform to the bounds.
+// @C<String>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:13:9: Context: This is the type variable whose bound isn't conformed to.
+// class C<T extends num> {
+//         ^
+//
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:24:2: Error: Type argument 'num' doesn't conform to the bound 'S' of the type variable 'T' on 'D'.
+// Try changing type arguments so that they conform to the bounds.
+// @D<int, num>() // error
+//  ^
+// pkg/front_end/testcases/generic_metadata/generic_metadata.dart:17:24: Context: This is the type variable whose bound isn't conformed to.
+// class D<S extends num, T extends S> {
+//                        ^
+//
+import self as self;
+import "dart:core" as core;
+
+class A<T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::A<self::A::T%>
+    : super core::Object::•()
+    ;
+}
+class B<S extends core::Object? = dynamic, T extends core::Object? = dynamic> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::B<self::B::S%, self::B::T%>
+    : super core::Object::•()
+    ;
+}
+class C<T extends core::num = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::C<self::C::T>
+    : super core::Object::•()
+    ;
+}
+class D<S extends core::num = core::num, T extends self::D::S = core::num> extends core::Object /*hasConstConstructor*/  {
+  const constructor •() → self::D<self::D::S, self::D::T>
+    : super core::Object::•()
+    ;
+}
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:21:2: Error: Expected 1 type arguments.
+@A<int, num>() // error
+ ^"
+@invalid-expression "pkg/front_end/testcases/generic_metadata/generic_metadata.dart:22:2: Error: Expected 2 type arguments.
+@B<int>() // error
+ ^"
+@#C1
+@#C2
+static method test() → dynamic {}
+@#C3
+@#C4
+@#C5
+@#C6
+@#C7
+@#C7
+@#C8
+@#C9
+@#C9
+@#C10
+static method main() → dynamic {}
+
+constants  {
+  #C1 = self::C<core::String*> {}
+  #C2 = self::D<core::int*, core::num*> {}
+  #C3 = self::A<dynamic> {}
+  #C4 = self::A<core::int*> {}
+  #C5 = self::B<dynamic, dynamic> {}
+  #C6 = self::B<core::int*, core::String*> {}
+  #C7 = self::C<core::num*> {}
+  #C8 = self::C<core::int*> {}
+  #C9 = self::D<core::num*, core::num*> {}
+  #C10 = self::D<core::num*, core::int*> {}
+}
+
+
+Constructor coverage from constants:
+org-dartlang-testcase:///generic_metadata.dart:
+- C. (from org-dartlang-testcase:///generic_metadata.dart:14:9)
+- Object. (from org-dartlang-sdk:///sdk/lib/core/object.dart:25:9)
+- D. (from org-dartlang-testcase:///generic_metadata.dart:18:9)
+- A. (from org-dartlang-testcase:///generic_metadata.dart:6:9)
+- B. (from org-dartlang-testcase:///generic_metadata.dart:10:9)
diff --git a/pkg/front_end/testcases/incremental.status b/pkg/front_end/testcases/incremental.status
index d5feffe..afed71c 100644
--- a/pkg/front_end/testcases/incremental.status
+++ b/pkg/front_end/testcases/incremental.status
@@ -1,5 +1,8 @@
-# Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
+# Copyright (c) 2018, 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.md file.
 
-# Status file for the test suite ../test/fasta/incremental_test.dart.
+# Status file for the test suite ../test/incremental_suite.dart.
+
+# http://dartbug.com/41812#issuecomment-684825703
+strongmode_mixins_2: Crash
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/await_in_non_async.yaml b/pkg/front_end/testcases/incremental/await_in_non_async.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/await_in_non_async.yaml
rename to pkg/front_end/testcases/incremental/await_in_non_async.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/await_in_non_async.yaml.world.1.expect b/pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/await_in_non_async.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/await_in_non_async.yaml.world.2.expect b/pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/await_in_non_async.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/await_in_non_async.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml b/pkg/front_end/testcases/incremental/bad_sdk_uri.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml
rename to pkg/front_end/testcases/incremental/bad_sdk_uri.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.1.expect b/pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.2.expect b/pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.3.expect b/pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/bad_sdk_uri.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/bad_sdk_uri.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/calculated_bounds_no_strongmode.yaml b/pkg/front_end/testcases/incremental/calculated_bounds_no_strongmode.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/calculated_bounds_no_strongmode.yaml
rename to pkg/front_end/testcases/incremental/calculated_bounds_no_strongmode.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml b/pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml
rename to pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.1.expect b/pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.2.expect b/pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.3.expect b/pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.4.expect b/pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/can_get_rid_of_nnbd_issue_error.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/can_get_rid_of_nnbd_issue_error.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/change_between_no_nnbd_and_nnbd.yaml b/pkg/front_end/testcases/incremental/change_between_no_nnbd_and_nnbd.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/change_between_no_nnbd_and_nnbd.yaml
rename to pkg/front_end/testcases/incremental/change_between_no_nnbd_and_nnbd.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/change_between_no_nnbd_and_nnbd.yaml.world.1.expect b/pkg/front_end/testcases/incremental/change_between_no_nnbd_and_nnbd.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/change_between_no_nnbd_and_nnbd.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/change_between_no_nnbd_and_nnbd.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/change_between_no_nnbd_and_nnbd.yaml.world.2.expect b/pkg/front_end/testcases/incremental/change_between_no_nnbd_and_nnbd.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/change_between_no_nnbd_and_nnbd.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/change_between_no_nnbd_and_nnbd.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml b/pkg/front_end/testcases/incremental/changing_modules.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml
rename to pkg/front_end/testcases/incremental/changing_modules.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changing_modules.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/changing_modules.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml.world.3.expect b/pkg/front_end/testcases/incremental/changing_modules.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/changing_modules.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_10.yaml b/pkg/front_end/testcases/incremental/changing_modules_10.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_10.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_10.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_10.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_10.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_10.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_10.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_10.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changing_modules_10.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_10.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/changing_modules_10.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_11.yaml b/pkg/front_end/testcases/incremental/changing_modules_11.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_11.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_11.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_11.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_11.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_11.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_11.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_11.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changing_modules_11.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_11.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/changing_modules_11.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_12.yaml b/pkg/front_end/testcases/incremental/changing_modules_12.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_12.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_12.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_12.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_12.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_12.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_12.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_13.yaml b/pkg/front_end/testcases/incremental/changing_modules_13.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_13.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_13.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_13.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_13.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_13.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_13.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_2.yaml b/pkg/front_end/testcases/incremental/changing_modules_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_2.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changing_modules_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/changing_modules_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_3.yaml b/pkg/front_end/testcases/incremental/changing_modules_3.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_3.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_3.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_3.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_3.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_3.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_3.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changing_modules_3.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_3.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/changing_modules_3.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_4.yaml b/pkg/front_end/testcases/incremental/changing_modules_4.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_4.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_4.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_4.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_4.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_4.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_4.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_5.yaml b/pkg/front_end/testcases/incremental/changing_modules_5.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_5.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_5.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_5.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_5.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_5.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_5.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_6.yaml b/pkg/front_end/testcases/incremental/changing_modules_6.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_6.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_6.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_6.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_6.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_6.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_6.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_7.yaml b/pkg/front_end/testcases/incremental/changing_modules_7.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_7.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_7.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_7.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_7.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_7.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_7.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_7.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changing_modules_7.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_7.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/changing_modules_7.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_8.yaml b/pkg/front_end/testcases/incremental/changing_modules_8.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_8.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_8.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_8.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_8.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_8.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_8.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_9.yaml b/pkg/front_end/testcases/incremental/changing_modules_9.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_9.yaml
rename to pkg/front_end/testcases/incremental/changing_modules_9.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_9.yaml.world.1.expect b/pkg/front_end/testcases/incremental/changing_modules_9.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_9.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/changing_modules_9.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_9.yaml.world.2.expect b/pkg/front_end/testcases/incremental/changing_modules_9.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/changing_modules_9.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/changing_modules_9.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part.yaml b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part.yaml
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part.yaml.world.1.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part.yaml.world.2.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part_if_unused.yaml b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part_if_unused.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part_if_unused.yaml
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part_if_unused.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part_if_unused.yaml.world.1.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part_if_unused.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part_if_unused.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part_if_unused.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part_if_unused.yaml.world.2.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part_if_unused.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_part_if_unused.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_part_if_unused.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.1.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.2.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.3.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_non_package_unreferenced_libraries.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_unreferenced_package_library.yaml b/pkg/front_end/testcases/incremental/cleans_up_uritosource_unreferenced_package_library.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_unreferenced_package_library.yaml
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_unreferenced_package_library.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_unreferenced_package_library.yaml.world.1.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_unreferenced_package_library.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_unreferenced_package_library.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_unreferenced_package_library.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_unreferenced_package_library.yaml.world.2.expect b/pkg/front_end/testcases/incremental/cleans_up_uritosource_unreferenced_package_library.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/cleans_up_uritosource_unreferenced_package_library.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/cleans_up_uritosource_unreferenced_package_library.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/constant_exports_hash.yaml b/pkg/front_end/testcases/incremental/constant_exports_hash.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/constant_exports_hash.yaml
rename to pkg/front_end/testcases/incremental/constant_exports_hash.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/constant_exports_hash.yaml.world.1.expect b/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/constant_exports_hash.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/constant_exports_hash.yaml.world.2.expect b/pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/constant_exports_hash.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/constant_exports_hash.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/constant_set_literal.yaml b/pkg/front_end/testcases/incremental/constant_set_literal.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/constant_set_literal.yaml
rename to pkg/front_end/testcases/incremental/constant_set_literal.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/constant_set_literal.yaml.world.1.expect b/pkg/front_end/testcases/incremental/constant_set_literal.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/constant_set_literal.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/constant_set_literal.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/constant_set_literal.yaml.world.2.expect b/pkg/front_end/testcases/incremental/constant_set_literal.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/constant_set_literal.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/constant_set_literal.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml b/pkg/front_end/testcases/incremental/crash_test_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml
rename to pkg/front_end/testcases/incremental/crash_test_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/crash_test_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/crash_test_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/crash_test_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/crash_test_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/crash_test_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/deferred_library.yaml b/pkg/front_end/testcases/incremental/deferred_library.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/deferred_library.yaml
rename to pkg/front_end/testcases/incremental/deferred_library.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml b/pkg/front_end/testcases/incremental/deleting_file.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml
rename to pkg/front_end/testcases/incremental/deleting_file.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.1.expect b/pkg/front_end/testcases/incremental/deleting_file.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/deleting_file.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.2.expect b/pkg/front_end/testcases/incremental/deleting_file.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/deleting_file.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.3.expect b/pkg/front_end/testcases/incremental/deleting_file.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/deleting_file.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.4.expect b/pkg/front_end/testcases/incremental/deleting_file.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/deleting_file.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/deleting_file.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_library.yaml b/pkg/front_end/testcases/incremental/disappearing_library.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_library.yaml
rename to pkg/front_end/testcases/incremental/disappearing_library.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_library.yaml.world.1.expect b/pkg/front_end/testcases/incremental/disappearing_library.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_library.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/disappearing_library.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_library.yaml.world.2.expect b/pkg/front_end/testcases/incremental/disappearing_library.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_library.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/disappearing_library.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_package.yaml b/pkg/front_end/testcases/incremental/disappearing_package.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_package.yaml
rename to pkg/front_end/testcases/incremental/disappearing_package.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_package.yaml.world.1.expect b/pkg/front_end/testcases/incremental/disappearing_package.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_package.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/disappearing_package.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_package.yaml.world.2.expect b/pkg/front_end/testcases/incremental/disappearing_package.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/disappearing_package.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/disappearing_package.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main.yaml b/pkg/front_end/testcases/incremental/entry_not_package_url_main.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main.yaml
rename to pkg/front_end/testcases/incremental/entry_not_package_url_main.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main.yaml.world.1.expect b/pkg/front_end/testcases/incremental/entry_not_package_url_main.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/entry_not_package_url_main.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main_with_errors.yaml b/pkg/front_end/testcases/incremental/entry_not_package_url_main_with_errors.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main_with_errors.yaml
rename to pkg/front_end/testcases/incremental/entry_not_package_url_main_with_errors.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main_with_errors.yaml.world.1.expect b/pkg/front_end/testcases/incremental/entry_not_package_url_main_with_errors.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_main_with_errors.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/entry_not_package_url_main_with_errors.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_no_main.yaml b/pkg/front_end/testcases/incremental/entry_not_package_url_no_main.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_no_main.yaml
rename to pkg/front_end/testcases/incremental/entry_not_package_url_no_main.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_no_main.yaml.world.1.expect b/pkg/front_end/testcases/incremental/entry_not_package_url_no_main.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/entry_not_package_url_no_main.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/entry_not_package_url_no_main.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change.yaml b/pkg/front_end/testcases/incremental/error_on_recompile_with_no_change.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change.yaml
rename to pkg/front_end/testcases/incremental/error_on_recompile_with_no_change.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change.yaml.world.1.expect b/pkg/front_end/testcases/incremental/error_on_recompile_with_no_change.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/error_on_recompile_with_no_change.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change.yaml.world.2.expect b/pkg/front_end/testcases/incremental/error_on_recompile_with_no_change.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/error_on_recompile_with_no_change.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change_02.yaml b/pkg/front_end/testcases/incremental/error_on_recompile_with_no_change_02.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change_02.yaml
rename to pkg/front_end/testcases/incremental/error_on_recompile_with_no_change_02.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change_02.yaml.world.1.expect b/pkg/front_end/testcases/incremental/error_on_recompile_with_no_change_02.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change_02.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/error_on_recompile_with_no_change_02.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change_02.yaml.world.2.expect b/pkg/front_end/testcases/incremental/error_on_recompile_with_no_change_02.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/error_on_recompile_with_no_change_02.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/error_on_recompile_with_no_change_02.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/experiments_enabled_1.yaml b/pkg/front_end/testcases/incremental/experiments_enabled_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/experiments_enabled_1.yaml
rename to pkg/front_end/testcases/incremental/experiments_enabled_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/experiments_enabled_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/experiments_enabled_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/experiments_enabled_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/experiments_enabled_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml b/pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml
rename to pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml.world.1.expect b/pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml.world.1.expression.1.expect b/pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml.world.1.expression.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml.world.1.expression.1.expect
rename to pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml.world.1.expression.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml.world.2.expect b/pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/expression_calculation_with_error.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/expression_calculation_with_error.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_expression_compilation_usage.yaml b/pkg/front_end/testcases/incremental/extension_expression_compilation_usage.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_expression_compilation_usage.yaml
rename to pkg/front_end/testcases/incremental/extension_expression_compilation_usage.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_expression_compilation_usage.yaml.world.1.expect b/pkg/front_end/testcases/incremental/extension_expression_compilation_usage.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_expression_compilation_usage.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/extension_expression_compilation_usage.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_expression_compilation_usage.yaml.world.1.expression.1.expect b/pkg/front_end/testcases/incremental/extension_expression_compilation_usage.yaml.world.1.expression.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_expression_compilation_usage.yaml.world.1.expression.1.expect
rename to pkg/front_end/testcases/incremental/extension_expression_compilation_usage.yaml.world.1.expression.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.1.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.1.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.2.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.2.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.3.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.3.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.4.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.4.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.5.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.1.expression.5.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.1.expression.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.1.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.1.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.2.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.2.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.3.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.3.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.4.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.4.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.5.expect b/pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/extension_usage_from_dill.yaml.world.2.expression.5.expect
rename to pkg/front_end/testcases/incremental/extension_usage_from_dill.yaml.world.2.expression.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/ffi_01.yaml b/pkg/front_end/testcases/incremental/ffi_01.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/ffi_01.yaml
rename to pkg/front_end/testcases/incremental/ffi_01.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/ffi_01.yaml.world.1.expect b/pkg/front_end/testcases/incremental/ffi_01.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/ffi_01.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/ffi_01.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/ffi_01.yaml.world.2.expect b/pkg/front_end/testcases/incremental/ffi_01.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/ffi_01.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/ffi_01.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/ffi_02.yaml b/pkg/front_end/testcases/incremental/ffi_02.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/ffi_02.yaml
rename to pkg/front_end/testcases/incremental/ffi_02.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/ffi_02.yaml.world.1.expect b/pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/ffi_02.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/ffi_02.yaml.world.1.expression.1.expect b/pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expression.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/ffi_02.yaml.world.1.expression.1.expect
rename to pkg/front_end/testcases/incremental/ffi_02.yaml.world.1.expression.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_issue_66122.yaml b/pkg/front_end/testcases/incremental/flutter_issue_66122.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_issue_66122.yaml
rename to pkg/front_end/testcases/incremental/flutter_issue_66122.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_issue_66122.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_issue_66122.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_issue_66122.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/flutter_issue_66122.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_issue_66122.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_issue_66122.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_issue_66122.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/flutter_issue_66122.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_mixin_failure_1.yaml b/pkg/front_end/testcases/incremental/flutter_mixin_failure_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_mixin_failure_1.yaml
rename to pkg/front_end/testcases/incremental/flutter_mixin_failure_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_mixin_failure_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_mixin_failure_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_mixin_failure_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/flutter_mixin_failure_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_mixin_failure_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_mixin_failure_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_mixin_failure_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/flutter_mixin_failure_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform.yaml b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform.yaml
rename to pkg/front_end/testcases/incremental/flutter_widget_transform.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transform.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml
rename to pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml.world.3.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_const.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transform_const.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_nnbd.yaml b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_nnbd.yaml
rename to pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_nnbd.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_nnbd.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_nnbd.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transform_nnbd.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transform_nnbd.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_43371.yaml b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_43371.yaml
rename to pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_43371.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_43371.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_43371.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_43371.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transformer_43371.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_non_const.yaml b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_non_const.yaml
rename to pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_non_const.yaml.world.1.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_non_const.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_non_const.yaml.world.2.expect b/pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/flutter_widget_transformer_non_const.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/flutter_widget_transformer_non_const.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml b/pkg/front_end/testcases/incremental/incremental_serialization_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml
rename to pkg/front_end/testcases/incremental/incremental_serialization_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.3.expect b/pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.4.expect b/pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_1.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_1.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_2.yaml b/pkg/front_end/testcases/incremental/incremental_serialization_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_2.yaml
rename to pkg/front_end/testcases/incremental/incremental_serialization_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/incremental_serialization_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/incremental_serialization_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_3.yaml b/pkg/front_end/testcases/incremental/incremental_serialization_3.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_3.yaml
rename to pkg/front_end/testcases/incremental/incremental_serialization_3.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/incremental_serialization_3.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_3.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_3.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_3.yaml.world.2.expect b/pkg/front_end/testcases/incremental/incremental_serialization_3.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_3.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_3.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_4.yaml b/pkg/front_end/testcases/incremental/incremental_serialization_4.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_4.yaml
rename to pkg/front_end/testcases/incremental/incremental_serialization_4.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_4.yaml.world.1.expect b/pkg/front_end/testcases/incremental/incremental_serialization_4.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_4.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_4.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_4.yaml.world.2.expect b/pkg/front_end/testcases/incremental/incremental_serialization_4.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/incremental_serialization_4.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/incremental_serialization_4.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml b/pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml
rename to pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml.world.1.expect b/pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml.world.2.expect b/pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml.world.3.expect b/pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_file_then_use_type.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/initialize_with_file_then_use_type.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml b/pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml
rename to pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml.world.1.expect b/pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml.world.2.expect b/pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml.world.3.expect b/pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/initialize_with_unused_package_then_use_type.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/initialize_with_unused_package_then_use_type.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalid_part_uri_01.yaml b/pkg/front_end/testcases/incremental/invalid_part_uri_01.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalid_part_uri_01.yaml
rename to pkg/front_end/testcases/incremental/invalid_part_uri_01.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalid_part_uri_01.yaml.world.1.expect b/pkg/front_end/testcases/incremental/invalid_part_uri_01.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalid_part_uri_01.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/invalid_part_uri_01.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalid_part_uri_01.yaml.world.2.expect b/pkg/front_end/testcases/incremental/invalid_part_uri_01.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalid_part_uri_01.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/invalid_part_uri_01.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalid_uri_as_part.yaml b/pkg/front_end/testcases/incremental/invalid_uri_as_part.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalid_uri_as_part.yaml
rename to pkg/front_end/testcases/incremental/invalid_uri_as_part.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalid_uri_as_part.yaml.world.1.expect b/pkg/front_end/testcases/incremental/invalid_uri_as_part.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalid_uri_as_part.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/invalid_uri_as_part.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalid_uri_as_part.yaml.world.2.expect b/pkg/front_end/testcases/incremental/invalid_uri_as_part.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalid_uri_as_part.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/invalid_uri_as_part.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_export_of_main.yaml b/pkg/front_end/testcases/incremental/invalidate_export_of_main.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_export_of_main.yaml
rename to pkg/front_end/testcases/incremental/invalidate_export_of_main.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml b/pkg/front_end/testcases/incremental/invalidate_package_part.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml
rename to pkg/front_end/testcases/incremental/invalidate_package_part.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml.world.1.expect b/pkg/front_end/testcases/incremental/invalidate_package_part.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/invalidate_package_part.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml.world.2.expect b/pkg/front_end/testcases/incremental/invalidate_package_part.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/invalidate_package_part.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml.world.3.expect b/pkg/front_end/testcases/incremental/invalidate_package_part.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/invalidate_package_part.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml b/pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml
rename to pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml.world.3.expect b/pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_2.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/invalidate_package_part_2.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_as_file.yaml b/pkg/front_end/testcases/incremental/invalidate_package_part_as_file.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_as_file.yaml
rename to pkg/front_end/testcases/incremental/invalidate_package_part_as_file.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_as_package.yaml b/pkg/front_end/testcases/incremental/invalidate_package_part_as_package.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_as_package.yaml
rename to pkg/front_end/testcases/incremental/invalidate_package_part_as_package.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_from_package_url_as_file.yaml b/pkg/front_end/testcases/incremental/invalidate_package_part_from_package_url_as_file.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_from_package_url_as_file.yaml
rename to pkg/front_end/testcases/incremental/invalidate_package_part_from_package_url_as_file.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_from_package_url_as_package.yaml b/pkg/front_end/testcases/incremental/invalidate_package_part_from_package_url_as_package.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_package_part_from_package_url_as_package.yaml
rename to pkg/front_end/testcases/incremental/invalidate_package_part_from_package_url_as_package.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_part.yaml b/pkg/front_end/testcases/incremental/invalidate_part.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidate_part.yaml
rename to pkg/front_end/testcases/incremental/invalidate_part.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml b/pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml
rename to pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml.world.1.expect b/pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml.world.2.expect b/pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml.world.3.expect b/pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/invalidation_across_compile_time_error.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/invalidation_across_compile_time_error.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_32366.yaml b/pkg/front_end/testcases/incremental/issue_32366.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_32366.yaml
rename to pkg/front_end/testcases/incremental/issue_32366.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_32366.yaml.world.1.expect b/pkg/front_end/testcases/incremental/issue_32366.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_32366.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/issue_32366.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_32366.yaml.world.2.expect b/pkg/front_end/testcases/incremental/issue_32366.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_32366.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/issue_32366.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml b/pkg/front_end/testcases/incremental/issue_41976.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml
rename to pkg/front_end/testcases/incremental/issue_41976.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml.world.1.expect b/pkg/front_end/testcases/incremental/issue_41976.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/issue_41976.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml.world.1.expression.1.expect b/pkg/front_end/testcases/incremental/issue_41976.yaml.world.1.expression.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml.world.1.expression.1.expect
rename to pkg/front_end/testcases/incremental/issue_41976.yaml.world.1.expression.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml.world.1.expression.2.expect b/pkg/front_end/testcases/incremental/issue_41976.yaml.world.1.expression.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_41976.yaml.world.1.expression.2.expect
rename to pkg/front_end/testcases/incremental/issue_41976.yaml.world.1.expression.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323.yaml b/pkg/front_end/testcases/incremental/issue_42323.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323.yaml
rename to pkg/front_end/testcases/incremental/issue_42323.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323.yaml.world.1.expect b/pkg/front_end/testcases/incremental/issue_42323.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/issue_42323.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323_prime.yaml b/pkg/front_end/testcases/incremental/issue_42323_prime.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323_prime.yaml
rename to pkg/front_end/testcases/incremental/issue_42323_prime.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323_prime.yaml.world.1.expect b/pkg/front_end/testcases/incremental/issue_42323_prime.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_42323_prime.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/issue_42323_prime.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_44523.yaml b/pkg/front_end/testcases/incremental/issue_44523.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_44523.yaml
rename to pkg/front_end/testcases/incremental/issue_44523.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_44523.yaml.world.1.expect b/pkg/front_end/testcases/incremental/issue_44523.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_44523.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/issue_44523.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/issue_44523.yaml.world.2.expect b/pkg/front_end/testcases/incremental/issue_44523.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/issue_44523.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/issue_44523.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/load_from_component_explicitly_import_dart_core.yaml b/pkg/front_end/testcases/incremental/load_from_component_explicitly_import_dart_core.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/load_from_component_explicitly_import_dart_core.yaml
rename to pkg/front_end/testcases/incremental/load_from_component_explicitly_import_dart_core.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/load_from_component_explicitly_import_dart_core.yaml.world.1.expect b/pkg/front_end/testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/load_from_component_explicitly_import_dart_core.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/load_from_component_explicitly_import_dart_core.yaml.world.2.expect b/pkg/front_end/testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/load_from_component_explicitly_import_dart_core.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/load_from_component_explicitly_import_dart_core.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml b/pkg/front_end/testcases/incremental/mixin_application_declares.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml
rename to pkg/front_end/testcases/incremental/mixin_application_declares.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml.world.1.expect b/pkg/front_end/testcases/incremental/mixin_application_declares.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/mixin_application_declares.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml.world.2.expect b/pkg/front_end/testcases/incremental/mixin_application_declares.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/mixin_application_declares.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml.world.3.expect b/pkg/front_end/testcases/incremental/mixin_application_declares.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/mixin_application_declares.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/mixin_application_declares.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/mixin_from_sdk.yaml b/pkg/front_end/testcases/incremental/mixin_from_sdk.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/mixin_from_sdk.yaml
rename to pkg/front_end/testcases/incremental/mixin_from_sdk.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/mixin_inferrer_error.yaml b/pkg/front_end/testcases/incremental/mixin_inferrer_error.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/mixin_inferrer_error.yaml
rename to pkg/front_end/testcases/incremental/mixin_inferrer_error.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/mixin_inferrer_error.yaml.world.1.expect b/pkg/front_end/testcases/incremental/mixin_inferrer_error.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/mixin_inferrer_error.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/mixin_inferrer_error.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/multiple_entriepoints.yaml b/pkg/front_end/testcases/incremental/multiple_entriepoints.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/multiple_entriepoints.yaml
rename to pkg/front_end/testcases/incremental/multiple_entriepoints.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/multiple_entriepoints.yaml.world.1.expect b/pkg/front_end/testcases/incremental/multiple_entriepoints.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/multiple_entriepoints.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/multiple_entriepoints.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_invalidate_on_export_of_main.yaml b/pkg/front_end/testcases/incremental/no_invalidate_on_export_of_main.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_invalidate_on_export_of_main.yaml
rename to pkg/front_end/testcases/incremental/no_invalidate_on_export_of_main.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_1.yaml b/pkg/front_end/testcases/incremental/no_outline_change_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_1.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml b/pkg/front_end/testcases/incremental/no_outline_change_10.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_10.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_10.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_10.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_10.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_10.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_10.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_10.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_10.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_11.yaml b/pkg/front_end/testcases/incremental/no_outline_change_11.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_11.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_11.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_11.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_11.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_11.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_11.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_11.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_11.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_11.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_11.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml b/pkg/front_end/testcases/incremental/no_outline_change_12.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_12.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.4.expect b/pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_12.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_12.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_13.yaml b/pkg/front_end/testcases/incremental/no_outline_change_13.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_13.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_13.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_13.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_13.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_13.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_13.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_13.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml b/pkg/front_end/testcases/incremental/no_outline_change_14.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_14.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_14.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_14.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_14.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_14.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_14.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_14.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_14.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_15.yaml b/pkg/front_end/testcases/incremental/no_outline_change_15.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_15.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_15.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_15.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_15.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_15.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_15.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_15.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_15.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_15.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_15.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_16.yaml b/pkg/front_end/testcases/incremental/no_outline_change_16.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_16.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_16.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_16.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_16.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_16.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_16.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_16.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_16.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_16.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_16.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_17.yaml b/pkg/front_end/testcases/incremental/no_outline_change_17.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_17.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_17.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_17.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_17.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_17.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_17.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_17.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_17.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_17.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_17.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_18.yaml b/pkg/front_end/testcases/incremental/no_outline_change_18.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_18.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_18.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_18.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_18.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_18.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_18.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_18.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_19.yaml b/pkg/front_end/testcases/incremental/no_outline_change_19.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_19.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_19.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_19.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_19.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_19.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_19.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_19.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_19.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_19.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_19.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_2.yaml b/pkg/front_end/testcases/incremental/no_outline_change_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_2.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_20.yaml b/pkg/front_end/testcases/incremental/no_outline_change_20.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_20.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_20.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_20.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_20.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_20.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_20.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_20.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_20.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_20.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_20.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_21.yaml b/pkg/front_end/testcases/incremental/no_outline_change_21.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_21.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_21.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_21.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_21.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_21.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_21.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_21.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_21.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_21.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_21.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_22.yaml b/pkg/front_end/testcases/incremental/no_outline_change_22.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_22.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_22.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_22.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_22.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_22.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_22.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_22.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_22.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_22.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_22.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_23.yaml b/pkg/front_end/testcases/incremental/no_outline_change_23.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_23.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_23.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_23.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_23.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_23.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_23.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_23.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_23.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_23.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_23.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_24.yaml b/pkg/front_end/testcases/incremental/no_outline_change_24.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_24.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_24.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_24.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_24.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_24.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_24.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_24.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_24.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_24.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_24.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_25.yaml b/pkg/front_end/testcases/incremental/no_outline_change_25.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_25.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_25.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_25.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_25.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_25.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_25.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_25.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_26.yaml b/pkg/front_end/testcases/incremental/no_outline_change_26.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_26.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_26.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_26.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_26.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_26.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_26.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_26.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_26.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_26.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_26.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml b/pkg/front_end/testcases/incremental/no_outline_change_27.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_27.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_27.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_27.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_27.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_27.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_27.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_27.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_27.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_28.yaml b/pkg/front_end/testcases/incremental/no_outline_change_28.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_28.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_28.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_28.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_28.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_28.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_28.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_28.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_28.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_28.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_28.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_29.yaml b/pkg/front_end/testcases/incremental/no_outline_change_29.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_29.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_29.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_29.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_29.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_29.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_29.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_29.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_29.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_29.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_29.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_3.yaml b/pkg/front_end/testcases/incremental/no_outline_change_3.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_3.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_3.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_3.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_3.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_3.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_3.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_30.yaml b/pkg/front_end/testcases/incremental/no_outline_change_30.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_30.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_30.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_30.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_30.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_30.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_30.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_30.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_30.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_30.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_30.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_31.yaml b/pkg/front_end/testcases/incremental/no_outline_change_31.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_31.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_31.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_31.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_31.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_31.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_31.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_31.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_31.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_31.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_31.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_32.yaml b/pkg/front_end/testcases/incremental/no_outline_change_32.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_32.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_32.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_32.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_32.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_32.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_32.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_32.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_32.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_32.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_32.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml b/pkg/front_end/testcases/incremental/no_outline_change_33.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_33.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.4.expect b/pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_33.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_33.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml b/pkg/front_end/testcases/incremental/no_outline_change_34.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_34.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.4.expect b/pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_34.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_34.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_35.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_35.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_35.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml b/pkg/front_end/testcases/incremental/no_outline_change_36.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_36.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.4.expect b/pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_36.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_36.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml b/pkg/front_end/testcases/incremental/no_outline_change_37.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_37.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.4.expect b/pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_37.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_37.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml b/pkg/front_end/testcases/incremental/no_outline_change_38.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_38.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_38.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_38.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_38.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_38.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_38.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_38.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_38.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml b/pkg/front_end/testcases/incremental/no_outline_change_39.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_39.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_39.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_39.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_39.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_39.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_39.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_39.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_39.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_4.yaml b/pkg/front_end/testcases/incremental/no_outline_change_4.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_4.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_4.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_4.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_4.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_4.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_4.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_4.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_4.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_4.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_4.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml b/pkg/front_end/testcases/incremental/no_outline_change_40.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_40.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_40.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_40.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_40.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_40.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_40.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_40.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_40.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml b/pkg/front_end/testcases/incremental/no_outline_change_41.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_41.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_41.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_41.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_41.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_41.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_41.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_41.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_41.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml b/pkg/front_end/testcases/incremental/no_outline_change_42.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_42.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.4.expect b/pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_42.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_42.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml b/pkg/front_end/testcases/incremental/no_outline_change_43.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_43.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.4.expect b/pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_43.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_43.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_44_flutter.yaml b/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_44_flutter.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_44_flutter.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_44_flutter.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_44_flutter.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_44_flutter.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_44_flutter.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter.yaml b/pkg/front_end/testcases/incremental/no_outline_change_45_flutter.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_45_flutter.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_45_flutter.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_45_flutter.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_45_flutter.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_45_flutter.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter_prime_1.yaml b/pkg/front_end/testcases/incremental/no_outline_change_45_flutter_prime_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter_prime_1.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_45_flutter_prime_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter_prime_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_45_flutter_prime_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter_prime_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_45_flutter_prime_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter_prime_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_45_flutter_prime_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_45_flutter_prime_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_45_flutter_prime_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_47.yaml b/pkg/front_end/testcases/incremental/no_outline_change_47.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_47.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_47.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_47.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_47.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_47.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_47.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_47.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_47.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_47.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_47.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_5.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_5.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_5.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_6.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml.world.3.expect b/pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_6.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_6.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_7.yaml b/pkg/front_end/testcases/incremental/no_outline_change_7.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_7.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_7.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_7.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_7.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_7.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_7.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_7.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_8.yaml b/pkg/front_end/testcases/incremental/no_outline_change_8.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_8.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_8.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_8.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_8.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_8.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_8.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_8.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_8.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_8.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_8.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_9.yaml b/pkg/front_end/testcases/incremental/no_outline_change_9.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_9.yaml
rename to pkg/front_end/testcases/incremental/no_outline_change_9.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_9.yaml.world.1.expect b/pkg/front_end/testcases/incremental/no_outline_change_9.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_9.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_9.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_9.yaml.world.2.expect b/pkg/front_end/testcases/incremental/no_outline_change_9.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/no_outline_change_9.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/no_outline_change_9.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_1.yaml b/pkg/front_end/testcases/incremental/omit_platform_works_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_1.yaml
rename to pkg/front_end/testcases/incremental/omit_platform_works_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/omit_platform_works_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/omit_platform_works_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_2.yaml b/pkg/front_end/testcases/incremental/omit_platform_works_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_2.yaml
rename to pkg/front_end/testcases/incremental/omit_platform_works_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/omit_platform_works_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/omit_platform_works_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml
rename to pkg/front_end/testcases/incremental/omit_platform_works_3.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.2.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.3.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.4.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.5.expect b/pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/omit_platform_works_3.yaml.world.5.expect
rename to pkg/front_end/testcases/incremental/omit_platform_works_3.yaml.world.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/outline_only.yaml b/pkg/front_end/testcases/incremental/outline_only.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/outline_only.yaml
rename to pkg/front_end/testcases/incremental/outline_only.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/outline_only.yaml.world.1.expect b/pkg/front_end/testcases/incremental/outline_only.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/outline_only.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/outline_only.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/outline_only_2.yaml b/pkg/front_end/testcases/incremental/outline_only_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/outline_only_2.yaml
rename to pkg/front_end/testcases/incremental/outline_only_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/outline_only_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/outline_only_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/outline_only_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/outline_only_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml b/pkg/front_end/testcases/incremental/part_as_entry.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml
rename to pkg/front_end/testcases/incremental/part_as_entry.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml.world.1.expect b/pkg/front_end/testcases/incremental/part_as_entry.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/part_as_entry.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml.world.2.expect b/pkg/front_end/testcases/incremental/part_as_entry.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/part_as_entry.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml.world.3.expect b/pkg/front_end/testcases/incremental/part_as_entry.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_entry.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/part_as_entry.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml b/pkg/front_end/testcases/incremental/part_as_package_entry.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml
rename to pkg/front_end/testcases/incremental/part_as_package_entry.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml.world.1.expect b/pkg/front_end/testcases/incremental/part_as_package_entry.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/part_as_package_entry.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml.world.2.expect b/pkg/front_end/testcases/incremental/part_as_package_entry.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/part_as_package_entry.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml.world.3.expect b/pkg/front_end/testcases/incremental/part_as_package_entry.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/part_as_package_entry.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml b/pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml
rename to pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml.world.3.expect b/pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_as_package_entry_2.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/part_as_package_entry_2.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml b/pkg/front_end/testcases/incremental/part_not_part_of.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml
rename to pkg/front_end/testcases/incremental/part_not_part_of.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml.world.1.expect b/pkg/front_end/testcases/incremental/part_not_part_of.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml.world.2.expect b/pkg/front_end/testcases/incremental/part_not_part_of.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml.world.3.expect b/pkg/front_end/testcases/incremental/part_not_part_of.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml b/pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml
rename to pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml.world.1.expect b/pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml.world.2.expect b/pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml.world.3.expect b/pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_as_package.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_as_package.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml b/pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml
rename to pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml.world.1.expect b/pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml.world.2.expect b/pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml.world.3.expect b/pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_experimental_invalidation.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_experimental_invalidation.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml b/pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml
rename to pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml.world.1.expect b/pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml.world.2.expect b/pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml.world.3.expect b/pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/part_not_part_of_initialized_from_dill.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/part_not_part_of_initialized_from_dill.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/regress_35215.yaml b/pkg/front_end/testcases/incremental/regress_35215.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/regress_35215.yaml
rename to pkg/front_end/testcases/incremental/regress_35215.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/regress_35215.yaml.world.1.expect b/pkg/front_end/testcases/incremental/regress_35215.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/regress_35215.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/regress_35215.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/regress_35215.yaml.world.2.expect b/pkg/front_end/testcases/incremental/regress_35215.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/regress_35215.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/regress_35215.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml b/pkg/front_end/testcases/incremental/reissue_errors_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.5.expect b/pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.5.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.6.expect b/pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.6.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_1.yaml.world.6.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_1.yaml.world.6.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_10.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.5.expect b/pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_10.yaml.world.5.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_10.yaml.world.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml b/pkg/front_end/testcases/incremental/reissue_errors_11.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_11.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_11.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_11.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml b/pkg/front_end/testcases/incremental/reissue_errors_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.5.expect b/pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.5.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.6.expect b/pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.6.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_2.yaml.world.6.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_2.yaml.world.6.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml b/pkg/front_end/testcases/incremental/reissue_errors_3.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_3.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.5.expect b/pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_3.yaml.world.5.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_3.yaml.world.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml b/pkg/front_end/testcases/incremental/reissue_errors_4.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_4.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.5.expect b/pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_4.yaml.world.5.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_4.yaml.world.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml b/pkg/front_end/testcases/incremental/reissue_errors_5.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_5.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_5.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_5.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml b/pkg/front_end/testcases/incremental/reissue_errors_6.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_6.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_6.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_6.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_6.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_6.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_6.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_6.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_6.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml b/pkg/front_end/testcases/incremental/reissue_errors_7.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_7.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.4.expect b/pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.4.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.4.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.4.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.5.expect b/pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.5.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_7.yaml.world.5.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_7.yaml.world.5.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml b/pkg/front_end/testcases/incremental/reissue_errors_8.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_8.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_8.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_8.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_8.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_8.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_8.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_8.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_8.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml b/pkg/front_end/testcases/incremental/reissue_errors_9.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml
rename to pkg/front_end/testcases/incremental/reissue_errors_9.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml.world.1.expect b/pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml.world.2.expect b/pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml.world.3.expect b/pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/reissue_errors_9.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/reissue_errors_9.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/remove_import_with_error.yaml b/pkg/front_end/testcases/incremental/remove_import_with_error.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/remove_import_with_error.yaml
rename to pkg/front_end/testcases/incremental/remove_import_with_error.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/remove_import_with_error.yaml.world.1.expect b/pkg/front_end/testcases/incremental/remove_import_with_error.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/remove_import_with_error.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/remove_import_with_error.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/remove_import_with_error.yaml.world.2.expect b/pkg/front_end/testcases/incremental/remove_import_with_error.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/remove_import_with_error.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/remove_import_with_error.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/strongmode_mixins.yaml b/pkg/front_end/testcases/incremental/strongmode_mixins.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/strongmode_mixins.yaml
rename to pkg/front_end/testcases/incremental/strongmode_mixins.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/strongmode_mixins_2.yaml b/pkg/front_end/testcases/incremental/strongmode_mixins_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/strongmode_mixins_2.yaml
rename to pkg/front_end/testcases/incremental/strongmode_mixins_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/typedef_crash_01.yaml b/pkg/front_end/testcases/incremental/typedef_crash_01.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/typedef_crash_01.yaml
rename to pkg/front_end/testcases/incremental/typedef_crash_01.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/typedef_crash_01.yaml.world.1.expect b/pkg/front_end/testcases/incremental/typedef_crash_01.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/typedef_crash_01.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/typedef_crash_01.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/typedef_crash_01.yaml.world.2.expect b/pkg/front_end/testcases/incremental/typedef_crash_01.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/typedef_crash_01.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/typedef_crash_01.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/unused_file.yaml b/pkg/front_end/testcases/incremental/unused_file.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/unused_file.yaml
rename to pkg/front_end/testcases/incremental/unused_file.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/unused_file.yaml.world.1.expect b/pkg/front_end/testcases/incremental/unused_file.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/unused_file.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/unused_file.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/unused_file.yaml.world.2.expect b/pkg/front_end/testcases/incremental/unused_file.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/unused_file.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/unused_file.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_1.yaml b/pkg/front_end/testcases/incremental/updated_package_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_1.yaml
rename to pkg/front_end/testcases/incremental/updated_package_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/updated_package_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/updated_package_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/updated_package_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/updated_package_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_2.yaml b/pkg/front_end/testcases/incremental/updated_package_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_2.yaml
rename to pkg/front_end/testcases/incremental/updated_package_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/updated_package_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/updated_package_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_2.yaml.world.2.expect b/pkg/front_end/testcases/incremental/updated_package_2.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_2.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/updated_package_2.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_3.yaml b/pkg/front_end/testcases/incremental/updated_package_3.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_3.yaml
rename to pkg/front_end/testcases/incremental/updated_package_3.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/updated_package_3.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_3.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/updated_package_3.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_3.yaml.world.2.expect b/pkg/front_end/testcases/incremental/updated_package_3.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_3.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/updated_package_3.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_4.yaml b/pkg/front_end/testcases/incremental/updated_package_4.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_4.yaml
rename to pkg/front_end/testcases/incremental/updated_package_4.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_4.yaml.world.1.expect b/pkg/front_end/testcases/incremental/updated_package_4.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_4.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/updated_package_4.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_4.yaml.world.2.expect b/pkg/front_end/testcases/incremental/updated_package_4.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_4.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/updated_package_4.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_uri.yaml b/pkg/front_end/testcases/incremental/updated_package_uri.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_uri.yaml
rename to pkg/front_end/testcases/incremental/updated_package_uri.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_uri.yaml.world.1.expect b/pkg/front_end/testcases/incremental/updated_package_uri.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_uri.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/updated_package_uri.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_uri.yaml.world.2.expect b/pkg/front_end/testcases/incremental/updated_package_uri.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/updated_package_uri.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/updated_package_uri.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml b/pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml
rename to pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.1.expect b/pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.2.expect b/pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.3.expect b/pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.3.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.3.expect
rename to pkg/front_end/testcases/incremental/vm_IRTest_TypedDataAOT_FunctionalIndexError.yaml.world.3.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_1.yaml b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_1.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_1.yaml
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_1.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_1.yaml.world.1.expect b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_1.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_1.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_1.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_1.yaml.world.2.expect b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_1.yaml.world.2.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_1.yaml.world.2.expect
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_1.yaml.world.2.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_2.yaml b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_2.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_2.yaml
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_2.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_2.yaml.world.1.expect b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_2.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_2.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_2.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_3.yaml b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_3.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_3.yaml
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_3.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_3.yaml.world.1.expect b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_3.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_3.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_3.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_4.yaml b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_4.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_4.yaml
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_4.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_4.yaml.world.1.expect b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_4.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_4.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_4.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_5.yaml b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_5.yaml
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_5.yaml
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_5.yaml
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_5.yaml.world.1.expect b/pkg/front_end/testcases/incremental/working_with_synthetic_libraries_5.yaml.world.1.expect
similarity index 100%
rename from pkg/front_end/testcases/incremental_initialize_from_dill/working_with_synthetic_libraries_5.yaml.world.1.expect
rename to pkg/front_end/testcases/incremental/working_with_synthetic_libraries_5.yaml.world.1.expect
diff --git a/pkg/front_end/testcases/incremental_dartino.status b/pkg/front_end/testcases/incremental_dartino.status
new file mode 100644
index 0000000..8485ed7
--- /dev/null
+++ b/pkg/front_end/testcases/incremental_dartino.status
@@ -0,0 +1,5 @@
+# Copyright (c) 2017, 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.md file.
+
+# Status file for the test suite ../test/fasta/incremental_dartino_test.dart.
diff --git a/pkg/front_end/testcases/incremental_initialize_from_dill/status.status b/pkg/front_end/testcases/incremental_initialize_from_dill/status.status
deleted file mode 100644
index b3f0c48..0000000
--- a/pkg/front_end/testcases/incremental_initialize_from_dill/status.status
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright (c) 2018, 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.md file.
-
-# Status file for the test suite ../test/incremental_load_from_dill_test.dart.
-
-# http://dartbug.com/41812#issuecomment-684825703
-strongmode_mixins_2: Crash
diff --git a/pkg/front_end/testcases/outline.status b/pkg/front_end/testcases/outline.status
index f01aa4e..d1c1df2 100644
--- a/pkg/front_end/testcases/outline.status
+++ b/pkg/front_end/testcases/outline.status
@@ -20,16 +20,6 @@
 general/override_check_basic: TypeCheckError
 general/override_check_with_covariant_modifier: TypeCheckError
 general/override_setter_with_field: TypeCheckError
-general_nnbd_opt_out/abstract_members: TypeCheckError
-general_nnbd_opt_out/bug30695: TypeCheckError
-general_nnbd_opt_out/mixin_application_override: TypeCheckError
-general_nnbd_opt_out/override_check_accessor_after_inference: TypeCheckError
-general_nnbd_opt_out/override_check_accessor_basic: TypeCheckError
-general_nnbd_opt_out/override_check_accessor_with_covariant_modifier: TypeCheckError
-general_nnbd_opt_out/override_check_after_inference: TypeCheckError
-general_nnbd_opt_out/override_check_basic: TypeCheckError
-general_nnbd_opt_out/override_check_with_covariant_modifier: TypeCheckError
-general_nnbd_opt_out/override_setter_with_field: TypeCheckError
 inference/do_not_infer_overridden_fields_that_explicitly_say_dynamic_infer: Fail
 inference/generic_methods_do_not_infer_invalid_override_of_generic_method: Fail
 inference/generic_methods_handle_override_of_non_generic_with_generic: Fail
diff --git a/pkg/front_end/testcases/strong.status b/pkg/front_end/testcases/strong.status
index a696227..a736a11 100644
--- a/pkg/front_end/testcases/strong.status
+++ b/pkg/front_end/testcases/strong.status
@@ -2,7 +2,7 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE.md file.
 
-# Status file for the strong_tester.dart test suite. This is testing generating
+# Status file for the strong_suite.dart test suite. This is testing generating
 # Kernel ASTs directly, that is, code in pkg/fasta/lib/src/kernel/ with
 # strong-mode enabled.
 
diff --git a/pkg/front_end/testcases/text_serialization.status b/pkg/front_end/testcases/text_serialization.status
index b3e1ee4..02cdb7c 100644
--- a/pkg/front_end/testcases/text_serialization.status
+++ b/pkg/front_end/testcases/text_serialization.status
@@ -97,50 +97,6 @@
 general/unsound_promotion: TypeCheckError
 general/void_methods: RuntimeError
 general/with_dependencies/issue_43084/issue_43084: RuntimeError
-general_nnbd_opt_out/abstract_members: TypeCheckError
-general_nnbd_opt_out/accessors: RuntimeError
-general_nnbd_opt_out/ambiguous_exports: RuntimeError
-general_nnbd_opt_out/await_in_non_async: RuntimeError
-general_nnbd_opt_out/bug21938: TypeCheckError
-general_nnbd_opt_out/bug30695: TypeCheckError
-general_nnbd_opt_out/bug31124: RuntimeError
-general_nnbd_opt_out/call: TypeCheckError
-general_nnbd_opt_out/candidate_found: TypeCheckError
-general_nnbd_opt_out/cascade: RuntimeError
-general_nnbd_opt_out/constructor_initializer_invalid: RuntimeError
-general_nnbd_opt_out/covariant_generic: RuntimeError
-general_nnbd_opt_out/duplicated_declarations: TypeCheckError
-general_nnbd_opt_out/duplicated_field_initializer: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_01: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_02: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_03: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_05: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_06: RuntimeError
-general_nnbd_opt_out/expressions: RuntimeError
-general_nnbd_opt_out/external_import: RuntimeError
-general_nnbd_opt_out/incomplete_field_formal_parameter: RuntimeError
-general_nnbd_opt_out/invocations: RuntimeError
-general_nnbd_opt_out/issue37776: RuntimeError
-general_nnbd_opt_out/issue38938: RuntimeError
-general_nnbd_opt_out/issue38944: RuntimeError
-general_nnbd_opt_out/issue38961: RuntimeError
-general_nnbd_opt_out/micro: RuntimeError
-general_nnbd_opt_out/mixin_application_override: TypeCheckError
-general_nnbd_opt_out/mixin_constructors_with_default_values: RuntimeError
-general_nnbd_opt_out/operator_method_not_found: RuntimeError
-general_nnbd_opt_out/optional: TypeCheckError
-general_nnbd_opt_out/override_check_accessor_after_inference: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_accessor_basic: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_accessor_with_covariant_modifier: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_after_inference: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_basic: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_with_covariant_modifier: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_setter_with_field: TypeCheckError
-general_nnbd_opt_out/spread_collection: RuntimeError # Should be fixed as part of implementing spread collection support
-general_nnbd_opt_out/type_parameter_type_named_int: RuntimeError
-general_nnbd_opt_out/type_variable_as_super: RuntimeError
-general_nnbd_opt_out/unsound_promotion: TypeCheckError
-general_nnbd_opt_out/void_methods: RuntimeError
 implicit_getter_calls/getter_call: TextSerializationFailure
 implicit_getter_calls/this_field_call: TextSerializationFailure
 inference/constructors_infer_from_arguments_argument_not_assignable: TypeCheckError
diff --git a/pkg/front_end/testcases/textual_outline.status b/pkg/front_end/testcases/textual_outline.status
index c01fda9..a9e5f3e 100644
--- a/pkg/front_end/testcases/textual_outline.status
+++ b/pkg/front_end/testcases/textual_outline.status
@@ -62,16 +62,7 @@
 general/null_safety_invalid_experiment_and_language_version: FormatterCrash
 general/type_parameters_on_void: FormatterCrash
 general/var_as_type_name: FormatterCrash
-general_nnbd_opt_out/annotation_eof: FormatterCrash
-general_nnbd_opt_out/bad_setter_abstract: FormatterCrash
-general_nnbd_opt_out/bug31124: FormatterCrash
-general_nnbd_opt_out/clone_function_type: FormatterCrash
-general_nnbd_opt_out/constructor_initializer_invalid: FormatterCrash
-general_nnbd_opt_out/duplicated_declarations: FormatterCrash
-general_nnbd_opt_out/function_type_default_value: FormatterCrash
-general_nnbd_opt_out/incomplete_field_formal_parameter: FormatterCrash
-general_nnbd_opt_out/many_errors: FormatterCrash
-general_nnbd_opt_out/var_as_type_name: FormatterCrash
+generic_metadata/generic_metadata: FormatterCrash
 inference/unsafe_block_closure_inference_function_call_explicit_dynamic_param_via_expr1: FormatterCrash
 inference/unsafe_block_closure_inference_function_call_explicit_type_param_via_expr1: FormatterCrash
 late_lowering/covariant_late_field: FormatterCrash
diff --git a/pkg/front_end/testcases/weak.status b/pkg/front_end/testcases/weak.status
index 210d44b..d5cbf29 100644
--- a/pkg/front_end/testcases/weak.status
+++ b/pkg/front_end/testcases/weak.status
@@ -2,7 +2,7 @@
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE.md file.
 
-# Status file for the weak_tester.dart test suite.
+# Status file for the weak_suite.dart test suite.
 
 # general/platform_invalid_uris/main: SemiFuzzFailure # semi fuzz fails but isn't currently enabled by default.
 # general/error_recovery/issue_39058.crash: SemiFuzzFailure # semi fuzz fails but isn't currently enabled by default.
@@ -99,51 +99,6 @@
 general/unsound_promotion: TypeCheckError
 general/void_methods: RuntimeError
 general/with_dependencies/issue_43084/issue_43084: RuntimeError
-general_nnbd_opt_out/abstract_members: TypeCheckError
-general_nnbd_opt_out/accessors: RuntimeError
-general_nnbd_opt_out/ambiguous_exports: RuntimeError # Expected, this file exports two main methods.
-general_nnbd_opt_out/await_in_non_async: RuntimeError # Expected.
-general_nnbd_opt_out/bug21938: TypeCheckError
-general_nnbd_opt_out/bug30695: TypeCheckError
-general_nnbd_opt_out/bug31124: RuntimeError # Test has no main method (and we shouldn't add one).
-general_nnbd_opt_out/call: TypeCheckError
-general_nnbd_opt_out/candidate_found: TypeCheckError
-general_nnbd_opt_out/cascade: RuntimeError
-general_nnbd_opt_out/constructor_initializer_invalid: RuntimeError # Fails execution after recovery
-general_nnbd_opt_out/covariant_generic: RuntimeError
-general_nnbd_opt_out/duplicated_declarations: TypeCheckError
-general_nnbd_opt_out/duplicated_field_initializer: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_01: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_02: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_03: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_05: RuntimeError
-general_nnbd_opt_out/error_locations/error_location_06: RuntimeError
-general_nnbd_opt_out/expressions: RuntimeError
-general_nnbd_opt_out/external_import: RuntimeError # The native extension to import doesn't exist. This is ok.
-general_nnbd_opt_out/incomplete_field_formal_parameter: RuntimeError
-general_nnbd_opt_out/invocations: RuntimeError
-general_nnbd_opt_out/issue37776: RuntimeError
-general_nnbd_opt_out/issue38938: RuntimeError # no main and compile time errors.
-general_nnbd_opt_out/issue38944: RuntimeError # no main and compile time errors.
-general_nnbd_opt_out/issue38961: RuntimeError # no main and compile time errors.
-general_nnbd_opt_out/micro: RuntimeError
-general_nnbd_opt_out/mixin_application_override: ExpectationFileMismatch # Too many errors.
-general_nnbd_opt_out/mixin_application_override: TypeCheckError
-general_nnbd_opt_out/mixin_constructors_with_default_values: RuntimeError # Expected
-general_nnbd_opt_out/operator_method_not_found: RuntimeError # Expected
-general_nnbd_opt_out/optional: TypeCheckError
-general_nnbd_opt_out/override_check_accessor_after_inference: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_accessor_basic: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_accessor_with_covariant_modifier: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_after_inference: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_basic: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_check_with_covariant_modifier: TypeCheckError # Issue #31620
-general_nnbd_opt_out/override_setter_with_field: TypeCheckError
-general_nnbd_opt_out/spread_collection: RuntimeError
-general_nnbd_opt_out/type_parameter_type_named_int: RuntimeError # Expected
-general_nnbd_opt_out/type_variable_as_super: RuntimeError
-general_nnbd_opt_out/unsound_promotion: TypeCheckError
-general_nnbd_opt_out/void_methods: RuntimeError
 late_lowering/covariant_late_field: TypeCheckError
 nnbd/covariant_late_field: TypeCheckError
 nnbd/getter_vs_setter_type: TypeCheckError
diff --git a/pkg/front_end/testing.json b/pkg/front_end/testing.json
index fd8960b..d3df652 100644
--- a/pkg/front_end/testing.json
+++ b/pkg/front_end/testing.json
@@ -79,7 +79,7 @@
     {
       "name": "strong",
       "kind": "Chain",
-      "source": "test/fasta/strong_tester.dart",
+      "source": "test/fasta/strong_suite.dart",
       "path": "testcases/",
       "status": "testcases/strong.status",
       "pattern": [
@@ -93,7 +93,6 @@
         "/testcases/expression/",
         "/testcases/extensions/",
         "/testcases/general/",
-        "/testcases/general_nnbd_opt_out/",
         "/testcases/implicit_getter_calls",
         "/testcases/inference",
         "/testcases/inference_new",
@@ -131,7 +130,7 @@
     {
       "name": "weak",
       "kind": "Chain",
-      "source": "test/fasta/weak_tester.dart",
+      "source": "test/fasta/weak_suite.dart",
       "path": "testcases/",
       "status": "testcases/weak.status",
       "pattern": [
@@ -145,11 +144,11 @@
       ]
     },
     {
-      "name": "incremental",
+      "name": "incremental_dartino",
       "kind": "Chain",
-      "source": "test/fasta/incremental_suite.dart",
-      "path": "testcases/",
-      "status": "testcases/incremental.status",
+      "source": "test/fasta/incremental_dartino_suite.dart",
+      "path": "testcases/dartino",
+      "status": "testcases/incremental_dartino.status",
       "pattern": [
         "\\.incremental\\.yaml$"
       ],
@@ -167,11 +166,11 @@
       "exclude": []
     },
     {
-      "name": "incremental_load_from_dill",
+      "name": "incremental",
       "kind": "Chain",
-      "source": "test/incremental_load_from_dill_suite.dart",
-      "path": "testcases/incremental_initialize_from_dill/",
-      "status": "testcases/incremental_initialize_from_dill/status.status",
+      "source": "test/incremental_suite.dart",
+      "path": "testcases/incremental/",
+      "status": "testcases/incremental.status",
       "pattern": [
         "\\.yaml$"
       ],
@@ -311,17 +310,6 @@
         "testcases/general/micro\\.dart$",
         "testcases/general/redirecting_factory\\.dart$",
         "testcases/general/spread_collection_inference\\.dart$",
-        "testcases/general_nnbd_opt_out/DeltaBlue\\.dart$",
-        "testcases/general_nnbd_opt_out/annotation_variable_declaration\\.dart$",
-        "testcases/general_nnbd_opt_out/arithmetic\\.dart$",
-        "testcases/general_nnbd_opt_out/bad_type_variable_uses_in_supertypes\\.dart$",
-        "testcases/general_nnbd_opt_out/clone_function_type\\.dart$",
-        "testcases/general_nnbd_opt_out/co19_language_metadata_syntax_t04\\.dart$",
-        "testcases/general_nnbd_opt_out/complex_class_hierarchy\\.dart$",
-        "testcases/general_nnbd_opt_out/issue34899\\.dart$",
-        "testcases/general_nnbd_opt_out/micro\\.dart$",
-        "testcases/general_nnbd_opt_out/redirecting_factory\\.dart$",
-        "testcases/general_nnbd_opt_out/spread_collection_inference\\.dart$",
         "testcases/inference/downwards_inference_initializing_formal_default_formal\\.dart$",
         "testcases/inference/downwards_inference_on_generic_function_expressions\\.dart$",
         "testcases/inference/for_in_loop_promotion\\.dart$",
diff --git a/pkg/front_end/tool/update_expectations.dart b/pkg/front_end/tool/update_expectations.dart
index a1cc85c..fdc449e 100644
--- a/pkg/front_end/tool/update_expectations.dart
+++ b/pkg/front_end/tool/update_expectations.dart
@@ -16,7 +16,7 @@
 
 const List<String> specialSuites = <String>[
   'expression',
-  'incremental_load_from_dill',
+  'incremental',
 ];
 
 Future<void> runStandardSuites([List<String> args]) async {
diff --git a/pkg/vm/lib/target/vm.dart b/pkg/vm/lib/target/vm.dart
index d91154e..7fbf03c 100644
--- a/pkg/vm/lib/target/vm.dart
+++ b/pkg/vm/lib/target/vm.dart
@@ -21,6 +21,7 @@
 import '../transformations/call_site_annotator.dart' as callSiteAnnotator;
 import '../transformations/lowering.dart' as lowering
     show transformLibraries, transformProcedure;
+import '../transformations/ffi.dart' as ffiHelper show importsFfi;
 import '../transformations/ffi_definitions.dart' as transformFfiDefinitions
     show transformLibraries;
 import '../transformations/ffi_use_sites.dart' as transformFfiUseSites
@@ -153,17 +154,29 @@
         this, coreTypes, hierarchy, libraries, referenceFromIndex);
     logger?.call("Transformed mixin applications");
 
-    final ffiTransformerData = transformFfiDefinitions.transformLibraries(
-        component,
-        coreTypes,
-        hierarchy,
-        libraries,
-        diagnosticReporter,
-        referenceFromIndex,
-        changedStructureNotifier);
-    transformFfiUseSites.transformLibraries(component, coreTypes, hierarchy,
-        libraries, diagnosticReporter, ffiTransformerData, referenceFromIndex);
-    logger?.call("Transformed ffi annotations");
+    if (!ffiHelper.importsFfi(component, libraries)) {
+      logger?.call("Skipped ffi transformation");
+    } else {
+      // TODO(jensj/dacoharkes): We can probably limit the transformations to
+      // libraries that transitivley depend on dart:ffi.
+      final ffiTransformerData = transformFfiDefinitions.transformLibraries(
+          component,
+          coreTypes,
+          hierarchy,
+          libraries,
+          diagnosticReporter,
+          referenceFromIndex,
+          changedStructureNotifier);
+      transformFfiUseSites.transformLibraries(
+          component,
+          coreTypes,
+          hierarchy,
+          libraries,
+          diagnosticReporter,
+          ffiTransformerData,
+          referenceFromIndex);
+      logger?.call("Transformed ffi annotations");
+    }
 
     // TODO(kmillikin): Make this run on a per-method basis.
     bool productMode = environmentDefines["dart.vm.product"] == "true";
diff --git a/pkg/vm/lib/transformations/ffi.dart b/pkg/vm/lib/transformations/ffi.dart
index 209e4df..f2262e8 100644
--- a/pkg/vm/lib/transformations/ffi.dart
+++ b/pkg/vm/lib/transformations/ffi.dart
@@ -570,3 +570,17 @@
   FfiTransformerData(
       this.replacedGetters, this.replacedSetters, this.emptyStructs);
 }
+
+/// Checks if any library depends on dart:ffi.
+bool importsFfi(Component component, List<Library> libraries) {
+  Set<Library> allLibs = {...component.libraries, ...libraries};
+  final Uri dartFfiUri = Uri.parse("dart:ffi");
+  for (Library lib in allLibs) {
+    for (LibraryDependency dependency in lib.dependencies) {
+      if (dependency.targetLibrary.importUri == dartFfiUri) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
diff --git a/tests/standalone/io/secure_server_client_certificate_test.dart b/tests/standalone/io/secure_server_client_certificate_test.dart
index 2223d3e..81da9fbf 100644
--- a/tests/standalone/io/secure_server_client_certificate_test.dart
+++ b/tests/standalone/io/secure_server_client_certificate_test.dart
@@ -68,16 +68,27 @@
   var clientEndFuture =
       SecureSocket.connect(HOST, server.port, context: clientContext);
   if (required && !sendCert) {
-    try {
-      await server.first;
-    } catch (e) {
-      try {
-        await clientEndFuture;
-      } catch (e) {
-        return;
-      }
-    }
-    Expect.fail("Connection succeeded with no required client certificate");
+    final serverErrorCompleter = Completer<Exception>();
+    server.listen((request) {
+      Expect.fail('Should not get a request through');
+    }, onError: (e) => serverErrorCompleter.complete(e));
+
+    final clientDisconnected = Completer();
+    final clientEnd = await clientEndFuture;
+    clientEnd.write(<int>[5, 6, 7, 8]);
+    clientEnd.close();
+    clientEnd.listen((data) {
+      Expect.fail('Should not get data through');
+    }, onError: (e) {
+      Expect.isTrue(e is SocketException);
+    }, onDone: () {
+      clientDisconnected.complete();
+    });
+    Expect.isTrue(await serverErrorCompleter.future is HandshakeException);
+    // Client might not report an error, might get just disconnected.
+    await clientDisconnected.future;
+    server.close();
+    return;
   }
   var serverEnd = await server.first;
   var clientEnd = await clientEndFuture;
diff --git a/tests/standalone_2/io/secure_server_client_certificate_test.dart b/tests/standalone_2/io/secure_server_client_certificate_test.dart
index e28a462..7c7da85 100644
--- a/tests/standalone_2/io/secure_server_client_certificate_test.dart
+++ b/tests/standalone_2/io/secure_server_client_certificate_test.dart
@@ -65,16 +65,27 @@
   var clientEndFuture =
       SecureSocket.connect(HOST, server.port, context: clientContext);
   if (required && !sendCert) {
-    try {
-      await server.first;
-    } catch (e) {
-      try {
-        await clientEndFuture;
-      } catch (e) {
-        return;
-      }
-    }
-    Expect.fail("Connection succeeded with no required client certificate");
+    final serverErrorCompleter = Completer<Exception>();
+    server.listen((request) {
+      Expect.fail('Should not get a request through');
+    }, onError: (e) => serverErrorCompleter.complete(e));
+
+    final clientDisconnected = Completer();
+    final clientEnd = await clientEndFuture;
+    clientEnd.write(<int>[5, 6, 7, 8]);
+    clientEnd.close();
+    clientEnd.listen((data) {
+      Expect.fail('Should not get data through');
+    }, onError: (e) {
+      Expect.isTrue(e is SocketException);
+    }, onDone: () {
+      clientDisconnected.complete();
+    });
+    Expect.isTrue(await serverErrorCompleter.future is HandshakeException);
+    // Client might not report an error, might get just disconnected.
+    await clientDisconnected.future;
+    server.close();
+    return;
   }
   var serverEnd = await server.first;
   var clientEnd = await clientEndFuture;
diff --git a/tools/VERSION b/tools/VERSION
index a1eeaa4..26d356b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 13
 PATCH 0
-PRERELEASE 53
+PRERELEASE 54
 PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/generate_package_config.dart b/tools/generate_package_config.dart
index f5868ff..babc89d 100644
--- a/tools/generate_package_config.dart
+++ b/tools/generate_package_config.dart
@@ -128,7 +128,7 @@
 
   // TODO(rnystrom): Consider using package_config_v2 to generate this instead.
   var json = JsonEncoder.withIndent('  ').convert(config);
-  configFile.writeAsStringSync(json);
+  configFile.writeAsStringSync('$json\n');
   print('Generated .dart_tool/package_config.dart containing '
       '${packages.length} packages.');
 }