Print user-imports and parts when printing ast to text Also remove some duplicated code so libraries are mostly only printed in one place. Change-Id: I7cb86bff1938f05631d7eb3432deda2c9939f402 Reviewed-on: https://dart-review.googlesource.com/c/90226 Reviewed-by: Peter von der Ahé <ahe@google.com> Commit-Queue: Jens Johansen <jensj@google.com>

commit: 1bad9304a026418871b2f6468d2a87f9caea8b09 [log] [tgz]
author: Jens Johansen <jensj@google.com> Mon Jan 21 12:10:16 2019 +0000
committer: commit-bot@chromium.org <commit-bot@chromium.org> Mon Jan 21 12:10:16 2019 +0000
tree: 16e22021e6ffb81462b611d972e6de23f120ebad
parent: bc81271f290b24f9f143392044bc3dc080c03ef6 [diff]
diff --git a/pkg/front_end/testcases/ambiguous_exports.dart.legacy.expect b/pkg/front_end/testcases/ambiguous_exports.dart.legacy.expect
index 9aadb02..c1c8050 100644
--- a/pkg/front_end/testcases/ambiguous_exports.dart.legacy.expect
+++ b/pkg/front_end/testcases/ambiguous_exports.dart.legacy.expect

@@ -8,4 +8,7 @@
 //
 import self as self;
 
+export "org-dartlang-testcase:///hello.dart";
+export "org-dartlang-testcase:///map.dart";
+
 static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/hello.dart' and 'pkg/front_end/testcases/map.dart'.\"}" /* from null */;

diff --git a/pkg/front_end/testcases/ambiguous_exports.dart.legacy.transformed.expect b/pkg/front_end/testcases/ambiguous_exports.dart.legacy.transformed.expect
index 9aadb02..c1c8050 100644
--- a/pkg/front_end/testcases/ambiguous_exports.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/ambiguous_exports.dart.legacy.transformed.expect

@@ -8,4 +8,7 @@
 //
 import self as self;
 
+export "org-dartlang-testcase:///hello.dart";
+export "org-dartlang-testcase:///map.dart";
+
 static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/hello.dart' and 'pkg/front_end/testcases/map.dart'.\"}" /* from null */;

diff --git a/pkg/front_end/testcases/ambiguous_exports.dart.outline.expect b/pkg/front_end/testcases/ambiguous_exports.dart.outline.expect
index 9aadb02..c1c8050 100644
--- a/pkg/front_end/testcases/ambiguous_exports.dart.outline.expect
+++ b/pkg/front_end/testcases/ambiguous_exports.dart.outline.expect

@@ -8,4 +8,7 @@
 //
 import self as self;
 
+export "org-dartlang-testcase:///hello.dart";
+export "org-dartlang-testcase:///map.dart";
+
 static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/hello.dart' and 'pkg/front_end/testcases/map.dart'.\"}" /* from null */;

diff --git a/pkg/front_end/testcases/ambiguous_exports.dart.strong.expect b/pkg/front_end/testcases/ambiguous_exports.dart.strong.expect
index 9aadb02..c1c8050 100644
--- a/pkg/front_end/testcases/ambiguous_exports.dart.strong.expect
+++ b/pkg/front_end/testcases/ambiguous_exports.dart.strong.expect

@@ -8,4 +8,7 @@
 //
 import self as self;
 
+export "org-dartlang-testcase:///hello.dart";
+export "org-dartlang-testcase:///map.dart";
+
 static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/hello.dart' and 'pkg/front_end/testcases/map.dart'.\"}" /* from null */;

diff --git a/pkg/front_end/testcases/ambiguous_exports.dart.strong.transformed.expect b/pkg/front_end/testcases/ambiguous_exports.dart.strong.transformed.expect
index 9aadb02..c1c8050 100644
--- a/pkg/front_end/testcases/ambiguous_exports.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/ambiguous_exports.dart.strong.transformed.expect

@@ -8,4 +8,7 @@
 //
 import self as self;
 
+export "org-dartlang-testcase:///hello.dart";
+export "org-dartlang-testcase:///map.dart";
+
 static const field dynamic _exports# = "{\"main\":\"'main' is exported from both 'pkg/front_end/testcases/hello.dart' and 'pkg/front_end/testcases/map.dart'.\"}" /* from null */;

diff --git a/pkg/front_end/testcases/async_function.dart.legacy.expect b/pkg/front_end/testcases/async_function.dart.legacy.expect
index 6a9bffa..0510556 100644
--- a/pkg/front_end/testcases/async_function.dart.legacy.expect
+++ b/pkg/front_end/testcases/async_function.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field core::List<core::String> stringList = <dynamic>["bar"];
 static method asyncString() → asy::Future<core::String> async {
   return "foo";

diff --git a/pkg/front_end/testcases/async_function.dart.legacy.transformed.expect b/pkg/front_end/testcases/async_function.dart.legacy.transformed.expect
index c4a5b51..2ac15d8 100644
--- a/pkg/front_end/testcases/async_function.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/async_function.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field core::List<core::String> stringList = <dynamic>["bar"];
 static method asyncString() → asy::Future<core::String> /* originally async */ {
   final asy::_AsyncAwaitCompleter<core::String> :async_completer = new asy::_AsyncAwaitCompleter::•<core::String>();

diff --git a/pkg/front_end/testcases/async_function.dart.outline.expect b/pkg/front_end/testcases/async_function.dart.outline.expect
index e1bc747..d9c5589 100644
--- a/pkg/front_end/testcases/async_function.dart.outline.expect
+++ b/pkg/front_end/testcases/async_function.dart.outline.expect

@@ -3,6 +3,8 @@
 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>
   ;

diff --git a/pkg/front_end/testcases/async_function.dart.strong.expect b/pkg/front_end/testcases/async_function.dart.strong.expect
index 4cbc5e0..b4babf8 100644
--- a/pkg/front_end/testcases/async_function.dart.strong.expect
+++ b/pkg/front_end/testcases/async_function.dart.strong.expect

@@ -3,6 +3,8 @@
 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";

diff --git a/pkg/front_end/testcases/async_function.dart.strong.transformed.expect b/pkg/front_end/testcases/async_function.dart.strong.transformed.expect
index a57a753..d2dffb7 100644
--- a/pkg/front_end/testcases/async_function.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/async_function.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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> /* originally async */ {
   final asy::_AsyncAwaitCompleter<core::String> :async_completer = new asy::_AsyncAwaitCompleter::•<core::String>();

diff --git a/pkg/front_end/testcases/async_nested.dart.legacy.expect b/pkg/front_end/testcases/async_nested.dart.legacy.expect
index b1f76d3..363de24 100644
--- a/pkg/front_end/testcases/async_nested.dart.legacy.expect
+++ b/pkg/front_end/testcases/async_nested.dart.legacy.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/async_nested.dart.legacy.transformed.expect b/pkg/front_end/testcases/async_nested.dart.legacy.transformed.expect
index ad071a1..c0e22cb 100644
--- a/pkg/front_end/testcases/async_nested.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/async_nested.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/async_nested.dart.outline.expect b/pkg/front_end/testcases/async_nested.dart.outline.expect
index 1511915..57d0f20 100644
--- a/pkg/front_end/testcases/async_nested.dart.outline.expect
+++ b/pkg/front_end/testcases/async_nested.dart.outline.expect

@@ -2,6 +2,8 @@
 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;

diff --git a/pkg/front_end/testcases/async_nested.dart.strong.expect b/pkg/front_end/testcases/async_nested.dart.strong.expect
index d207e896..d51ca15 100644
--- a/pkg/front_end/testcases/async_nested.dart.strong.expect
+++ b/pkg/front_end/testcases/async_nested.dart.strong.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/async_nested.dart.strong.transformed.expect b/pkg/front_end/testcases/async_nested.dart.strong.transformed.expect
index b5b0c4b..246f441 100644
--- a/pkg/front_end/testcases/async_nested.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/async_nested.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/bug33099.dart.outline.expect b/pkg/front_end/testcases/bug33099.dart.outline.expect
index 94c81bb..42a5b20 100644
--- a/pkg/front_end/testcases/bug33099.dart.outline.expect
+++ b/pkg/front_end/testcases/bug33099.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:mirrors" as mir;
 
+import "dart:mirrors";
+
 class _FailingTest extends core::Object {
   const constructor •() → self::_FailingTest
     ;

diff --git a/pkg/front_end/testcases/bug33099.dart.strong.expect b/pkg/front_end/testcases/bug33099.dart.strong.expect
index 4fb89b3..978c12b 100644
--- a/pkg/front_end/testcases/bug33099.dart.strong.expect
+++ b/pkg/front_end/testcases/bug33099.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:mirrors" as mir;
 
+import "dart:mirrors";
+
 class _FailingTest extends core::Object {
   const constructor •() → self::_FailingTest
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect b/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect
index 5ad81b8..1a0aaa1 100644
--- a/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/bug33099.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:mirrors" as mir;
 
+import "dart:mirrors";
+
 class _FailingTest extends core::Object {
   const constructor •() → self::_FailingTest
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/bug33196.dart.legacy.expect b/pkg/front_end/testcases/bug33196.dart.legacy.expect
index 4baad60..70357f0 100644
--- a/pkg/front_end/testcases/bug33196.dart.legacy.expect
+++ b/pkg/front_end/testcases/bug33196.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method main() → dynamic {
   dynamic result = self::returnsString();
   core::print(result.runtimeType);

diff --git a/pkg/front_end/testcases/bug33196.dart.legacy.transformed.expect b/pkg/front_end/testcases/bug33196.dart.legacy.transformed.expect
index 8f79612..00e49aa 100644
--- a/pkg/front_end/testcases/bug33196.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/bug33196.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method main() → dynamic {
   dynamic result = self::returnsString();
   core::print(result.runtimeType);

diff --git a/pkg/front_end/testcases/bug33196.dart.outline.expect b/pkg/front_end/testcases/bug33196.dart.outline.expect
index e640af1..09ab950 100644
--- a/pkg/front_end/testcases/bug33196.dart.outline.expect
+++ b/pkg/front_end/testcases/bug33196.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic
   ;
 static method returnsString() → asy::FutureOr<core::String>

diff --git a/pkg/front_end/testcases/bug33196.dart.strong.expect b/pkg/front_end/testcases/bug33196.dart.strong.expect
index d8e9475..95912f8 100644
--- a/pkg/front_end/testcases/bug33196.dart.strong.expect
+++ b/pkg/front_end/testcases/bug33196.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic {
   asy::FutureOr<core::String> result = self::returnsString();
   core::print(result.{core::Object::runtimeType});

diff --git a/pkg/front_end/testcases/bug33196.dart.strong.transformed.expect b/pkg/front_end/testcases/bug33196.dart.strong.transformed.expect
index 1b395b7..6e20cd1 100644
--- a/pkg/front_end/testcases/bug33196.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/bug33196.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic {
   asy::FutureOr<core::String> result = self::returnsString();
   core::print(result.{core::Object::runtimeType});

diff --git a/pkg/front_end/testcases/bug33206.dart.legacy.expect b/pkg/front_end/testcases/bug33206.dart.legacy.expect
index 504c440..b0dba95 100644
--- a/pkg/front_end/testcases/bug33206.dart.legacy.expect
+++ b/pkg/front_end/testcases/bug33206.dart.legacy.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/bug33206.dart.legacy.transformed.expect b/pkg/front_end/testcases/bug33206.dart.legacy.transformed.expect
index e19e82a..2a26c19 100644
--- a/pkg/front_end/testcases/bug33206.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/bug33206.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/bug33206.dart.outline.expect b/pkg/front_end/testcases/bug33206.dart.outline.expect
index ecb824e..95d83e8 100644
--- a/pkg/front_end/testcases/bug33206.dart.outline.expect
+++ b/pkg/front_end/testcases/bug33206.dart.outline.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/bug33206.dart.strong.expect b/pkg/front_end/testcases/bug33206.dart.strong.expect
index 77e20c5..a95aaef 100644
--- a/pkg/front_end/testcases/bug33206.dart.strong.expect
+++ b/pkg/front_end/testcases/bug33206.dart.strong.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/bug33206.dart.strong.transformed.expect b/pkg/front_end/testcases/bug33206.dart.strong.transformed.expect
index 217f7b0..750e012 100644
--- a/pkg/front_end/testcases/bug33206.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/bug33206.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.expect
index 25dc9b8..556fb76 100644
--- a/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•());

diff --git a/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.transformed.expect
index 25dc9b8..556fb76 100644
--- a/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_allocation.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•());

diff --git a/pkg/front_end/testcases/check_deferred_allocation.dart.outline.expect b/pkg/front_end/testcases/check_deferred_allocation.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_allocation.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_allocation.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_allocation.dart.strong.expect b/pkg/front_end/testcases/check_deferred_allocation.dart.strong.expect
index 25dc9b8..556fb76 100644
--- a/pkg/front_end/testcases/check_deferred_allocation.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_allocation.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•());

diff --git a/pkg/front_end/testcases/check_deferred_allocation.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_allocation.dart.strong.transformed.expect
index d62c43e..bc68ce0 100644
--- a/pkg/front_end/testcases/check_deferred_allocation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_allocation.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•());

diff --git a/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.expect
index d82327a..538a05e 100644
--- a/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.expect

@@ -10,6 +10,8 @@
 //
 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;

diff --git a/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.transformed.expect
index d82327a..538a05e 100644
--- a/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_as_check.dart.legacy.transformed.expect

@@ -10,6 +10,8 @@
 //
 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;

diff --git a/pkg/front_end/testcases/check_deferred_as_check.dart.outline.expect b/pkg/front_end/testcases/check_deferred_as_check.dart.outline.expect
index dc16c61..5704231 100644
--- a/pkg/front_end/testcases/check_deferred_as_check.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_as_check.dart.outline.expect

@@ -1,6 +1,8 @@
 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

diff --git a/pkg/front_end/testcases/check_deferred_as_check.dart.strong.expect b/pkg/front_end/testcases/check_deferred_as_check.dart.strong.expect
index 9673cd5..be0ee3e 100644
--- a/pkg/front_end/testcases/check_deferred_as_check.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_as_check.dart.strong.expect

@@ -10,6 +10,8 @@
 //
 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;

diff --git a/pkg/front_end/testcases/check_deferred_as_check.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_as_check.dart.strong.transformed.expect
index 9673cd5..be0ee3e 100644
--- a/pkg/front_end/testcases/check_deferred_as_check.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_as_check.dart.strong.transformed.expect

@@ -10,6 +10,8 @@
 //
 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;

diff --git a/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.expect
index 0ff5bf9..b583fe6 100644
--- a/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.expect

@@ -2,6 +2,8 @@
 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 = self::m2();

diff --git a/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.transformed.expect
index 0ff5bf9..b583fe6 100644
--- a/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 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 = self::m2();

diff --git a/pkg/front_end/testcases/check_deferred_before_args.dart.outline.expect b/pkg/front_end/testcases/check_deferred_before_args.dart.outline.expect
index 8140e58..f337e59 100644
--- a/pkg/front_end/testcases/check_deferred_before_args.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_before_args.dart.strong.expect b/pkg/front_end/testcases/check_deferred_before_args.dart.strong.expect
index 3748727..0c9056c 100644
--- a/pkg/front_end/testcases/check_deferred_before_args.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args.dart.strong.expect

@@ -3,6 +3,8 @@
 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} core::int;

diff --git a/pkg/front_end/testcases/check_deferred_before_args.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_before_args.dart.strong.transformed.expect
index 0cf7c47..c1f18f3 100644
--- a/pkg/front_end/testcases/check_deferred_before_args.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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} core::int;

diff --git a/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.expect
index 5b1c7ee..ae94103 100644
--- a/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.expect

@@ -2,6 +2,8 @@
 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));

diff --git a/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.transformed.expect
index f04ef3d..5993cc2 100644
--- a/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 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::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();

diff --git a/pkg/front_end/testcases/check_deferred_before_args2.dart.outline.expect b/pkg/front_end/testcases/check_deferred_before_args2.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_before_args2.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args2.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.expect b/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.expect
index 5b1c7ee..ae94103 100644
--- a/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.expect

@@ -2,6 +2,8 @@
 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));

diff --git a/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.transformed.expect
index 6821c33..bc9bc03 100644
--- a/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_args2.dart.strong.transformed.expect

@@ -4,6 +4,8 @@
 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::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();

diff --git a/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.expect
index 9aef4cf..28f8129 100644
--- a/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.expect

@@ -2,6 +2,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.transformed.expect
index 9aef4cf..28f8129 100644
--- a/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_call.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_before_call.dart.outline.expect b/pkg/front_end/testcases/check_deferred_before_call.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_before_call.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_before_call.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_before_call.dart.strong.expect b/pkg/front_end/testcases/check_deferred_before_call.dart.strong.expect
index 9aef4cf..28f8129 100644
--- a/pkg/front_end/testcases/check_deferred_before_call.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_before_call.dart.strong.expect

@@ -2,6 +2,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_before_call.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_before_call.dart.strong.transformed.expect
index 1eb7ae1..91603e1 100644
--- a/pkg/front_end/testcases/check_deferred_before_call.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_call.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.expect
index 2b7ef3d..f8c8ab8 100644
--- a/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.expect

@@ -2,6 +2,8 @@
 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;

diff --git a/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.transformed.expect
index 2b7ef3d..f8c8ab8 100644
--- a/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_write.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 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;

diff --git a/pkg/front_end/testcases/check_deferred_before_write.dart.outline.expect b/pkg/front_end/testcases/check_deferred_before_write.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_before_write.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_before_write.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_before_write.dart.strong.expect b/pkg/front_end/testcases/check_deferred_before_write.dart.strong.expect
index 2b7ef3d..f8c8ab8 100644
--- a/pkg/front_end/testcases/check_deferred_before_write.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_before_write.dart.strong.expect

@@ -2,6 +2,8 @@
 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;

diff --git a/pkg/front_end/testcases/check_deferred_before_write.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_before_write.dart.strong.transformed.expect
index d51e9f3..c623a7f 100644
--- a/pkg/front_end/testcases/check_deferred_before_write.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_before_write.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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;

diff --git a/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.expect
index 5ab626d..8aa1bd8 100644
--- a/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.expect

@@ -11,6 +11,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.transformed.expect
index 5ab626d..8aa1bd8 100644
--- a/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_is_check.dart.legacy.transformed.expect

@@ -11,6 +11,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_is_check.dart.outline.expect b/pkg/front_end/testcases/check_deferred_is_check.dart.outline.expect
index dc16c61..5704231 100644
--- a/pkg/front_end/testcases/check_deferred_is_check.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_is_check.dart.outline.expect

@@ -1,6 +1,8 @@
 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

diff --git a/pkg/front_end/testcases/check_deferred_is_check.dart.strong.expect b/pkg/front_end/testcases/check_deferred_is_check.dart.strong.expect
index 453749e..0b29ae2 100644
--- a/pkg/front_end/testcases/check_deferred_is_check.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_is_check.dart.strong.expect

@@ -11,6 +11,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_is_check.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_is_check.dart.strong.transformed.expect
index 453749e..0b29ae2 100644
--- a/pkg/front_end/testcases/check_deferred_is_check.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_is_check.dart.strong.transformed.expect

@@ -11,6 +11,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_read.dart.legacy.expect
index 5fd285b..499aeae 100644
--- a/pkg/front_end/testcases/check_deferred_read.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_read.dart.legacy.expect

@@ -3,6 +3,8 @@
 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).+(1));

diff --git a/pkg/front_end/testcases/check_deferred_read.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_read.dart.legacy.transformed.expect
index 5fd285b..499aeae 100644
--- a/pkg/front_end/testcases/check_deferred_read.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_read.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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).+(1));

diff --git a/pkg/front_end/testcases/check_deferred_read.dart.outline.expect b/pkg/front_end/testcases/check_deferred_read.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_read.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_read.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_read.dart.strong.expect b/pkg/front_end/testcases/check_deferred_read.dart.strong.expect
index 9c00ad0..f56359e 100644
--- a/pkg/front_end/testcases/check_deferred_read.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_read.dart.strong.expect

@@ -3,6 +3,8 @@
 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));

diff --git a/pkg/front_end/testcases/check_deferred_read.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_read.dart.strong.transformed.expect
index f01fe12..48248bc 100644
--- a/pkg/front_end/testcases/check_deferred_read.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_read.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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));

diff --git a/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.expect
index 7b3c2df..80b5f3f 100644
--- a/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.transformed.expect
index 7b3c2df..80b5f3f 100644
--- a/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_read_static_field.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read_static_field.dart.outline.expect b/pkg/front_end/testcases/check_deferred_read_static_field.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_read_static_field.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_read_static_field.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.expect b/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.expect
index 7b3c2df..80b5f3f 100644
--- a/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.transformed.expect
index a3557a6..28850ff 100644
--- a/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_read_static_field.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.expect
index 4c3620c..9821ae8 100644
--- a/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.transformed.expect
index 4c3620c..9821ae8 100644
--- a/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_read_type.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read_type.dart.outline.expect b/pkg/front_end/testcases/check_deferred_read_type.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_read_type.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_read_type.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_read_type.dart.strong.expect b/pkg/front_end/testcases/check_deferred_read_type.dart.strong.expect
index 4c3620c..9821ae8 100644
--- a/pkg/front_end/testcases/check_deferred_read_type.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_read_type.dart.strong.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_read_type.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_read_type.dart.strong.transformed.expect
index 555229f..eda7cda 100644
--- a/pkg/front_end/testcases/check_deferred_read_type.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_read_type.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.expect
index 05236e5..ecd83cf 100644
--- a/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.expect

@@ -3,6 +3,8 @@
 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());

diff --git a/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.transformed.expect
index 05236e5..ecd83cf 100644
--- a/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_static_method_call.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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());

diff --git a/pkg/front_end/testcases/check_deferred_static_method_call.dart.outline.expect b/pkg/front_end/testcases/check_deferred_static_method_call.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_static_method_call.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_static_method_call.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.expect b/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.expect
index 05236e5..ecd83cf 100644
--- a/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.expect

@@ -3,6 +3,8 @@
 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());

diff --git a/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.transformed.expect
index c5ab3c3..f80668e 100644
--- a/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_static_method_call.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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());

diff --git a/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.expect b/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.expect
index c1e12a1..5f48bdc 100644
--- a/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.expect
+++ b/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.expect

@@ -10,6 +10,8 @@
 //
 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 {

diff --git a/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.transformed.expect b/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.transformed.expect
index c1e12a1..5f48bdc 100644
--- a/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_type_declaration.dart.legacy.transformed.expect

@@ -10,6 +10,8 @@
 //
 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 {

diff --git a/pkg/front_end/testcases/check_deferred_type_declaration.dart.outline.expect b/pkg/front_end/testcases/check_deferred_type_declaration.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/check_deferred_type_declaration.dart.outline.expect
+++ b/pkg/front_end/testcases/check_deferred_type_declaration.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.expect b/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.expect
index d0fe579..bfe2e2c 100644
--- a/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.expect
+++ b/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.expect

@@ -10,6 +10,8 @@
 //
 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 {

diff --git a/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.transformed.expect b/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.transformed.expect
index d0fe579..bfe2e2c 100644
--- a/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/check_deferred_type_declaration.dart.strong.transformed.expect

@@ -10,6 +10,8 @@
 //
 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 {

diff --git a/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.expect b/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.expect
index 736cc06..c399546 100644
--- a/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.expect
+++ b/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.expect

@@ -9,6 +9,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.transformed.expect b/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.transformed.expect
index 736cc06..c399546 100644
--- a/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/continue_inference_after_error.dart.legacy.transformed.expect

@@ -9,6 +9,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/continue_inference_after_error.dart.outline.expect b/pkg/front_end/testcases/continue_inference_after_error.dart.outline.expect
index e2e68b1..53801ad 100644
--- a/pkg/front_end/testcases/continue_inference_after_error.dart.outline.expect
+++ b/pkg/front_end/testcases/continue_inference_after_error.dart.outline.expect

@@ -2,6 +2,8 @@
 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
     ;

diff --git a/pkg/front_end/testcases/continue_inference_after_error.dart.strong.expect b/pkg/front_end/testcases/continue_inference_after_error.dart.strong.expect
index 0cc9a03..eb934cc 100644
--- a/pkg/front_end/testcases/continue_inference_after_error.dart.strong.expect
+++ b/pkg/front_end/testcases/continue_inference_after_error.dart.strong.expect

@@ -15,6 +15,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/continue_inference_after_error.dart.strong.transformed.expect b/pkg/front_end/testcases/continue_inference_after_error.dart.strong.transformed.expect
index 3b86ae4..50ace6f 100644
--- a/pkg/front_end/testcases/continue_inference_after_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/continue_inference_after_error.dart.strong.transformed.expect

@@ -15,6 +15,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.expect b/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.expect
index a8167e7..2b5cbfa 100644
--- a/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.expect
+++ b/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.expect

@@ -11,5 +11,7 @@
 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 {}

diff --git a/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.transformed.expect b/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.transformed.expect
index a8167e7..2b5cbfa 100644
--- a/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/deferred_type_annotation.dart.legacy.transformed.expect

@@ -11,5 +11,7 @@
 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 {}

diff --git a/pkg/front_end/testcases/deferred_type_annotation.dart.outline.expect b/pkg/front_end/testcases/deferred_type_annotation.dart.outline.expect
index 15a1fa3..64a4eaf 100644
--- a/pkg/front_end/testcases/deferred_type_annotation.dart.outline.expect
+++ b/pkg/front_end/testcases/deferred_type_annotation.dart.outline.expect

@@ -2,6 +2,8 @@
 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

diff --git a/pkg/front_end/testcases/deferred_type_annotation.dart.strong.expect b/pkg/front_end/testcases/deferred_type_annotation.dart.strong.expect
index 206a2d8..3721730 100644
--- a/pkg/front_end/testcases/deferred_type_annotation.dart.strong.expect
+++ b/pkg/front_end/testcases/deferred_type_annotation.dart.strong.expect

@@ -11,5 +11,7 @@
 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 {}

diff --git a/pkg/front_end/testcases/deferred_type_annotation.dart.strong.transformed.expect b/pkg/front_end/testcases/deferred_type_annotation.dart.strong.transformed.expect
index 206a2d8..3721730 100644
--- a/pkg/front_end/testcases/deferred_type_annotation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/deferred_type_annotation.dart.strong.transformed.expect

@@ -11,5 +11,7 @@
 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 {}

diff --git a/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.expect b/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.expect
index 2c360d3..bc177be 100644
--- a/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.expect
+++ b/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.expect

@@ -24,6 +24,9 @@
 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::•()

diff --git a/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.transformed.expect b/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.transformed.expect
index 2c360d3..bc177be 100644
--- a/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/duplicated_bad_prefix.dart.legacy.transformed.expect

@@ -24,6 +24,9 @@
 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::•()

diff --git a/pkg/front_end/testcases/duplicated_bad_prefix.dart.outline.expect b/pkg/front_end/testcases/duplicated_bad_prefix.dart.outline.expect
index 0b95d4c..059061c 100644
--- a/pkg/front_end/testcases/duplicated_bad_prefix.dart.outline.expect
+++ b/pkg/front_end/testcases/duplicated_bad_prefix.dart.outline.expect

@@ -20,6 +20,9 @@
 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
     ;

diff --git a/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.expect b/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.expect
index 7f6a69d..3d7b083 100644
--- a/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.expect
+++ b/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.expect

@@ -24,6 +24,9 @@
 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::•()

diff --git a/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.transformed.expect b/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.transformed.expect
index 7f6a69d..3d7b083 100644
--- a/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/duplicated_bad_prefix.dart.strong.transformed.expect

@@ -24,6 +24,9 @@
 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::•()

diff --git a/pkg/front_end/testcases/duplicated_declarations.dart.legacy.expect b/pkg/front_end/testcases/duplicated_declarations.dart.legacy.expect
index 3116ff4..51d8743 100644
--- a/pkg/front_end/testcases/duplicated_declarations.dart.legacy.expect
+++ b/pkg/front_end/testcases/duplicated_declarations.dart.legacy.expect

@@ -351,6 +351,14 @@
 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

diff --git a/pkg/front_end/testcases/duplicated_declarations.dart.legacy.transformed.expect b/pkg/front_end/testcases/duplicated_declarations.dart.legacy.transformed.expect
index 3116ff4..51d8743 100644
--- a/pkg/front_end/testcases/duplicated_declarations.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/duplicated_declarations.dart.legacy.transformed.expect

@@ -351,6 +351,14 @@
 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

diff --git a/pkg/front_end/testcases/duplicated_declarations.dart.outline.expect b/pkg/front_end/testcases/duplicated_declarations.dart.outline.expect
index e946c39..a4df9c1 100644
--- a/pkg/front_end/testcases/duplicated_declarations.dart.outline.expect
+++ b/pkg/front_end/testcases/duplicated_declarations.dart.outline.expect

@@ -306,6 +306,14 @@
 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

diff --git a/pkg/front_end/testcases/duplicated_declarations.dart.strong.expect b/pkg/front_end/testcases/duplicated_declarations.dart.strong.expect
index 2e541de..872bf89 100644
--- a/pkg/front_end/testcases/duplicated_declarations.dart.strong.expect
+++ b/pkg/front_end/testcases/duplicated_declarations.dart.strong.expect

@@ -351,6 +351,14 @@
 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

diff --git a/pkg/front_end/testcases/dynamic_and_void.dart.legacy.expect b/pkg/front_end/testcases/dynamic_and_void.dart.legacy.expect
index 9039990..3760ddb 100644
--- a/pkg/front_end/testcases/dynamic_and_void.dart.legacy.expect
+++ b/pkg/front_end/testcases/dynamic_and_void.dart.legacy.expect

@@ -8,6 +8,8 @@
 //
 import self as self;
 
+import "dart:core";
+
 static method testDynamic() → invalid-type
   return 0;
 static method testVoid() → void {}

diff --git a/pkg/front_end/testcases/dynamic_and_void.dart.legacy.transformed.expect b/pkg/front_end/testcases/dynamic_and_void.dart.legacy.transformed.expect
index 9039990..3760ddb 100644
--- a/pkg/front_end/testcases/dynamic_and_void.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/dynamic_and_void.dart.legacy.transformed.expect

@@ -8,6 +8,8 @@
 //
 import self as self;
 
+import "dart:core";
+
 static method testDynamic() → invalid-type
   return 0;
 static method testVoid() → void {}

diff --git a/pkg/front_end/testcases/dynamic_and_void.dart.outline.expect b/pkg/front_end/testcases/dynamic_and_void.dart.outline.expect
index c589a50..f080c68 100644
--- a/pkg/front_end/testcases/dynamic_and_void.dart.outline.expect
+++ b/pkg/front_end/testcases/dynamic_and_void.dart.outline.expect

@@ -8,6 +8,8 @@
 //
 import self as self;
 
+import "dart:core";
+
 static method testDynamic() → invalid-type
   ;
 static method testVoid() → void

diff --git a/pkg/front_end/testcases/export_main.dart.legacy.expect b/pkg/front_end/testcases/export_main.dart.legacy.expect
index 9227cd5..66e514e 100644
--- a/pkg/front_end/testcases/export_main.dart.legacy.expect
+++ b/pkg/front_end/testcases/export_main.dart.legacy.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./hello.dart" as hel;
 additionalExports = (hel::main)
+
+
+export "org-dartlang-testcase:///hello.dart";

diff --git a/pkg/front_end/testcases/export_main.dart.legacy.transformed.expect b/pkg/front_end/testcases/export_main.dart.legacy.transformed.expect
index 9227cd5..66e514e 100644
--- a/pkg/front_end/testcases/export_main.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/export_main.dart.legacy.transformed.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./hello.dart" as hel;
 additionalExports = (hel::main)
+
+
+export "org-dartlang-testcase:///hello.dart";

diff --git a/pkg/front_end/testcases/export_main.dart.outline.expect b/pkg/front_end/testcases/export_main.dart.outline.expect
index 9227cd5..66e514e 100644
--- a/pkg/front_end/testcases/export_main.dart.outline.expect
+++ b/pkg/front_end/testcases/export_main.dart.outline.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./hello.dart" as hel;
 additionalExports = (hel::main)
+
+
+export "org-dartlang-testcase:///hello.dart";

diff --git a/pkg/front_end/testcases/export_main.dart.strong.expect b/pkg/front_end/testcases/export_main.dart.strong.expect
index 9227cd5..66e514e 100644
--- a/pkg/front_end/testcases/export_main.dart.strong.expect
+++ b/pkg/front_end/testcases/export_main.dart.strong.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./hello.dart" as hel;
 additionalExports = (hel::main)
+
+
+export "org-dartlang-testcase:///hello.dart";

diff --git a/pkg/front_end/testcases/export_main.dart.strong.transformed.expect b/pkg/front_end/testcases/export_main.dart.strong.transformed.expect
index 9227cd5..66e514e 100644
--- a/pkg/front_end/testcases/export_main.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/export_main.dart.strong.transformed.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./hello.dart" as hel;
 additionalExports = (hel::main)
+
+
+export "org-dartlang-testcase:///hello.dart";

diff --git a/pkg/front_end/testcases/export_test.dart.legacy.expect b/pkg/front_end/testcases/export_test.dart.legacy.expect
index 40ce1cc..cf3dd78 100644
--- a/pkg/front_end/testcases/export_test.dart.legacy.expect
+++ b/pkg/front_end/testcases/export_test.dart.legacy.expect

@@ -4,6 +4,10 @@
 import "dart:developer" as dev;
 additionalExports = (core::print)
 
+
+import "dart:profiler";
+export "dart:core";
+
 static method main() → dynamic {
   core::print(dev::UserTag);
 }

diff --git a/pkg/front_end/testcases/export_test.dart.legacy.transformed.expect b/pkg/front_end/testcases/export_test.dart.legacy.transformed.expect
index 40ce1cc..cf3dd78 100644
--- a/pkg/front_end/testcases/export_test.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/export_test.dart.legacy.transformed.expect

@@ -4,6 +4,10 @@
 import "dart:developer" as dev;
 additionalExports = (core::print)
 
+
+import "dart:profiler";
+export "dart:core";
+
 static method main() → dynamic {
   core::print(dev::UserTag);
 }

diff --git a/pkg/front_end/testcases/export_test.dart.outline.expect b/pkg/front_end/testcases/export_test.dart.outline.expect
index bf0347a..e337eae 100644
--- a/pkg/front_end/testcases/export_test.dart.outline.expect
+++ b/pkg/front_end/testcases/export_test.dart.outline.expect

@@ -3,5 +3,9 @@
 import "dart:core" as core;
 additionalExports = (core::print)
 
+
+import "dart:profiler";
+export "dart:core";
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/export_test.dart.strong.expect b/pkg/front_end/testcases/export_test.dart.strong.expect
index 40ce1cc..cf3dd78 100644
--- a/pkg/front_end/testcases/export_test.dart.strong.expect
+++ b/pkg/front_end/testcases/export_test.dart.strong.expect

@@ -4,6 +4,10 @@
 import "dart:developer" as dev;
 additionalExports = (core::print)
 
+
+import "dart:profiler";
+export "dart:core";
+
 static method main() → dynamic {
   core::print(dev::UserTag);
 }

diff --git a/pkg/front_end/testcases/export_test.dart.strong.transformed.expect b/pkg/front_end/testcases/export_test.dart.strong.transformed.expect
index 40ce1cc..cf3dd78 100644
--- a/pkg/front_end/testcases/export_test.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/export_test.dart.strong.transformed.expect

@@ -4,6 +4,10 @@
 import "dart:developer" as dev;
 additionalExports = (core::print)
 
+
+import "dart:profiler";
+export "dart:core";
+
 static method main() → dynamic {
   core::print(dev::UserTag);
 }

diff --git a/pkg/front_end/testcases/external.dart.legacy.expect b/pkg/front_end/testcases/external.dart.legacy.expect
index 273c277..12cc7b1 100644
--- a/pkg/front_end/testcases/external.dart.legacy.expect
+++ b/pkg/front_end/testcases/external.dart.legacy.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/external.dart.legacy.transformed.expect b/pkg/front_end/testcases/external.dart.legacy.transformed.expect
index 273c277..12cc7b1 100644
--- a/pkg/front_end/testcases/external.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/external.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/external.dart.outline.expect b/pkg/front_end/testcases/external.dart.outline.expect
index 7c62be8..1c44d50 100644
--- a/pkg/front_end/testcases/external.dart.outline.expect
+++ b/pkg/front_end/testcases/external.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "dart:isolate";
+
 static field dynamic subscription;
 static method onData(dynamic x) → void
   ;

diff --git a/pkg/front_end/testcases/external.dart.strong.expect b/pkg/front_end/testcases/external.dart.strong.expect
index e4daff6..8025ecf 100644
--- a/pkg/front_end/testcases/external.dart.strong.expect
+++ b/pkg/front_end/testcases/external.dart.strong.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/external.dart.strong.transformed.expect b/pkg/front_end/testcases/external.dart.strong.transformed.expect
index e4daff6..8025ecf 100644
--- a/pkg/front_end/testcases/external.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/external.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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);

diff --git a/pkg/front_end/testcases/function_type_is_check.dart.legacy.expect b/pkg/front_end/testcases/function_type_is_check.dart.legacy.expect
index 47e3281..f34e7d0 100644
--- a/pkg/front_end/testcases/function_type_is_check.dart.legacy.expect
+++ b/pkg/front_end/testcases/function_type_is_check.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic f) → dynamic {
   if(f is (core::Object, core::StackTrace) → void)
     return 1;

diff --git a/pkg/front_end/testcases/function_type_is_check.dart.legacy.transformed.expect b/pkg/front_end/testcases/function_type_is_check.dart.legacy.transformed.expect
index 47e3281..f34e7d0 100644
--- a/pkg/front_end/testcases/function_type_is_check.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/function_type_is_check.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic f) → dynamic {
   if(f is (core::Object, core::StackTrace) → void)
     return 1;

diff --git a/pkg/front_end/testcases/function_type_is_check.dart.outline.expect b/pkg/front_end/testcases/function_type_is_check.dart.outline.expect
index b9650b8..8278f14 100644
--- a/pkg/front_end/testcases/function_type_is_check.dart.outline.expect
+++ b/pkg/front_end/testcases/function_type_is_check.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic f) → dynamic
   ;
 static method main() → dynamic

diff --git a/pkg/front_end/testcases/function_type_is_check.dart.strong.expect b/pkg/front_end/testcases/function_type_is_check.dart.strong.expect
index f827885..5fa7a1a 100644
--- a/pkg/front_end/testcases/function_type_is_check.dart.strong.expect
+++ b/pkg/front_end/testcases/function_type_is_check.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic f) → dynamic {
   if(f is (core::Object, core::StackTrace) → void)
     return 1;

diff --git a/pkg/front_end/testcases/function_type_is_check.dart.strong.transformed.expect b/pkg/front_end/testcases/function_type_is_check.dart.strong.transformed.expect
index f827885..5fa7a1a 100644
--- a/pkg/front_end/testcases/function_type_is_check.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/function_type_is_check.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic f) → dynamic {
   if(f is (core::Object, core::StackTrace) → void)
     return 1;

diff --git a/pkg/front_end/testcases/future_or_test.dart.legacy.expect b/pkg/front_end/testcases/future_or_test.dart.legacy.expect
index 6006dfc..4845918 100644
--- a/pkg/front_end/testcases/future_or_test.dart.legacy.expect
+++ b/pkg/front_end/testcases/future_or_test.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/future_or_test.dart.legacy.transformed.expect b/pkg/front_end/testcases/future_or_test.dart.legacy.transformed.expect
index e7939ce..05de994 100644
--- a/pkg/front_end/testcases/future_or_test.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/future_or_test.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/future_or_test.dart.outline.expect b/pkg/front_end/testcases/future_or_test.dart.outline.expect
index d5d8729..b603181 100644
--- a/pkg/front_end/testcases/future_or_test.dart.outline.expect
+++ b/pkg/front_end/testcases/future_or_test.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     ;

diff --git a/pkg/front_end/testcases/future_or_test.dart.strong.expect b/pkg/front_end/testcases/future_or_test.dart.strong.expect
index 0406605..f0d3199 100644
--- a/pkg/front_end/testcases/future_or_test.dart.strong.expect
+++ b/pkg/front_end/testcases/future_or_test.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/future_or_test.dart.strong.transformed.expect b/pkg/front_end/testcases/future_or_test.dart.strong.transformed.expect
index 91c8f82..4df4a38 100644
--- a/pkg/front_end/testcases/future_or_test.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/future_or_test.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_new.dart.legacy.expect b/pkg/front_end/testcases/implicit_new.dart.legacy.expect
index 3d8eba3..2b438cf 100644
--- a/pkg/front_end/testcases/implicit_new.dart.legacy.expect
+++ b/pkg/front_end/testcases/implicit_new.dart.legacy.expect

@@ -13,6 +13,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_new.dart.legacy.transformed.expect b/pkg/front_end/testcases/implicit_new.dart.legacy.transformed.expect
index 3d8eba3..2b438cf 100644
--- a/pkg/front_end/testcases/implicit_new.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/implicit_new.dart.legacy.transformed.expect

@@ -13,6 +13,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_new.dart.outline.expect b/pkg/front_end/testcases/implicit_new.dart.outline.expect
index 1553a2d..d976e78 100644
--- a/pkg/front_end/testcases/implicit_new.dart.outline.expect
+++ b/pkg/front_end/testcases/implicit_new.dart.outline.expect

@@ -2,6 +2,8 @@
 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
     ;

diff --git a/pkg/front_end/testcases/implicit_new.dart.strong.expect b/pkg/front_end/testcases/implicit_new.dart.strong.expect
index b6dbe37..c1c5e91 100644
--- a/pkg/front_end/testcases/implicit_new.dart.strong.expect
+++ b/pkg/front_end/testcases/implicit_new.dart.strong.expect

@@ -13,6 +13,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_new.dart.strong.transformed.expect b/pkg/front_end/testcases/implicit_new.dart.strong.transformed.expect
index b6dbe37..c1c5e91 100644
--- a/pkg/front_end/testcases/implicit_new.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/implicit_new.dart.strong.transformed.expect

@@ -13,6 +13,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_scope_test.dart.legacy.expect b/pkg/front_end/testcases/implicit_scope_test.dart.legacy.expect
index c4b1074..8f8e6ea 100644
--- a/pkg/front_end/testcases/implicit_scope_test.dart.legacy.expect
+++ b/pkg/front_end/testcases/implicit_scope_test.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_scope_test.dart.legacy.transformed.expect b/pkg/front_end/testcases/implicit_scope_test.dart.legacy.transformed.expect
index c4b1074..8f8e6ea 100644
--- a/pkg/front_end/testcases/implicit_scope_test.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/implicit_scope_test.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_scope_test.dart.outline.expect b/pkg/front_end/testcases/implicit_scope_test.dart.outline.expect
index f9c385c..9257345 100644
--- a/pkg/front_end/testcases/implicit_scope_test.dart.outline.expect
+++ b/pkg/front_end/testcases/implicit_scope_test.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "package:expect/expect.dart";
+
 class ImplicitScopeTest extends core::Object {
   synthetic constructor •() → self::ImplicitScopeTest
     ;

diff --git a/pkg/front_end/testcases/implicit_scope_test.dart.strong.expect b/pkg/front_end/testcases/implicit_scope_test.dart.strong.expect
index f74eec3..bc625bc 100644
--- a/pkg/front_end/testcases/implicit_scope_test.dart.strong.expect
+++ b/pkg/front_end/testcases/implicit_scope_test.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/implicit_scope_test.dart.strong.transformed.expect b/pkg/front_end/testcases/implicit_scope_test.dart.strong.transformed.expect
index f74eec3..bc625bc 100644
--- a/pkg/front_end/testcases/implicit_scope_test.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/implicit_scope_test.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/async_await.dart.legacy.expect b/pkg/front_end/testcases/inference/async_await.dart.legacy.expect
index 18f91dd..6d20979 100644
--- a/pkg/front_end/testcases/inference/async_await.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/async_await.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyFuture extends core::Object implements asy::Future<core::int> {
   synthetic constructor •() → self::MyFuture
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/async_await.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/async_await.dart.legacy.transformed.expect
index 939d401..22a8d1b 100644
--- a/pkg/front_end/testcases/inference/async_await.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/async_await.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyFuture extends core::Object implements asy::Future<core::int> {
   synthetic constructor •() → self::MyFuture
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/async_await.dart.outline.expect b/pkg/front_end/testcases/inference/async_await.dart.outline.expect
index 8642f8d..5d3783f 100644
--- a/pkg/front_end/testcases/inference/async_await.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/async_await.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyFuture extends core::Object implements asy::Future<core::int> {
   synthetic constructor •() → self::MyFuture
     ;

diff --git a/pkg/front_end/testcases/inference/async_await.dart.strong.expect b/pkg/front_end/testcases/inference/async_await.dart.strong.expect
index 89f497e..7efb511 100644
--- a/pkg/front_end/testcases/inference/async_await.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/async_await.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyFuture extends core::Object implements asy::Future<core::int> {
   synthetic constructor •() → self::MyFuture
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/async_await.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/async_await.dart.strong.transformed.expect
index a6dc499..2da1ed0 100644
--- a/pkg/front_end/testcases/inference/async_await.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/async_await.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyFuture extends core::Object implements asy::Future<core::int> {
   synthetic constructor •() → self::MyFuture
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.expect b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.expect
index 3b30c6a..90a4155 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::Future<core::int> futureInt = null;
 static field dynamic f = () → dynamic => self::futureInt;
 static field dynamic g = () → asy::Future<dynamic> async => self::futureInt;

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.transformed.expect
index 32f482b..87a2f0b 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::Future<core::int> futureInt = null;
 static field dynamic f = () → dynamic => self::futureInt;
 static field dynamic g = () → asy::Future<dynamic> /* originally async */ {

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.expect b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.expect
index 752d085..7f0e444 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::Future<core::int> futureInt = null;
 static field () → asy::Future<core::int> f = () → asy::Future<core::int> => self::futureInt;
 static field () → asy::Future<core::int> g = () → asy::Future<core::int> async => self::futureInt;

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.transformed.expect
index f94e9db..7f13592 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_flatten.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::Future<core::int> futureInt = null;
 static field () → asy::Future<core::int> f = () → asy::Future<core::int> => self::futureInt;
 static field () → asy::Future<core::int> g = () → asy::Future<core::int> /* originally async */ {

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.expect b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.expect
index 3697d56..ff10a71 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::FutureOr<core::int> futureOrInt = null;
 static field dynamic f = () → dynamic => self::futureOrInt;
 static field dynamic g = () → asy::Future<dynamic> async => self::futureOrInt;

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.transformed.expect
index 694b2f2..8b46926 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::FutureOr<core::int> futureOrInt = null;
 static field dynamic f = () → dynamic => self::futureOrInt;
 static field dynamic g = () → asy::Future<dynamic> /* originally async */ {

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.expect b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.expect
index fec1fb6..bceae13 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::FutureOr<core::int> futureOrInt = null;
 static field () → asy::FutureOr<core::int> f = () → asy::FutureOr<core::int> => self::futureOrInt;
 static field () → asy::Future<core::int> g = () → asy::Future<core::int> async => self::futureOrInt;

diff --git a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.transformed.expect
index b6536b0..25456f3 100644
--- a/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/async_closure_return_type_future_or.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static field asy::FutureOr<core::int> futureOrInt = null;
 static field () → asy::FutureOr<core::int> f = () → asy::FutureOr<core::int> => self::futureOrInt;
 static field () → asy::Future<core::int> g = () → asy::Future<core::int> /* originally async */ {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.expect
index 90e7864..227f268 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.expect

@@ -4,6 +4,9 @@
 import "dart:math" as math;
 import "dart:core" as core;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   dynamic f = () → asy::Future<dynamic> async {
     if(math::Random::•().nextBool()) {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.transformed.expect
index 298fc06..355fa11 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.legacy.transformed.expect

@@ -4,6 +4,9 @@
 import "dart:math" as math;
 import "dart:core" as core;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   dynamic f = () → asy::Future<dynamic> /* originally async */ {
     final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.expect
index 0eff7a3..87021eb 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   () → asy::Future<core::num> f = () → asy::Future<core::num> async {
     if(math::Random::•().{math::Random::nextBool}()) {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.transformed.expect
index 28def78..3f27c99 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_futures.dart.strong.transformed.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   () → asy::Future<core::num> f = () → asy::Future<core::num> /* originally async */ {
     final asy::_AsyncAwaitCompleter<core::num> :async_completer = new asy::_AsyncAwaitCompleter::•<core::num>();

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.expect
index 2c7a171..18357b5 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.expect

@@ -4,6 +4,9 @@
 import "dart:math" as math;
 import "dart:core" as core;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   dynamic f = () → asy::Future<dynamic> async {
     if(math::Random::•().nextBool()) {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.transformed.expect
index 860e645..658637a 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.legacy.transformed.expect

@@ -4,6 +4,9 @@
 import "dart:math" as math;
 import "dart:core" as core;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   dynamic f = () → asy::Future<dynamic> /* originally async */ {
     final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.expect
index 566fd3c..ec4bf15 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   () → asy::Future<core::num> f = () → asy::Future<core::num> async {
     if(math::Random::•().{math::Random::nextBool}()) {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.transformed.expect
index 3a4d495..c8353ca 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_all_returns_are_values.dart.strong.transformed.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   () → asy::Future<core::num> f = () → asy::Future<core::num> /* originally async */ {
     final asy::_AsyncAwaitCompleter<core::num> :async_completer = new asy::_AsyncAwaitCompleter::•<core::num>();

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.expect
index 5999ef5..8c5aa92 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.expect

@@ -4,6 +4,9 @@
 import "dart:math" as math;
 import "dart:core" as core;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   dynamic f = () → asy::Future<dynamic> async {
     if(math::Random::•().nextBool()) {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.transformed.expect
index 128abb0..29946ed 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.legacy.transformed.expect

@@ -4,6 +4,9 @@
 import "dart:math" as math;
 import "dart:core" as core;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   dynamic f = () → asy::Future<dynamic> /* originally async */ {
     final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.expect
index 68329ac..a97c985 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   () → asy::Future<core::num> f = () → asy::Future<core::num> async {
     if(math::Random::•().{math::Random::nextBool}()) {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.transformed.expect
index 85a11ea..d8b9241 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_mix_of_values_and_futures.dart.strong.transformed.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:async";
+import "dart:math";
+
 static method test() → dynamic {
   () → asy::Future<core::num> f = () → asy::Future<core::num> /* originally async */ {
     final asy::_AsyncAwaitCompleter<core::num> :async_completer = new asy::_AsyncAwaitCompleter::•<core::num>();

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.expect
index 05fe8e3..fa2ff35 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   dynamic f = () → asy::Stream<dynamic> async* {
     yield 1;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.transformed.expect
index bb41996..7b996c1 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   dynamic f = () → asy::Stream<dynamic> /* originally async* */ {
     asy::_AsyncStarStreamController<dynamic> :controller;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.expect
index 01265c43..87f7807 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   () → asy::Stream<core::num> f = () → asy::Stream<core::num> async* {
     yield 1;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.transformed.expect
index e1ccc6b..1d6f5b6 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_async_star.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   () → asy::Stream<core::num> f = () → asy::Stream<core::num> /* originally async* */ {
     asy::_AsyncStarStreamController<core::num> :controller;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.expect
index d11fb99..ff309bc 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic async {
   dynamic f = () → asy::Future<dynamic> async {
     return null;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.transformed.expect
index 3ebd45f..a10c9be 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.expect
index 5918e90..04005e7 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic async {
   () → asy::Future<core::Null> f = () → asy::Future<core::Null> async {
     return null;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.transformed.expect
index aab7652..a3f1182 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.expect
index c0fdd3c..371ba6c 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic async {
   dynamic f = () → asy::Stream<dynamic> async* {
     yield null;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.transformed.expect
index 35c6546..0930327 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.expect
index 99f3a43..8df15e6 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic async {
   () → asy::Stream<core::Null> f = () → asy::Stream<core::Null> async* {
     yield null;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.transformed.expect
index bb70985..f5fafd0 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_infer_bottom_async_star.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.expect
index 3f1899b..b489cb1 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method test2() → dynamic {
   core::List<core::num> o;
   dynamic y = o.map((dynamic x) → dynamic {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.transformed.expect
index 3f1899b..b489cb1 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method test2() → dynamic {
   core::List<core::num> o;
   dynamic y = o.map((dynamic x) → dynamic {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.expect
index 6c27cd0..3387e96 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method test2() → dynamic {
   core::List<core::num> o;
   core::Iterable<core::num> y = o.{core::Iterable::map}<core::num>((core::num x) → core::num {

diff --git a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.transformed.expect
index 6c27cd0..3387e96 100644
--- a/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/block_bodied_lambdas_lub.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method test2() → dynamic {
   core::List<core::num> o;
   core::Iterable<core::num> y = o.{core::Iterable::map}<core::num>((core::num x) → core::num {

diff --git a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.expect b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.expect
index c510acf..52cb80e 100644
--- a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method f() → dynamic {
   core::num x;
   dynamic y;

diff --git a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.transformed.expect
index c510acf..52cb80e 100644
--- a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method f() → dynamic {
   core::num x;
   dynamic y;

diff --git a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.outline.expect b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.outline.expect
index b08cbd0..4cd4875 100644
--- a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.outline.expect

@@ -1,6 +1,8 @@
 library test;
 import self as self;
 
+import "dart:math";
+
 static method f() → dynamic
   ;
 static method main() → dynamic

diff --git a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.expect b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.expect
index c556866..ff6c037 100644
--- a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.expect

@@ -16,6 +16,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method f() → dynamic {
   core::num x;
   dynamic y;

diff --git a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.transformed.expect
index c556866..ff6c037 100644
--- a/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/downward_inference_fixes_no_upwards_errors.dart.strong.transformed.expect

@@ -16,6 +16,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method f() → dynamic {
   core::num x;
   dynamic y;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.expect b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.expect
index db7cc1a..62b013b 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → asy::Future<dynamic> async {
   dynamic d;
   core::List<core::int> l0 = await<dynamic>[d];

diff --git a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.transformed.expect
index b10f37a..313a2ae 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → asy::Future<dynamic> /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.expect b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.expect
index cbb6f9f..63f6749 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → asy::Future<dynamic> async {
   dynamic d;
   core::List<core::int> l0 = await<core::int>[d as{TypeError} core::int];

diff --git a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.transformed.expect
index 64565b5..4a8a371 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_async_await.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → asy::Future<dynamic> /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.expect b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.expect
index 7a1ba88..9fb31e6 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.transformed.expect
index 4c365f3..ac63b98 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.expect b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.expect
index ad5f6d8..1c565f6 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.transformed.expect
index 852887c..498f778 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_for_each.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.expect b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.expect
index 4a22da5..af2285b 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.transformed.expect
index 4d12a56..25939a6 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.expect b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.expect
index 746937d..001564a 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.expect

@@ -34,6 +34,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.transformed.expect
index 17470e4..c318392 100644
--- a/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/downwards_inference_yield_yield_star.dart.strong.transformed.expect

@@ -34,6 +34,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class MyStream<T extends core::Object = dynamic> extends asy::Stream<self::MyStream::T> {
   static factory •<T extends core::Object = dynamic>() → self::MyStream<self::MyStream::•::T>
     return null;

diff --git a/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.expect b/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.expect
index 2654b7e..6af7018 100644
--- a/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method add(core::int x) → void {}
 static method add2(core::int y) → dynamic {}
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.transformed.expect
index 2654b7e..6af7018 100644
--- a/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_or_subtyping.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method add(core::int x) → void {}
 static method add2(core::int y) → dynamic {}
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.expect b/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.expect
index 4f6fa47..0f5a59a 100644
--- a/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method add(core::int x) → void {}
 static method add2(core::int y) → dynamic {}
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.transformed.expect
index 4f6fa47..0f5a59a 100644
--- a/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_or_subtyping.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method add(core::int x) → void {}
 static method add2(core::int y) → dynamic {}
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/future_then.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then.dart.legacy.expect
index 42e0878..1d88ee8 100644
--- a/pkg/front_end/testcases/inference/future_then.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then.dart.legacy.transformed.expect
index 2523367..4f27ec5 100644
--- a/pkg/front_end/testcases/inference/future_then.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then.dart.outline.expect b/pkg/front_end/testcases/inference/future_then.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then.dart.strong.expect b/pkg/front_end/testcases/inference/future_then.dart.strong.expect
index 267d4ac..96beacd 100644
--- a/pkg/front_end/testcases/inference/future_then.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then.dart.strong.transformed.expect
index cfca0bf..3fb8754 100644
--- a/pkg/front_end/testcases/inference/future_then.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_2.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_2.dart.legacy.expect
index ca0ee79..67aa4fb 100644
--- a/pkg/front_end/testcases/inference/future_then_2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_2.dart.legacy.transformed.expect
index 5305928..a9f33b6 100644
--- a/pkg/front_end/testcases/inference/future_then_2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_2.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_2.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_2.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_2.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_2.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_2.dart.strong.expect
index 119e050..15aa74b 100644
--- a/pkg/front_end/testcases/inference/future_then_2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_2.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_2.dart.strong.transformed.expect
index 16a1cda..091e194 100644
--- a/pkg/front_end/testcases/inference/future_then_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_2.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_3.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_3.dart.legacy.expect
index d621b5a..0f44112 100644
--- a/pkg/front_end/testcases/inference/future_then_3.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_3.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_3.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_3.dart.legacy.transformed.expect
index a8a5bcf..8bca318 100644
--- a/pkg/front_end/testcases/inference/future_then_3.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_3.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_3.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_3.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_3.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_3.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_3.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_3.dart.strong.expect
index feb8958..5895ddd 100644
--- a/pkg/front_end/testcases/inference/future_then_3.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_3.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_3.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_3.dart.strong.transformed.expect
index ebec13e..5fcbec7 100644
--- a/pkg/front_end/testcases/inference/future_then_3.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_3.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_4.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_4.dart.legacy.expect
index 8d980f1..f659f1f 100644
--- a/pkg/front_end/testcases/inference/future_then_4.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_4.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_4.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_4.dart.legacy.transformed.expect
index ec60686..56334ca 100644
--- a/pkg/front_end/testcases/inference/future_then_4.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_4.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_4.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_4.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_4.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_4.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_4.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_4.dart.strong.expect
index c46d088..0f07ba1 100644
--- a/pkg/front_end/testcases/inference/future_then_4.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_4.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_4.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_4.dart.strong.transformed.expect
index b9f26c5..caa8542 100644
--- a/pkg/front_end/testcases/inference/future_then_4.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_4.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_5.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_5.dart.legacy.expect
index f3a0609..e9987cb 100644
--- a/pkg/front_end/testcases/inference/future_then_5.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_5.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_5.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_5.dart.legacy.transformed.expect
index 3652669..25dacbf 100644
--- a/pkg/front_end/testcases/inference/future_then_5.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_5.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_5.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_5.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_5.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_5.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_5.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_5.dart.strong.expect
index df5f492..a09ade0 100644
--- a/pkg/front_end/testcases/inference/future_then_5.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_5.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_5.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_5.dart.strong.transformed.expect
index aa2b0b1..5c16f21 100644
--- a/pkg/front_end/testcases/inference/future_then_5.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_5.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_6.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_6.dart.legacy.expect
index 0b55043..44e0272 100644
--- a/pkg/front_end/testcases/inference/future_then_6.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_6.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_6.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_6.dart.legacy.transformed.expect
index df4e351..bde8fe5 100644
--- a/pkg/front_end/testcases/inference/future_then_6.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_6.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_6.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_6.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_6.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_6.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_6.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_6.dart.strong.expect
index d1adeb0..fc6869c 100644
--- a/pkg/front_end/testcases/inference/future_then_6.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_6.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_6.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_6.dart.strong.transformed.expect
index 3895fa1..5025976 100644
--- a/pkg/front_end/testcases/inference/future_then_6.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_6.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.expect
index d6c5b10..4ddf6a7 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.transformed.expect
index d665857..0fc63fc 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_conditional.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.expect
index 56e16e5..149f271 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.transformed.expect
index acbce4c..aafd0f203 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.expect
index 6e9bb31..df550a5 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.transformed.expect
index cae1f2d..6885ac4 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.expect
index a058e1d..7c89757 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.transformed.expect
index 3f3e26c..fb7974e 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_2.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.expect
index 8d97d69..9932aa3 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.transformed.expect
index 2288861..c7618fd 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.expect
index 0b6b963..fd97d69 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.transformed.expect
index 6e76891..3a4604a 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_3.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.expect
index 492312e..7658f20 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.transformed.expect
index 97a50ab..9abcfd0 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.expect
index 6dc7c84..3d33f4a 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.transformed.expect
index c07cdcb..ed935aa 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_4.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.expect
index 2ae1c89..09a4b7b 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.transformed.expect
index c58e4b1..2f416f7 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.expect
index 177f02c..b29bf54 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.transformed.expect
index a74751a..396dabd 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_5.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.expect
index d91dff0..24ff832 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.transformed.expect
index 69471c1..65684a7 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.expect
index d9b1879..2a444d6 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.transformed.expect
index 16db4a6..cf2964e 100644
--- a/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_conditional_6.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.expect
index 5c1094c..fa81e87 100644
--- a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> f;
   asy::Future<core::List<core::int>> b = f.then((dynamic x) → dynamic => <dynamic>[]).whenComplete(() → dynamic {});

diff --git a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.transformed.expect
index 5c1094c..fa81e87 100644
--- a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> f;
   asy::Future<core::List<core::int>> b = f.then((dynamic x) → dynamic => <dynamic>[]).whenComplete(() → dynamic {});

diff --git a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.outline.expect
index 8e85697..666bc54 100644
--- a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.outline.expect

@@ -1,6 +1,8 @@
 library test;
 import self as self;
 
+import "dart:async";
+
 static method test() → dynamic
   ;
 static method main() → dynamic

diff --git a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.expect
index ce86786..7a94f25 100644
--- a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> f;
   asy::Future<core::List<core::int>> b = f.{asy::Future::then}<core::List<dynamic>>((core::int x) → core::List<dynamic> => <dynamic>[]).{asy::Future::whenComplete}(() → core::Null {}) as{TypeError} asy::Future<core::List<core::int>>;

diff --git a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.transformed.expect
index ce86786..7a94f25 100644
--- a/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_downwards_method_target.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> f;
   asy::Future<core::List<core::int>> b = f.{asy::Future::then}<core::List<dynamic>>((core::int x) → core::List<dynamic> => <dynamic>[]).{asy::Future::whenComplete}(() → core::Null {}) as{TypeError} asy::Future<core::List<core::int>>;

diff --git a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.expect
index 3b31e56..70f2705 100644
--- a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method m1() → dynamic {
   asy::Future<core::int> f;
   dynamic x = f.then<asy::Future<core::List<core::int>>>((dynamic x) → dynamic => <dynamic>[]);

diff --git a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.transformed.expect
index 3b31e56..70f2705 100644
--- a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method m1() → dynamic {
   asy::Future<core::int> f;
   dynamic x = f.then<asy::Future<core::List<core::int>>>((dynamic x) → dynamic => <dynamic>[]);

diff --git a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect
index 50d546c..2d680ba 100644
--- a/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_explicit_future.dart.outline.expect

@@ -1,6 +1,8 @@
 library test;
 import self as self;
 
+import "dart:async";
+
 static method m1() → dynamic
   ;
 static method m2() → dynamic

diff --git a/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.expect
index a252de0..57222ab 100644
--- a/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.transformed.expect
index 816cc71..557fab9 100644
--- a/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_ifNull.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_ifNull.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_ifNull.dart.outline.expect
index c21b27b..5e26f10 100644
--- a/pkg/front_end/testcases/inference/future_then_ifNull.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_ifNull.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.expect
index 0496959..fa51936 100644
--- a/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.transformed.expect
index aa278ac..8bc362f 100644
--- a/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_ifNull.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.expect
index 00a6e6a..3b3f456 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.transformed.expect
index 00a6e6a..3b3f456 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_upwards.dart.outline.expect
index 803eefd..e9cb911 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.expect
index 34484af..0e8e4f6 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.expect

@@ -13,6 +13,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.transformed.expect
index 34484af..0e8e4f6 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards.dart.strong.transformed.expect

@@ -13,6 +13,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.expect
index 794ef2c..f0dc55f 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.transformed.expect
index 794ef2c..f0dc55f 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.outline.expect
index 803eefd..e9cb911 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.expect
index 23e64ac..8b99590 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.transformed.expect
index 23e64ac..8b99590 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_2.dart.strong.transformed.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.expect
index 4ba6477..e868c2d 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.transformed.expect
index 4ba6477..e868c2d 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.outline.expect
index 4c720d7..cdfda19 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.expect
index 4a1facb..54ab95a 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.transformed.expect
index 4a1facb..54ab95a 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_3.dart.strong.transformed.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.expect b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.expect
index 799443c..d593943 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> base;
   dynamic f = base.then((dynamic x) → dynamic {

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.transformed.expect
index 799443c..d593943 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> base;
   dynamic f = base.then((dynamic x) → dynamic {

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.outline.expect b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.outline.expect
index 8e85697..666bc54 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.outline.expect

@@ -1,6 +1,8 @@
 library test;
 import self as self;
 
+import "dart:async";
+
 static method test() → dynamic
   ;
 static method main() → dynamic

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.expect b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.expect
index 4c45b42..4ce6f50 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> base;
   asy::Future<core::bool> f = base.{asy::Future::then}<core::bool>((core::int x) → core::bool {

diff --git a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.transformed.expect
index 4c45b42..4ce6f50 100644
--- a/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_then_upwards_from_block.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method test() → dynamic {
   asy::Future<core::int> base;
   asy::Future<core::bool> f = base.{asy::Future::then}<core::bool>((core::int x) → core::bool {

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.expect
index b05e030..42ac544 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.transformed.expect
index 23aa903..7cb03fb 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.outline.expect
index ec0d528..0e45bdd 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.expect
index 52d35d7..a5ac737 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.transformed.expect
index a0d28bb1..a660035 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.expect
index 9d62fa5..0985390 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.transformed.expect
index f292acd..6eb70db 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.outline.expect
index ec0d528..0e45bdd 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.expect
index d47b27d..5d5be70 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.transformed.expect
index 84da7bd..596a21b 100644
--- a/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_async_conditional_2.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.expect
index 02761c2..5ca32db 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.transformed.expect
index 62fcaa6..9c918a1 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_downwards.dart.outline.expect
index 81c3bd1..10cd1f0 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.expect
index b61a291..f4aa39ea 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.transformed.expect
index e568f59..b7defba 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards.dart.strong.transformed.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.expect
index 5eb63ec..8471190 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.transformed.expect
index a332fc2..a165015 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.outline.expect
index 81c3bd1..10cd1f0 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.expect
index ccc03d0..d17cf61 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.transformed.expect
index 1e11465..41be920 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_2.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.expect
index 9fba481..a2acf08 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.transformed.expect
index 704909d..f4d6505 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.outline.expect
index cea415b..58b3b85 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.expect
index bea79cc..2d9895a 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.transformed.expect
index 96aa1c7..7c40213 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_3.dart.strong.transformed.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.expect
index b8bf3a1..4efea1b 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.transformed.expect
index 598ecd1..b6eba1b 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.outline.expect
index cea415b..58b3b85 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.expect
index 63ab7cf..0de77a6 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.transformed.expect
index 4232dc3..028521e 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_4.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class MyFuture<T extends core::Object = dynamic> extends core::Object implements asy::Future<self::MyFuture::T> {
   constructor •() → self::MyFuture<self::MyFuture::T>
     : super core::Object::•() {}

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.expect
index cf2b682..ef7f24c 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.transformed.expect
index c0244b3..7f5bbe8 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.outline.expect
index eef0789..fa4dfd8 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.expect
index 2d452ee..69a6b1a 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.transformed.expect
index 45afa71..74f247a 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_future_return.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.expect
index cee5b68..2ddfc1a 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method id<T extends core::Object = dynamic>(self::id::T x) → self::id::T
   return x;
 static method test() → dynamic async {

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.transformed.expect
index fc9ead3..69fc341 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method id<T extends core::Object = dynamic>(self::id::T x) → self::id::T
   return x;
 static method test() → dynamic /* originally async */ {

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.outline.expect
index 92d9692..59f0925 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method id<T extends core::Object = dynamic>(self::id::T x) → self::id::T
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.expect
index 39e445a..82aa55a 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method id<T extends core::Object = dynamic>(self::id::T x) → self::id::T
   return x;
 static method test() → dynamic async {

diff --git a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.transformed.expect
index 8e23bd8..8b0ab47 100644
--- a/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_downwards_generic_method_with_generic_return.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method id<T extends core::Object = dynamic>(self::id::T x) → self::id::T
   return x;
 static method test() → dynamic /* originally async */ {

diff --git a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.expect b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.expect
index 3259450..0324c10 100644
--- a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.transformed.expect
index f6baa93..4769915 100644
--- a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.outline.expect b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.outline.expect
index 4d89361..cf47daa 100644
--- a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     ;

diff --git a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.expect b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.expect
index 56ab63d..e6d8003 100644
--- a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.transformed.expect
index e55e2bc..53cd071 100644
--- a/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/future_union_upwards_generic_methods.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference/generator_closure.dart.legacy.expect b/pkg/front_end/testcases/inference/generator_closure.dart.legacy.expect
index e9984fd..bd8ed88 100644
--- a/pkg/front_end/testcases/inference/generator_closure.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/generator_closure.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method foo(() → asy::Stream<core::int> values) → void {}
 static method main() → void {
   self::foo(() → asy::Stream<dynamic> async* {

diff --git a/pkg/front_end/testcases/inference/generator_closure.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/generator_closure.dart.legacy.transformed.expect
index a8834af..a5312fc 100644
--- a/pkg/front_end/testcases/inference/generator_closure.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/generator_closure.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method foo(() → asy::Stream<core::int> values) → void {}
 static method main() → void {
   self::foo(() → asy::Stream<dynamic> /* originally async* */ {

diff --git a/pkg/front_end/testcases/inference/generator_closure.dart.outline.expect b/pkg/front_end/testcases/inference/generator_closure.dart.outline.expect
index caa562f..d8e3037 100644
--- a/pkg/front_end/testcases/inference/generator_closure.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/generator_closure.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method foo(() → asy::Stream<core::int> values) → void
   ;
 static method main() → void

diff --git a/pkg/front_end/testcases/inference/generator_closure.dart.strong.expect b/pkg/front_end/testcases/inference/generator_closure.dart.strong.expect
index 57bbcb0..57d4fe9 100644
--- a/pkg/front_end/testcases/inference/generator_closure.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generator_closure.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method foo(() → asy::Stream<core::int> values) → void {}
 static method main() → void {
   self::foo(() → asy::Stream<core::int> async* {

diff --git a/pkg/front_end/testcases/inference/generator_closure.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generator_closure.dart.strong.transformed.expect
index 5c81566..003313d 100644
--- a/pkg/front_end/testcases/inference/generator_closure.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generator_closure.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method foo(() → asy::Stream<core::int> values) → void {}
 static method main() → void {
   self::foo(() → asy::Stream<core::int> /* originally async* */ {

diff --git a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.expect b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.expect
index 7e5ac84..cdd6a99 100644
--- a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method printInt(core::int x) → void
   return core::print(x);
 static method printDouble(core::double x) → void

diff --git a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.transformed.expect
index 7e5ac84..cdd6a99 100644
--- a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method printInt(core::int x) → void
   return core::print(x);
 static method printDouble(core::double x) → void

diff --git a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.expect
index 8e3a378..13f3e92 100644
--- a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.expect

@@ -26,6 +26,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method printInt(core::int x) → void
   return core::print(x);
 static method printDouble(core::double x) → void

diff --git a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.transformed.expect
index 8e3a378..13f3e92 100644
--- a/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_dart_math_min_max.dart.strong.transformed.expect

@@ -26,6 +26,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math";
+
 static method printInt(core::int x) → void
   return core::print(x);
 static method printDouble(core::double x) → void

diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.expect
index b797686..4b8fab7 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.expect

@@ -3,6 +3,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math" as math;
+import "dart:math";
+
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.transformed.expect
index b797686..4b8fab7 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.legacy.transformed.expect

@@ -3,6 +3,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math" as math;
+import "dart:math";
+
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect
index d543eaa..599ce81 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.expect

@@ -36,6 +36,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math" as math;
+import "dart:math";
+
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect
index d543eaa..599ce81 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_generic_instantiation.dart.strong.transformed.expect

@@ -36,6 +36,9 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math" as math;
+import "dart:math";
+
 class C extends core::Object {
   synthetic constructor •() → self::C
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.expect b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.expect
index 195312f..24d0db0 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.expect

@@ -17,6 +17,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:_foreign_helper";
+
 static method main() → dynamic {
   core::String x = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#JS, 32, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>["int", "42"]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   dynamic y = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#JS, 32, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>["String", "\"hello\""]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));

diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.transformed.expect
index 195312f..24d0db0 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.legacy.transformed.expect

@@ -17,6 +17,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:_foreign_helper";
+
 static method main() → dynamic {
   core::String x = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#JS, 32, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>["int", "42"]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));
   dynamic y = throw new core::NoSuchMethodError::withInvocation(null, new core::_InvocationMirror::_withType(#JS, 32, const <core::Type>[], core::List::unmodifiable<dynamic>(<dynamic>["String", "\"hello\""]), core::Map::unmodifiable<core::Symbol, dynamic>(const <core::Symbol, dynamic>{})));

diff --git a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect
index a73f4ec..bc9e0ea 100644
--- a/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_infer_js_builtin.dart.outline.expect

@@ -8,5 +8,7 @@
 //
 import self as self;
 
+import "dart:_foreign_helper";
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.expect b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.expect
index cda283f..b8c72dc 100644
--- a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method make(core::int x) → asy::Future<core::int>
   return asy::Future::•<dynamic>(() → dynamic => x);
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.transformed.expect
index cda283f..b8c72dc 100644
--- a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method make(core::int x) → asy::Future<core::int>
   return asy::Future::•<dynamic>(() → dynamic => x);
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect
index 92c24d1..fd1bbdf 100644
--- a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.expect

@@ -18,6 +18,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method make(core::int x) → asy::Future<core::int>
   return asy::Future::•<core::int>(() → core::int => x);
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect
index 9063b64..9a7ba76 100644
--- a/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_iterable_and_future.dart.strong.transformed.expect

@@ -18,6 +18,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 static method make(core::int x) → asy::Future<core::int>
   return asy::Future::•<core::int>(() → core::int => x);
 static method test() → dynamic {

diff --git a/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.expect b/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.expect
index da47f03..260f1f1 100644
--- a/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math" as math;
+
 class Trace extends core::Object {
   field core::List<self::Frame> frames = <self::Frame>[];
   synthetic constructor •() → self::Trace

diff --git a/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.transformed.expect
index da47f03..260f1f1 100644
--- a/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/generic_methods_nested_generic_instantiation.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:math" as math;
 
+import "dart:math" as math;
+
 class Trace extends core::Object {
   field core::List<self::Frame> frames = <self::Frame>[];
   synthetic constructor •() → self::Trace

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.expect
index bd2face..7ae14db 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_consts_transitively_2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2_a.dart";
+
 static const field dynamic m1 = inf::a1;
 static const field dynamic m2 = inf::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.transformed.expect
index bd2face..7ae14db 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_consts_transitively_2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2_a.dart";
+
 static const field dynamic m1 = inf::a1;
 static const field dynamic m2 = inf::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.expect
index 964f93d..81ec2ad 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_consts_transitively_2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2_a.dart";
+
 static const field core::int m1 = inf::a1;
 static const field core::int m2 = inf::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.transformed.expect
index 964f93d..81ec2ad 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_consts_transitively_2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2_a.dart";
+
 static const field core::int m1 = inf::a1;
 static const field core::int m2 = inf::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.expect
index 49f30fa..192625b 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.expect

@@ -3,6 +3,9 @@
 import "./infer_consts_transitively_2.dart" as test;
 import "./infer_consts_transitively_2_b.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2.dart";
+import "org-dartlang-testcase:///infer_consts_transitively_2_b.dart";
+
 static const field dynamic a1 = test::m2;
 static const field dynamic a2 = inf::b1;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.transformed.expect
index 49f30fa..192625b 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.legacy.transformed.expect

@@ -3,6 +3,9 @@
 import "./infer_consts_transitively_2.dart" as test;
 import "./infer_consts_transitively_2_b.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2.dart";
+import "org-dartlang-testcase:///infer_consts_transitively_2_b.dart";
+
 static const field dynamic a1 = test::m2;
 static const field dynamic a2 = inf::b1;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.expect
index 169b4c2..7c76cbaf 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.expect

@@ -4,6 +4,9 @@
 import "./infer_consts_transitively_2.dart" as test;
 import "./infer_consts_transitively_2_b.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2.dart";
+import "org-dartlang-testcase:///infer_consts_transitively_2_b.dart";
+
 static const field core::int a1 = test::m2;
 static const field core::int a2 = inf::b1;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.transformed.expect
index 169b4c2..7c76cbaf 100644
--- a/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_consts_transitively_2_a.dart.strong.transformed.expect

@@ -4,6 +4,9 @@
 import "./infer_consts_transitively_2.dart" as test;
 import "./infer_consts_transitively_2_b.dart" as inf;
 
+import "org-dartlang-testcase:///infer_consts_transitively_2.dart";
+import "org-dartlang-testcase:///infer_consts_transitively_2_b.dart";
+
 static const field core::int a1 = test::m2;
 static const field core::int a2 = inf::b1;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.expect
index bb04180..b063d503 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart";
+
 static field dynamic y = inf::x;
 static method test1() → dynamic {
   core::int t = 3;

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.transformed.expect
index bb04180..b063d503 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart";
+
 static field dynamic y = inf::x;
 static method test1() → dynamic {
   core::int t = 3;

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.expect
index a5f2279..2e74c1b 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart";
+
 static field core::int y = inf::x;
 static method test1() → dynamic {
   core::int t = 3;

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.transformed.expect
index a5f2279..2e74c1b 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart";
+
 static field core::int y = inf::x;
 static method test1() → dynamic {
   core::int t = 3;

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.expect
index b941bf6..5178c7b 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart";
+
 class B extends core::Object {
   static field dynamic y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.transformed.expect
index b941bf6..5178c7b 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart";
+
 class B extends core::Object {
   static field dynamic y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.expect
index 04a0cbb..a68ba24 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart";
+
 class B extends core::Object {
   static field core::int y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.transformed.expect
index 04a0cbb..a68ba24 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart";
+
 class B extends core::Object {
   static field core::int y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.expect
index b2d87e2..b12f52b 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 class A extends core::Object {
   static field dynamic x = 2;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.transformed.expect
index b2d87e2..b12f52b 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 class A extends core::Object {
   static field dynamic x = 2;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.expect
index 8aca87e..eb9b995 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 class A extends core::Object {
   static field core::int x = 2;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.transformed.expect
index 8aca87e..eb9b995 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on2_a.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 class A extends core::Object {
   static field core::int x = 2;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.expect
index c198bc7..e09d375 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.expect

@@ -1,5 +1,7 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 static field dynamic x = 2;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.transformed.expect
index c198bc7..e09d375 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.legacy.transformed.expect

@@ -1,5 +1,7 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 static field dynamic x = 2;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.expect
index bcc0a02..ec65f87 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.expect

@@ -2,5 +2,7 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 static field core::int x = 2;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.transformed.expect
index bcc0a02..ec65f87 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_cycle_libs_when_flag_is_on_a.dart.strong.transformed.expect

@@ -2,5 +2,7 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_cycle_libs_when_flag_is_on2.dart";
+
 static field core::int x = 2;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.expect
index 7471980..a1006f3 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./infer_from_variables_in_non_cycle_imports_with_flag_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag_a.dart";
+
 static field dynamic y = inf::x;
 static method test1() → dynamic {
   inf::x = "hi";

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.transformed.expect
index 7471980..a1006f3 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./infer_from_variables_in_non_cycle_imports_with_flag_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag_a.dart";
+
 static field dynamic y = inf::x;
 static method test1() → dynamic {
   inf::x = "hi";

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.expect
index 634ead8..ec4b64f 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.expect

@@ -16,6 +16,8 @@
 import "./infer_from_variables_in_non_cycle_imports_with_flag_a.dart" as inf;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag_a.dart";
+
 static field core::int y = inf::x;
 static method test1() → dynamic {
   inf::x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart:13:36: Error: A value of type 'String' can't be assigned to a variable of type 'int'.

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.transformed.expect
index 634ead8..ec4b64f 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart.strong.transformed.expect

@@ -16,6 +16,8 @@
 import "./infer_from_variables_in_non_cycle_imports_with_flag_a.dart" as inf;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag_a.dart";
+
 static field core::int y = inf::x;
 static method test1() → dynamic {
   inf::x = let final<BottomType> #t1 = invalid-expression "pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag.dart:13:36: Error: A value of type 'String' can't be assigned to a variable of type 'int'.

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.expect
index 73d5704..1c6ad28 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_non_cycle_imports_with_flag2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag2_a.dart";
+
 class B extends core::Object {
   static field dynamic y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.transformed.expect
index 73d5704..1c6ad28 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_non_cycle_imports_with_flag2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag2_a.dart";
+
 class B extends core::Object {
   static field dynamic y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.expect
index 4c6ed45..7cdf37e 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.expect

@@ -16,6 +16,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_non_cycle_imports_with_flag2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag2_a.dart";
+
 class B extends core::Object {
   static field core::int y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.transformed.expect
index 4c6ed45..7cdf37e 100644
--- a/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_from_variables_in_non_cycle_imports_with_flag2.dart.strong.transformed.expect

@@ -16,6 +16,8 @@
 import "dart:core" as core;
 import "./infer_from_variables_in_non_cycle_imports_with_flag2_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_from_variables_in_non_cycle_imports_with_flag2_a.dart";
+
 class B extends core::Object {
   static field core::int y = inf::A::x;
   synthetic constructor •() → self::B

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.expect
index 7e6a5f6..42481ec 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_transitively_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively_a.dart";
+
 static final field dynamic m1 = inf::a1;
 static final field dynamic m2 = inf::A::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.transformed.expect
index 7e6a5f6..42481ec 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_transitively_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively_a.dart";
+
 static final field dynamic m1 = inf::a1;
 static final field dynamic m2 = inf::A::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.expect b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.expect
index bab2515..cb397c8 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_transitively_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively_a.dart";
+
 static final field core::int m1 = inf::a1;
 static final field core::int m2 = inf::A::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.transformed.expect
index bab2515..cb397c8 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_transitively_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively_a.dart";
+
 static final field core::int m1 = inf::a1;
 static final field core::int m2 = inf::A::a2;
 static method foo() → dynamic {

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.expect
index a75b04b..21a9b1a 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.expect

@@ -3,6 +3,9 @@
 import "dart:core" as core;
 import "./infer_statics_transitively3_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart";
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart" as p;
+
 static const field dynamic t1 = 1;
 static const field dynamic t2 = self::t1;
 static const field dynamic t3 = inf::a1;

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.transformed.expect
index a75b04b..21a9b1a 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.legacy.transformed.expect

@@ -3,6 +3,9 @@
 import "dart:core" as core;
 import "./infer_statics_transitively3_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart";
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart" as p;
+
 static const field dynamic t1 = 1;
 static const field dynamic t2 = self::t1;
 static const field dynamic t3 = inf::a1;

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.expect b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.expect
index 497e52d..f12e664 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.expect

@@ -3,6 +3,9 @@
 import "dart:core" as core;
 import "./infer_statics_transitively3_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart";
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart" as p;
+
 static const field core::int t1 = 1;
 static const field core::int t2 = self::t1;
 static const field core::int t3 = inf::a1;

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.transformed.expect
index 497e52d..f12e664 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively3.dart.strong.transformed.expect

@@ -3,6 +3,9 @@
 import "dart:core" as core;
 import "./infer_statics_transitively3_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart";
+import "org-dartlang-testcase:///infer_statics_transitively3_a.dart" as p;
+
 static const field core::int t1 = 1;
 static const field core::int t2 = self::t1;
 static const field core::int t3 = inf::a1;

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.expect
index 3f90aff..8f095a4 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field dynamic a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.transformed.expect
index 3f90aff..8f095a4 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.legacy.transformed.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field dynamic a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.expect
index 2cff8e9..4e0b1d8 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field core::int a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.transformed.expect
index 2cff8e9..4e0b1d8 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_2_a.dart.strong.transformed.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field core::int a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.expect
index f814b99..f585fa4 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field dynamic a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.transformed.expect
index f814b99..f585fa4 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.legacy.transformed.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field dynamic a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.expect
index e0d7ab9..64a5a1d 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field core::int a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.transformed.expect
index e0d7ab9..64a5a1d 100644
--- a/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_transitively_a.dart.strong.transformed.expect

@@ -4,6 +4,9 @@
 import "./infer_statics_transitively_b.dart" as inf;
 import "./infer_statics_transitively.dart" as test;
 
+import "org-dartlang-testcase:///infer_statics_transitively.dart";
+import "org-dartlang-testcase:///infer_statics_transitively_b.dart";
+
 class A extends core::Object {
   static final field core::int a2 = inf::b1;
   synthetic constructor •() → self::A

diff --git a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.expect
index 52c6c06..93fc258 100644
--- a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_with_method_invocations_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_with_method_invocations_a.dart";
+
 class T extends core::Object {
   static final field self::T foo = self::T::m1(self::T::m2(inf::m3("", "")));
   synthetic constructor •() → self::T

diff --git a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.transformed.expect
index 52c6c06..93fc258 100644
--- a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_with_method_invocations_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_with_method_invocations_a.dart";
+
 class T extends core::Object {
   static final field self::T foo = self::T::m1(self::T::m2(inf::m3("", "")));
   synthetic constructor •() → self::T

diff --git a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.expect b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.expect
index 52c6c06..93fc258 100644
--- a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_with_method_invocations_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_with_method_invocations_a.dart";
+
 class T extends core::Object {
   static final field self::T foo = self::T::m1(self::T::m2(inf::m3("", "")));
   synthetic constructor •() → self::T

diff --git a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.transformed.expect
index 52c6c06..93fc258 100644
--- a/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_statics_with_method_invocations.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_statics_with_method_invocations_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_statics_with_method_invocations_a.dart";
+
 class T extends core::Object {
   static final field self::T foo = self::T::m1(self::T::m2(inf::m3("", "")));
   synthetic constructor •() → self::T

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.expect
index 915ca9c..4553445 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "./infer_type_regardless_of_declaration_order_or_cycles_b.dart" as inf;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles_b.dart";
+
 class C extends inf::B {
   synthetic constructor •() → self::C
     : super inf::B::•()

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.transformed.expect
index 915ca9c..4553445 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "./infer_type_regardless_of_declaration_order_or_cycles_b.dart" as inf;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles_b.dart";
+
 class C extends inf::B {
   synthetic constructor •() → self::C
     : super inf::B::•()

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.expect
index b76781e..9b9a2c3 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.expect

@@ -11,6 +11,8 @@
 import "./infer_type_regardless_of_declaration_order_or_cycles_b.dart" as inf;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles_b.dart";
+
 class C extends inf::B {
   synthetic constructor •() → self::C
     : super inf::B::•()

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.transformed.expect
index b76781e..9b9a2c3 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles.dart.strong.transformed.expect

@@ -11,6 +11,8 @@
 import "./infer_type_regardless_of_declaration_order_or_cycles_b.dart" as inf;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles_b.dart";
+
 class C extends inf::B {
   synthetic constructor •() → self::C
     : super inf::B::•()

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.expect
index 8459af2..be9fa4e 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./infer_type_regardless_of_declaration_order_or_cycles.dart" as test;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles.dart";
+
 class B extends test::A {
   synthetic constructor •() → self::B
     : super test::A::•()

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.transformed.expect
index 8459af2..be9fa4e 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./infer_type_regardless_of_declaration_order_or_cycles.dart" as test;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles.dart";
+
 class B extends test::A {
   synthetic constructor •() → self::B
     : super test::A::•()

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.expect
index 8459af2..be9fa4e 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./infer_type_regardless_of_declaration_order_or_cycles.dart" as test;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles.dart";
+
 class B extends test::A {
   synthetic constructor •() → self::B
     : super test::A::•()

diff --git a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.transformed.expect
index 8459af2..be9fa4e 100644
--- a/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_type_regardless_of_declaration_order_or_cycles_b.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./infer_type_regardless_of_declaration_order_or_cycles.dart" as test;
 
+import "org-dartlang-testcase:///infer_type_regardless_of_declaration_order_or_cycles.dart";
+
 class B extends test::A {
   synthetic constructor •() → self::B
     : super test::A::•()

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.expect
index daa2859..7285119 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle_a.dart";
+
 abstract class A<E extends core::Object = dynamic> extends core::Object implements inf::I<self::A::E> {
   final field self::A::E value = null;
   const constructor •() → self::A<self::A::E>

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.transformed.expect
index daa2859..7285119 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle_a.dart";
+
 abstract class A<E extends core::Object = dynamic> extends core::Object implements inf::I<self::A::E> {
   final field self::A::E value = null;
   const constructor •() → self::A<self::A::E>

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect
index 181a27e..55c5f18 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.expect

@@ -11,6 +11,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle_a.dart";
+
 abstract class A<E extends core::Object = dynamic> extends core::Object implements inf::I<self::A::E> {
   final field self::A::E value = null;
   const constructor •() → self::A<self::A::E>

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect
index 181a27e..55c5f18 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle.dart.strong.transformed.expect

@@ -11,6 +11,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle_a.dart" as inf;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle_a.dart";
+
 abstract class A<E extends core::Object = dynamic> extends core::Object implements inf::I<self::A::E> {
   final field self::A::E value = null;
   const constructor •() → self::A<self::A::E>

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.expect
index 999c28e..73f741c 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle.dart" as test;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle.dart";
+
 abstract class I<E extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::I<self::I::E>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.transformed.expect
index 999c28e..73f741c 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle.dart" as test;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle.dart";
+
 abstract class I<E extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::I<self::I::E>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect
index 999c28e..73f741c 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle.dart" as test;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle.dart";
+
 abstract class I<E extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::I<self::I::E>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect
index 999c28e..73f741c 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_generic_instantiations_in_library_cycle_a.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./infer_types_on_generic_instantiations_in_library_cycle.dart" as test;
 
+import "org-dartlang-testcase:///infer_types_on_generic_instantiations_in_library_cycle.dart";
+
 abstract class I<E extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::I<self::I::E>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.expect b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.expect
index 6137f92..0d7e2c9 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class Foo extends core::Object {
   field core::int bar = 42;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.transformed.expect
index 22b3803..2cc1d41 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class Foo extends core::Object {
   field core::int bar = 42;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.outline.expect b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.outline.expect
index 4fc4a13..70778c8 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class Foo extends core::Object {
   field core::int bar;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.expect b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.expect
index d1801f7..8d6871f 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.expect

@@ -35,6 +35,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class Foo extends core::Object {
   field core::int bar = 42;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.transformed.expect
index b075c03..e8b37cd 100644
--- a/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/infer_types_on_loop_indices_for_each_loop_async.dart.strong.transformed.expect

@@ -35,6 +35,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class Foo extends core::Object {
   field core::int bar = 42;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.expect b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.expect
index 5625713..329a161 100644
--- a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic {
   asy::Future<core::int> futureInt = null;
   dynamic x = futureInt;

diff --git a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.transformed.expect
index 5625713..329a161 100644
--- a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic {
   asy::Future<core::int> futureInt = null;
   dynamic x = futureInt;

diff --git a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.outline.expect b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.outline.expect
index 09dc88c..55e2ed1 100644
--- a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.outline.expect

@@ -1,5 +1,7 @@
 library test;
 import self as self;
 
+import "dart:async";
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.expect b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.expect
index 072ead2..37687ca 100644
--- a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic {
   asy::Future<core::int> futureInt = null;
   asy::Future<core::int> x = futureInt;

diff --git a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.transformed.expect
index 072ead2..37687ca 100644
--- a/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/local_reference_upwards_local.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 static method main() → dynamic {
   asy::Future<core::int> futureInt = null;
   asy::Future<core::int> x = futureInt;

diff --git a/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.expect b/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.expect
index 110cf0f..6c8bac5 100644
--- a/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method main() → dynamic {
   function a() → (core::int) → core::int {

diff --git a/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.transformed.expect
index a138755..6ceeed3 100644
--- a/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/local_return_and_yield.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method main() → dynamic {
   function a() → (core::int) → core::int {

diff --git a/pkg/front_end/testcases/inference/local_return_and_yield.dart.outline.expect b/pkg/front_end/testcases/inference/local_return_and_yield.dart.outline.expect
index 23a7b37..d57e83e 100644
--- a/pkg/front_end/testcases/inference/local_return_and_yield.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/local_return_and_yield.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.expect b/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.expect
index 49fdc28..4445a49 100644
--- a/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method main() → dynamic {
   function a() → (core::int) → core::int {

diff --git a/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.transformed.expect
index c20f7cd..d16c079 100644
--- a/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/local_return_and_yield.dart.strong.transformed.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method main() → dynamic {
   function a() → (core::int) → core::int {

diff --git a/pkg/front_end/testcases/inference/super_index_set.dart.legacy.expect b/pkg/front_end/testcases/inference/super_index_set.dart.legacy.expect
index 4ce9e5d..8ecdb24 100644
--- a/pkg/front_end/testcases/inference/super_index_set.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/super_index_set.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_index_set.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/super_index_set.dart.legacy.transformed.expect
index 4ce9e5d..8ecdb24 100644
--- a/pkg/front_end/testcases/inference/super_index_set.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_index_set.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_index_set.dart.outline.expect b/pkg/front_end/testcases/inference/super_index_set.dart.outline.expect
index 77116ab..2def119 100644
--- a/pkg/front_end/testcases/inference/super_index_set.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/super_index_set.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     ;

diff --git a/pkg/front_end/testcases/inference/super_index_set.dart.strong.expect b/pkg/front_end/testcases/inference/super_index_set.dart.strong.expect
index 81b2549f..1728494 100644
--- a/pkg/front_end/testcases/inference/super_index_set.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/super_index_set.dart.strong.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_index_set.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/super_index_set.dart.strong.transformed.expect
index 81b2549f..1728494 100644
--- a/pkg/front_end/testcases/inference/super_index_set.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_index_set.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.expect b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.expect
index 778ae64..5bbe4de 100644
--- a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class B<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::B<self::B::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.transformed.expect
index 778ae64..5bbe4de 100644
--- a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class B<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::B<self::B::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.outline.expect b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.outline.expect
index d6e96c8..a7cf483 100644
--- a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class B<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::B<self::B::T>
     ;

diff --git a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.expect b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.expect
index 2cbc33d..bc2d428 100644
--- a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class B<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::B<self::B::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.transformed.expect
index 2cbc33d..bc2d428 100644
--- a/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_index_set_substitution.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class B<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::B<self::B::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.expect b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.expect
index 8e95ed1..b0a8223 100644
--- a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.transformed.expect
index 8e95ed1..b0a8223 100644
--- a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.outline.expect b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.outline.expect
index 42544c1..27eacb9 100644
--- a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     ;

diff --git a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.expect b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.expect
index 3c47c55..494df6b 100644
--- a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.transformed.expect
index 3c47c55..494df6b 100644
--- a/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_method_invocation_substitution.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.expect b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.expect
index 120a5be..23680d0 100644
--- a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.transformed.expect
index 120a5be..23680d0 100644
--- a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.outline.expect b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.outline.expect
index 5166d46..bc7d92d 100644
--- a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     ;

diff --git a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.expect b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.expect
index da8f484..a65e554 100644
--- a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.transformed.expect
index da8f484..a65e554 100644
--- a/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_property_get_substitution.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.expect b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.expect
index 82217ec..696b98f 100644
--- a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.transformed.expect
index 82217ec..696b98f 100644
--- a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.outline.expect b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.outline.expect
index f157db0..886a4fd 100644
--- a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     ;

diff --git a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.expect b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.expect
index 67484aa..bd20e55 100644
--- a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.transformed.expect
index 67484aa..bd20e55 100644
--- a/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/super_property_set_substitution.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.expect b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.expect
index 7a615f9..c9d9f66 100644
--- a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method a() → (core::int) → core::int {
   return (dynamic x) → dynamic => x;

diff --git a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.transformed.expect
index 5058c0e..ecceca5 100644
--- a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method a() → (core::int) → core::int {
   return (dynamic x) → dynamic => x;

diff --git a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.outline.expect b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.outline.expect
index 5a11fa5..a5e2303 100644
--- a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.outline.expect
+++ b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method a() → (core::int) → core::int
   ;

diff --git a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.expect b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.expect
index b499ab1..f39cc43 100644
--- a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.expect
+++ b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method a() → (core::int) → core::int {
   return (core::int x) → core::int => x;

diff --git a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.transformed.expect b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.transformed.expect
index 9d82be1..b6ef4f9 100644
--- a/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference/top_level_return_and_yield.dart.strong.transformed.expect

@@ -12,6 +12,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 typedef IntToInt = (core::int) → core::int;
 static method a() → (core::int) → core::int {
   return (core::int x) → core::int => x;

diff --git a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.expect b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.expect
index 8a33d3b..5ee26f2 100644
--- a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.transformed.expect
index a974308..5f786d8 100644
--- a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.outline.expect b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.outline.expect
index 07214ac..6a8d7ac 100644
--- a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.outline.expect
+++ b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     ;

diff --git a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.expect b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.expect
index 6d4a669..eed185f 100644
--- a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.expect
+++ b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.expect

@@ -18,6 +18,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.transformed.expect b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.transformed.expect
index 7cd375a..d924c02 100644
--- a/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/for_each_outer_var_type.dart.strong.transformed.expect

@@ -18,6 +18,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.expect b/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.expect
index 5fd35e9..102ef4c 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.transformed.expect
index 5fd35e9..102ef4c 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get.dart.outline.expect b/pkg/front_end/testcases/inference_new/super_index_get.dart.outline.expect
index 1f9dc25..516bba1 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get.dart.outline.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     ;

diff --git a/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.expect b/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.expect
index ac5ee20..8f00549 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.transformed.expect b/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.transformed.expect
index ac5ee20..8f00549 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.expect b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.expect
index b86486e..b5345da 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.transformed.expect b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.transformed.expect
index b86486e..b5345da 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.outline.expect b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.outline.expect
index 4e092ba..44d6487 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.outline.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     ;

diff --git a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.expect b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.expect
index 641bd99..48903a6 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.transformed.expect b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.transformed.expect
index 641bd99..48903a6 100644
--- a/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/inference_new/super_index_get_substitution.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class D<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::D<self::D::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.expect b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.expect
index 0587f95..7e320fc 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.transformed.expect
index 0587f95..7e320fc 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.outline.expect b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.outline.expect
index 6d52cfc..ec44385 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.outline.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     ;

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.expect b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.expect
index 4da975b..3ca1d7b 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.transformed.expect
index 4da975b..3ca1d7b 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_generic_classes_from_dill.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.expect b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.expect
index 5047782..3119f18 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.transformed.expect
index 5047782..3119f18 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.outline.expect b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.outline.expect
index 4649dbc..d328d90 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.outline.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     ;

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.expect b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.expect
index 5047782..3119f18 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.transformed.expect
index 5047782..3119f18 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/body_omitted_bound.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.expect b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.expect
index a3c9999..3f67f69 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.expect

@@ -2,5 +2,7 @@
 import self as self;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 static field col::LinkedListEntry<dynamic> y;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.transformed.expect
index a3c9999..3f67f69 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.legacy.transformed.expect

@@ -2,5 +2,7 @@
 import self as self;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 static field col::LinkedListEntry<dynamic> y;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.outline.expect b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.outline.expect
index de12238..def491a 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.outline.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 static field col::LinkedListEntry<dynamic> y;
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.expect b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.expect
index 2a54655..dd129de 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.expect

@@ -2,5 +2,7 @@
 import self as self;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 static field col::LinkedListEntry<col::LinkedListEntry<dynamic>> y;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.transformed.expect
index 2a54655..dd129de 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/generic_classes_from_dill.dart.strong.transformed.expect

@@ -2,5 +2,7 @@
 import self as self;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 static field col::LinkedListEntry<col::LinkedListEntry<dynamic>> y;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.expect
index b77b4f5..e6a55cc 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:collection" as col;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class Hest<X extends col::LinkedListEntry<dynamic> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::X>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.transformed.expect
index b77b4f5..e6a55cc 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:collection" as col;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class Hest<X extends col::LinkedListEntry<dynamic> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::X>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.outline.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.outline.expect
index 446d326..d3b7084 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.outline.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:collection" as col;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class Hest<X extends col::LinkedListEntry<dynamic> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::X>
     ;

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.expect
index 4df8590..dbf94d5 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.expect

@@ -17,6 +17,8 @@
 import "dart:collection" as col;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class Hest<X extends col::LinkedListEntry<col::LinkedListEntry<dynamic>> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::X>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.transformed.expect
index 4df8590..dbf94d5 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_from_compiled.dart.strong.transformed.expect

@@ -17,6 +17,8 @@
 import "dart:collection" as col;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class Hest<X extends col::LinkedListEntry<col::LinkedListEntry<dynamic>> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::X>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.expect
index 5691a75..9e41858 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "./non_simple_many_libs_same_name_cycle_lib.dart" as non;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///non_simple_many_libs_same_name_cycle_lib.dart" as lib;
+
 class Hest<TypeX extends non::Hest<dynamic> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::TypeX>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.transformed.expect
index 5691a75..9e41858 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "./non_simple_many_libs_same_name_cycle_lib.dart" as non;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///non_simple_many_libs_same_name_cycle_lib.dart" as lib;
+
 class Hest<TypeX extends non::Hest<dynamic> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::TypeX>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.outline.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.outline.expect
index 436437e..f5c75e7 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.outline.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.outline.expect

@@ -3,6 +3,8 @@
 import "./non_simple_many_libs_same_name_cycle_lib.dart" as non;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///non_simple_many_libs_same_name_cycle_lib.dart" as lib;
+
 class Hest<TypeX extends non::Hest<dynamic> = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::TypeX>
     ;

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.expect
index a2b1c00..a9f0989 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.expect

@@ -16,6 +16,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///non_simple_many_libs_same_name_cycle_lib.dart" as lib;
+
 class Hest<TypeX extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::TypeX>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.transformed.expect
index a2b1c00..a9f0989 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/non_simple_many_libs_same_name_cycle.dart.strong.transformed.expect

@@ -16,6 +16,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///non_simple_many_libs_same_name_cycle_lib.dart" as lib;
+
 class Hest<TypeX extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::Hest<self::Hest::TypeX>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.expect b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.expect
index 72ed2b5..ba39350 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.transformed.expect
index 72ed2b5..ba39350 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.outline.expect b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.outline.expect
index 7e226db..3077c8b5 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.outline.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     ;

diff --git a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.expect b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.expect
index 72ed2b5..ba39350 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.transformed.expect
index 72ed2b5..ba39350 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/omitted_bound.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:collection";
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.expect b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.expect
index bb127b8..03d4d75 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.transformed.expect
index bb127b8..03d4d75 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.outline.expect b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.outline.expect
index f1a08ad..302cab4 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.outline.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "package:expect/expect.dart";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     ;

diff --git a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.expect b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.expect
index ed391ab..b431071 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.transformed.expect b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.transformed.expect
index ed391ab..b431071 100644
--- a/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/instantiate_to_bound/supertypes.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect
index b9d9373..0e4502f 100644
--- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect
+++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.expect

@@ -3,6 +3,8 @@
 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 = 0, dynamic b = self::C::T}) → self::C<self::C::T>

diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect
index 3e9f1e9..7809f36 100644
--- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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 = 0, dynamic b = self::C::T}) → self::C<self::C::T>

diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.outline.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.outline.expect
index 69f8aca..897a4aa 100644
--- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.outline.expect
+++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.outline.expect

@@ -2,6 +2,8 @@
 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>

diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect
index 67701f2..883e7fe 100644
--- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect
+++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.expect

@@ -3,6 +3,8 @@
 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 = 0, dynamic b = self::C::T}) → self::C<self::C::T>

diff --git a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect
index e52a7ff..298c8c8 100644
--- a/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/mixin_constructors_with_default_values.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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 = 0, dynamic b = self::C::T}) → self::C<self::C::T>

diff --git a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.expect
index 4c251bf..8850df6 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./private_module.dart" as pri;
 
+import "org-dartlang-testcase:///private_module.dart";
+
 abstract class Foo extends core::Object {
   synthetic constructor •() → self::Foo
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.transformed.expect
index 4c251bf..8850df6 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./private_module.dart" as pri;
 
+import "org-dartlang-testcase:///private_module.dart";
+
 abstract class Foo extends core::Object {
   synthetic constructor •() → self::Foo
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.outline.expect b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.outline.expect
index 86c64e1..f2a2b81 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.outline.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./private_module.dart" as pri;
 
+import "org-dartlang-testcase:///private_module.dart";
+
 abstract class Foo extends core::Object {
   synthetic constructor •() → self::Foo
     ;

diff --git a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.expect b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.expect
index 4c251bf..8850df6 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./private_module.dart" as pri;
 
+import "org-dartlang-testcase:///private_module.dart";
+
 abstract class Foo extends core::Object {
   synthetic constructor •() → self::Foo
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.transformed.expect
index 4c251bf..8850df6 100644
--- a/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_forwarders/private.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./private_module.dart" as pri;
 
+import "org-dartlang-testcase:///private_module.dart";
+
 abstract class Foo extends core::Object {
   synthetic constructor •() → self::Foo
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.expect b/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.expect
index 11bb91d..e92c810 100644
--- a/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.expect
+++ b/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.transformed.expect b/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.transformed.expect
index 11bb91d..e92c810 100644
--- a/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_private_setter.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/no_such_method_private_setter.dart.outline.expect b/pkg/front_end/testcases/no_such_method_private_setter.dart.outline.expect
index 52f1cb7..4b9cc6a 100644
--- a/pkg/front_end/testcases/no_such_method_private_setter.dart.outline.expect
+++ b/pkg/front_end/testcases/no_such_method_private_setter.dart.outline.expect

@@ -3,6 +3,8 @@
 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
     ;

diff --git a/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.expect b/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.expect
index 11bb91d..e92c810 100644
--- a/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.expect
+++ b/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.transformed.expect b/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.transformed.expect
index 11bb91d..e92c810 100644
--- a/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/no_such_method_private_setter.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/part_as_entry_point.dart.legacy.expect b/pkg/front_end/testcases/part_as_entry_point.dart.legacy.expect
index fea7b39..b77b0c2 100644
--- a/pkg/front_end/testcases/part_as_entry_point.dart.legacy.expect
+++ b/pkg/front_end/testcases/part_as_entry_point.dart.legacy.expect

@@ -2,6 +2,7 @@
 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/part_as_entry_point.dart.legacy.transformed.expect b/pkg/front_end/testcases/part_as_entry_point.dart.legacy.transformed.expect
index fea7b39..b77b0c2 100644
--- a/pkg/front_end/testcases/part_as_entry_point.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/part_as_entry_point.dart.legacy.transformed.expect

@@ -2,6 +2,7 @@
 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/part_as_entry_point.dart.outline.expect b/pkg/front_end/testcases/part_as_entry_point.dart.outline.expect
index 6a28c0d..1d93518 100644
--- a/pkg/front_end/testcases/part_as_entry_point.dart.outline.expect
+++ b/pkg/front_end/testcases/part_as_entry_point.dart.outline.expect

@@ -1,5 +1,6 @@
 library;
 import self as self;
 
+part part_as_entry_point.dart;
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/part_as_entry_point.dart.strong.expect b/pkg/front_end/testcases/part_as_entry_point.dart.strong.expect
index fea7b39..b77b0c2 100644
--- a/pkg/front_end/testcases/part_as_entry_point.dart.strong.expect
+++ b/pkg/front_end/testcases/part_as_entry_point.dart.strong.expect

@@ -2,6 +2,7 @@
 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/part_as_entry_point.dart.strong.transformed.expect b/pkg/front_end/testcases/part_as_entry_point.dart.strong.transformed.expect
index fea7b39..b77b0c2 100644
--- a/pkg/front_end/testcases/part_as_entry_point.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/part_as_entry_point.dart.strong.transformed.expect

@@ -2,6 +2,7 @@
 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/private_method_tearoff.dart.legacy.expect b/pkg/front_end/testcases/private_method_tearoff.dart.legacy.expect
index 511c1e6..e502b09 100644
--- a/pkg/front_end/testcases/private_method_tearoff.dart.legacy.expect
+++ b/pkg/front_end/testcases/private_method_tearoff.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/private_method_tearoff.dart.legacy.transformed.expect b/pkg/front_end/testcases/private_method_tearoff.dart.legacy.transformed.expect
index 511c1e6..e502b09 100644
--- a/pkg/front_end/testcases/private_method_tearoff.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/private_method_tearoff.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/private_method_tearoff.dart.outline.expect b/pkg/front_end/testcases/private_method_tearoff.dart.outline.expect
index 4e06821..ad0571b 100644
--- a/pkg/front_end/testcases/private_method_tearoff.dart.outline.expect
+++ b/pkg/front_end/testcases/private_method_tearoff.dart.outline.expect

@@ -3,6 +3,8 @@
 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
     ;

diff --git a/pkg/front_end/testcases/private_method_tearoff.dart.strong.expect b/pkg/front_end/testcases/private_method_tearoff.dart.strong.expect
index 511c1e6..e502b09 100644
--- a/pkg/front_end/testcases/private_method_tearoff.dart.strong.expect
+++ b/pkg/front_end/testcases/private_method_tearoff.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/private_method_tearoff.dart.strong.transformed.expect b/pkg/front_end/testcases/private_method_tearoff.dart.strong.transformed.expect
index 511c1e6..e502b09 100644
--- a/pkg/front_end/testcases/private_method_tearoff.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/private_method_tearoff.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/public_method_tearoff.dart.legacy.expect b/pkg/front_end/testcases/public_method_tearoff.dart.legacy.expect
index 12c4ea4..fd39f69 100644
--- a/pkg/front_end/testcases/public_method_tearoff.dart.legacy.expect
+++ b/pkg/front_end/testcases/public_method_tearoff.dart.legacy.expect

@@ -2,6 +2,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/public_method_tearoff.dart.legacy.transformed.expect b/pkg/front_end/testcases/public_method_tearoff.dart.legacy.transformed.expect
index 12c4ea4..fd39f69 100644
--- a/pkg/front_end/testcases/public_method_tearoff.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/public_method_tearoff.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/public_method_tearoff.dart.outline.expect b/pkg/front_end/testcases/public_method_tearoff.dart.outline.expect
index 23f16e8..2aa831d 100644
--- a/pkg/front_end/testcases/public_method_tearoff.dart.outline.expect
+++ b/pkg/front_end/testcases/public_method_tearoff.dart.outline.expect

@@ -2,6 +2,8 @@
 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
     ;

diff --git a/pkg/front_end/testcases/public_method_tearoff.dart.strong.expect b/pkg/front_end/testcases/public_method_tearoff.dart.strong.expect
index 12c4ea4..fd39f69 100644
--- a/pkg/front_end/testcases/public_method_tearoff.dart.strong.expect
+++ b/pkg/front_end/testcases/public_method_tearoff.dart.strong.expect

@@ -2,6 +2,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/public_method_tearoff.dart.strong.transformed.expect b/pkg/front_end/testcases/public_method_tearoff.dart.strong.transformed.expect
index 12c4ea4..fd39f69 100644
--- a/pkg/front_end/testcases/public_method_tearoff.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/public_method_tearoff.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/qualified.dart.legacy.expect b/pkg/front_end/testcases/qualified.dart.legacy.expect
index 364f09e..e864fba 100644
--- a/pkg/front_end/testcases/qualified.dart.legacy.expect
+++ b/pkg/front_end/testcases/qualified.dart.legacy.expect

@@ -25,6 +25,9 @@
 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 {}

diff --git a/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect b/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect
index 8f3fbe5..9046294 100644
--- a/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/qualified.dart.legacy.transformed.expect

@@ -25,6 +25,9 @@
 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 {}

diff --git a/pkg/front_end/testcases/qualified.dart.outline.expect b/pkg/front_end/testcases/qualified.dart.outline.expect
index 6125de5..f0fb950 100644
--- a/pkg/front_end/testcases/qualified.dart.outline.expect
+++ b/pkg/front_end/testcases/qualified.dart.outline.expect

@@ -25,6 +25,9 @@
 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
     ;

diff --git a/pkg/front_end/testcases/qualified.dart.strong.expect b/pkg/front_end/testcases/qualified.dart.strong.expect
index 396029a..8c6da5e 100644
--- a/pkg/front_end/testcases/qualified.dart.strong.expect
+++ b/pkg/front_end/testcases/qualified.dart.strong.expect

@@ -25,6 +25,9 @@
 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 {}

diff --git a/pkg/front_end/testcases/qualified.dart.strong.transformed.expect b/pkg/front_end/testcases/qualified.dart.strong.transformed.expect
index d04da4e..fb769e9 100644
--- a/pkg/front_end/testcases/qualified.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/qualified.dart.strong.transformed.expect

@@ -25,6 +25,9 @@
 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 {}

diff --git a/pkg/front_end/testcases/rasta/deferred_load.dart.outline.expect b/pkg/front_end/testcases/rasta/deferred_load.dart.outline.expect
index 6a28c0d..a77ae98 100644
--- a/pkg/front_end/testcases/rasta/deferred_load.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/deferred_load.dart.outline.expect

@@ -1,5 +1,7 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/rasta/deferred_load.dart.strong.expect b/pkg/front_end/testcases/rasta/deferred_load.dart.strong.expect
index f076a51..217cfb5 100644
--- a/pkg/front_end/testcases/rasta/deferred_load.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/deferred_load.dart.strong.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:async" as asy;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic {
   self::__loadLibrary_lib;
   LoadLibrary(lib);

diff --git a/pkg/front_end/testcases/rasta/deferred_load.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/deferred_load.dart.strong.transformed.expect
index f076a51..217cfb5 100644
--- a/pkg/front_end/testcases/rasta/deferred_load.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/deferred_load.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:async" as asy;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic {
   self::__loadLibrary_lib;
   LoadLibrary(lib);

diff --git a/pkg/front_end/testcases/rasta/export.dart.legacy.expect b/pkg/front_end/testcases/rasta/export.dart.legacy.expect
index 07bcd0f..126a8b4 100644
--- a/pkg/front_end/testcases/rasta/export.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/export.dart.legacy.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./foo.dart" as foo;
 additionalExports = (foo::foo)
+
+
+export "org-dartlang-testcase:///foo.dart";

diff --git a/pkg/front_end/testcases/rasta/export.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/export.dart.legacy.transformed.expect
index 07bcd0f..126a8b4 100644
--- a/pkg/front_end/testcases/rasta/export.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/export.dart.legacy.transformed.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./foo.dart" as foo;
 additionalExports = (foo::foo)
+
+
+export "org-dartlang-testcase:///foo.dart";

diff --git a/pkg/front_end/testcases/rasta/export.dart.outline.expect b/pkg/front_end/testcases/rasta/export.dart.outline.expect
index 07bcd0f..126a8b4 100644
--- a/pkg/front_end/testcases/rasta/export.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/export.dart.outline.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./foo.dart" as foo;
 additionalExports = (foo::foo)
+
+
+export "org-dartlang-testcase:///foo.dart";

diff --git a/pkg/front_end/testcases/rasta/export.dart.strong.expect b/pkg/front_end/testcases/rasta/export.dart.strong.expect
index 07bcd0f..126a8b4 100644
--- a/pkg/front_end/testcases/rasta/export.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/export.dart.strong.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./foo.dart" as foo;
 additionalExports = (foo::foo)
+
+
+export "org-dartlang-testcase:///foo.dart";

diff --git a/pkg/front_end/testcases/rasta/export.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/export.dart.strong.transformed.expect
index 07bcd0f..126a8b4 100644
--- a/pkg/front_end/testcases/rasta/export.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/export.dart.strong.transformed.expect

@@ -2,3 +2,6 @@
 import self as self;
 import "./foo.dart" as foo;
 additionalExports = (foo::foo)
+
+
+export "org-dartlang-testcase:///foo.dart";

diff --git a/pkg/front_end/testcases/rasta/import_export.dart.legacy.expect b/pkg/front_end/testcases/rasta/import_export.dart.legacy.expect
index 64dfcdc..9b44ed8 100644
--- a/pkg/front_end/testcases/rasta/import_export.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/import_export.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./foo.dart" as foo;
 
+import "org-dartlang-testcase:///export.dart";
+
 static method main() → dynamic {
   foo::foo();
 }

diff --git a/pkg/front_end/testcases/rasta/import_export.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/import_export.dart.legacy.transformed.expect
index 64dfcdc..9b44ed8 100644
--- a/pkg/front_end/testcases/rasta/import_export.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/import_export.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./foo.dart" as foo;
 
+import "org-dartlang-testcase:///export.dart";
+
 static method main() → dynamic {
   foo::foo();
 }

diff --git a/pkg/front_end/testcases/rasta/import_export.dart.outline.expect b/pkg/front_end/testcases/rasta/import_export.dart.outline.expect
index 6a28c0d..8d0a4e8 100644
--- a/pkg/front_end/testcases/rasta/import_export.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/import_export.dart.outline.expect

@@ -1,5 +1,7 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///export.dart";
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/rasta/import_export.dart.strong.expect b/pkg/front_end/testcases/rasta/import_export.dart.strong.expect
index 64dfcdc..9b44ed8 100644
--- a/pkg/front_end/testcases/rasta/import_export.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/import_export.dart.strong.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./foo.dart" as foo;
 
+import "org-dartlang-testcase:///export.dart";
+
 static method main() → dynamic {
   foo::foo();
 }

diff --git a/pkg/front_end/testcases/rasta/import_export.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/import_export.dart.strong.transformed.expect
index 64dfcdc..9b44ed8 100644
--- a/pkg/front_end/testcases/rasta/import_export.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/import_export.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./foo.dart" as foo;
 
+import "org-dartlang-testcase:///export.dart";
+
 static method main() → dynamic {
   foo::foo();
 }

diff --git a/pkg/front_end/testcases/rasta/issue_000002.dart.outline.expect b/pkg/front_end/testcases/rasta/issue_000002.dart.outline.expect
index ed8e416..6e63e38 100644
--- a/pkg/front_end/testcases/rasta/issue_000002.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/issue_000002.dart.outline.expect

@@ -2,6 +2,9 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:typed_data";
+import "package:expect/expect.dart";
+
 class Foo extends core::Object {
   final field dynamic value;
   constructor •(dynamic value) → self::Foo

diff --git a/pkg/front_end/testcases/rasta/issue_000002.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000002.dart.strong.expect
index cb9d36e..25e236d 100644
--- a/pkg/front_end/testcases/rasta/issue_000002.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000002.dart.strong.expect

@@ -4,6 +4,9 @@
 import "package:expect/expect.dart" as exp;
 import "dart:typed_data" as typ;
 
+import "dart:typed_data";
+import "package:expect/expect.dart";
+
 class Foo extends core::Object {
   final field dynamic value;
   constructor •(dynamic value) → self::Foo

diff --git a/pkg/front_end/testcases/rasta/issue_000002.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000002.dart.strong.transformed.expect
index cb9d36e..25e236d 100644
--- a/pkg/front_end/testcases/rasta/issue_000002.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000002.dart.strong.transformed.expect

@@ -4,6 +4,9 @@
 import "package:expect/expect.dart" as exp;
 import "dart:typed_data" as typ;
 
+import "dart:typed_data";
+import "package:expect/expect.dart";
+
 class Foo extends core::Object {
   final field dynamic value;
   constructor •(dynamic value) → self::Foo

diff --git a/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.expect b/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.expect
index 4c7bdc0..4e2ee79 100644
--- a/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static field dynamic global;
 static method fact4() → dynamic {
   dynamic f = 1;

diff --git a/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.transformed.expect
index 4c7bdc0..4e2ee79 100644
--- a/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000004.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static field dynamic global;
 static method fact4() → dynamic {
   dynamic f = 1;

diff --git a/pkg/front_end/testcases/rasta/issue_000004.dart.outline.expect b/pkg/front_end/testcases/rasta/issue_000004.dart.outline.expect
index cf199f8f..8358cbc 100644
--- a/pkg/front_end/testcases/rasta/issue_000004.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/issue_000004.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "package:expect/expect.dart";
+
 static field dynamic global;
 static method fact4() → dynamic
   ;

diff --git a/pkg/front_end/testcases/rasta/issue_000004.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000004.dart.strong.expect
index faa041e..6126127 100644
--- a/pkg/front_end/testcases/rasta/issue_000004.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000004.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static field dynamic global;
 static method fact4() → dynamic {
   core::int f = 1;

diff --git a/pkg/front_end/testcases/rasta/issue_000004.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000004.dart.strong.transformed.expect
index faa041e..6126127 100644
--- a/pkg/front_end/testcases/rasta/issue_000004.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000004.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static field dynamic global;
 static method fact4() → dynamic {
   core::int f = 1;

diff --git a/pkg/front_end/testcases/rasta/issue_000031.dart.outline.expect b/pkg/front_end/testcases/rasta/issue_000031.dart.outline.expect
index 6a28c0d..d5e36cb 100644
--- a/pkg/front_end/testcases/rasta/issue_000031.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/issue_000031.dart.outline.expect

@@ -1,5 +1,7 @@
 library;
 import self as self;
 
+import "dart:math" as math;
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/rasta/issue_000031.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000031.dart.strong.expect
index 121e3a9..6c371c1 100644
--- a/pkg/front_end/testcases/rasta/issue_000031.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000031.dart.strong.expect

@@ -8,6 +8,8 @@
 //
 import self as self;
 
+import "dart:math" as math;
+
 static method main() → dynamic {
   let final dynamic #t1 = invalid-expression "pkg/front_end/testcases/rasta/issue_000031.dart:8:3: Error: A prefix can't be used as an expression.
   math..toString();

diff --git a/pkg/front_end/testcases/rasta/issue_000031.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000031.dart.strong.transformed.expect
index f1470e2..bd752a1 100644
--- a/pkg/front_end/testcases/rasta/issue_000031.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000031.dart.strong.transformed.expect

@@ -9,6 +9,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:math" as math;
+
 static method main() → dynamic {
   let final dynamic #t1 = invalid-expression "pkg/front_end/testcases/rasta/issue_000031.dart:8:3: Error: A prefix can't be used as an expression.
   math..toString();

diff --git a/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.expect b/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.expect
index dac4315..ad715d1 100644
--- a/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::foo];
   constructor •() → self::A

diff --git a/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.transformed.expect
index dac4315..ad715d1 100644
--- a/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000067.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::foo];
   constructor •() → self::A

diff --git a/pkg/front_end/testcases/rasta/issue_000067.dart.outline.expect b/pkg/front_end/testcases/rasta/issue_000067.dart.outline.expect
index cda502f..2416e8c 100644
--- a/pkg/front_end/testcases/rasta/issue_000067.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/issue_000067.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::foo];
   constructor •() → self::A

diff --git a/pkg/front_end/testcases/rasta/issue_000067.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000067.dart.strong.expect
index b685cab..936c23e 100644
--- a/pkg/front_end/testcases/rasta/issue_000067.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000067.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::foo];
   constructor •() → self::A

diff --git a/pkg/front_end/testcases/rasta/issue_000067.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000067.dart.strong.transformed.expect
index 5d95998..25a5efa 100644
--- a/pkg/front_end/testcases/rasta/issue_000067.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000067.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::foo];
   constructor •() → self::A

diff --git a/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.expect b/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.expect
index eeadf14..8148c18 100644
--- a/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class G<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::G<self::G::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.transformed.expect
index eeadf14..8148c18 100644
--- a/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000068.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class G<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::G<self::G::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/rasta/issue_000068.dart.outline.expect b/pkg/front_end/testcases/rasta/issue_000068.dart.outline.expect
index 3ed2a46..ba0bd39 100644
--- a/pkg/front_end/testcases/rasta/issue_000068.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/issue_000068.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "package:expect/expect.dart";
+
 class G<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::G<self::G::T>
     ;

diff --git a/pkg/front_end/testcases/rasta/issue_000068.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000068.dart.strong.expect
index eeadf14..8148c18 100644
--- a/pkg/front_end/testcases/rasta/issue_000068.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000068.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class G<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::G<self::G::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/rasta/issue_000068.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000068.dart.strong.transformed.expect
index eeadf14..8148c18 100644
--- a/pkg/front_end/testcases/rasta/issue_000068.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000068.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class G<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::G<self::G::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.expect
index a4e0188..cb5054f 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A<N extends core::Object = dynamic, S extends core::Object = dynamic, U extends core::Object = dynamic> extends core::Object {
   final field core::List<self::A::U> field;
   constructor •(self::A::N n, self::A::S s) → self::A<self::A::N, self::A::S, self::A::U>

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.transformed.expect
index 1acca31..24788b5 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A<N extends core::Object = dynamic, S extends core::Object = dynamic, U extends core::Object = dynamic> extends core::Object {
   final field core::List<self::A::U> field;
   constructor •(self::A::N n, self::A::S s) → self::A<self::A::N, self::A::S, self::A::U>

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.outline.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.outline.expect
index acc739a..3f08fac 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "package:expect/expect.dart";
+
 class A<N extends core::Object = dynamic, S extends core::Object = dynamic, U extends core::Object = dynamic> extends core::Object {
   final field core::List<self::A::U> field;
   constructor •(self::A::N n, self::A::S s) → self::A<self::A::N, self::A::S, self::A::U>

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.strong.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.strong.expect
index 0f3241e..82beacc 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A<N extends core::Object = dynamic, S extends core::Object = dynamic, U extends core::Object = dynamic> extends core::Object {
   final field core::List<self::A::U> field;
   constructor •(self::A::N n, self::A::S s) → self::A<self::A::N, self::A::S, self::A::U>

diff --git a/pkg/front_end/testcases/rasta/issue_000070.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/issue_000070.dart.strong.transformed.expect
index 1fd973c..e99b7e6 100644
--- a/pkg/front_end/testcases/rasta/issue_000070.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/issue_000070.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A<N extends core::Object = dynamic, S extends core::Object = dynamic, U extends core::Object = dynamic> extends core::Object {
   final field core::List<self::A::U> field;
   constructor •(self::A::N n, self::A::S s) → self::A<self::A::N, self::A::S, self::A::U>

diff --git a/pkg/front_end/testcases/rasta/parser_error.dart.outline.expect b/pkg/front_end/testcases/rasta/parser_error.dart.outline.expect
index 4d53b67..58835f8 100644
--- a/pkg/front_end/testcases/rasta/parser_error.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/parser_error.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic a, {dynamic b, dynamic c}) → core::int
   ;
 static method main() → dynamic

diff --git a/pkg/front_end/testcases/rasta/parser_error.dart.strong.expect b/pkg/front_end/testcases/rasta/parser_error.dart.strong.expect
index 215a1d0..1e7100e 100644
--- a/pkg/front_end/testcases/rasta/parser_error.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/parser_error.dart.strong.expect

@@ -18,6 +18,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic a, {dynamic b = null, dynamic c = null}) → core::int {
   if((invalid-expression "pkg/front_end/testcases/rasta/parser_error.dart:10:7: Error: This couldn't be parsed.
   if (?b) return b;  /// 01: compile-time error

diff --git a/pkg/front_end/testcases/rasta/parser_error.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/parser_error.dart.strong.transformed.expect
index 215a1d0..1e7100e 100644
--- a/pkg/front_end/testcases/rasta/parser_error.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/parser_error.dart.strong.transformed.expect

@@ -18,6 +18,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 static method test(dynamic a, {dynamic b = null, dynamic c = null}) → core::int {
   if((invalid-expression "pkg/front_end/testcases/rasta/parser_error.dart:10:7: Error: This couldn't be parsed.
   if (?b) return b;  /// 01: compile-time error

diff --git a/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.expect b/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.expect
index f479708..5d17727 100644
--- a/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.expect

@@ -2,6 +2,8 @@
 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::foo();

diff --git a/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.transformed.expect
index f479708..5d17727 100644
--- a/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/previsit_deferred.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 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::foo();

diff --git a/pkg/front_end/testcases/rasta/previsit_deferred.dart.outline.expect b/pkg/front_end/testcases/rasta/previsit_deferred.dart.outline.expect
index 7a4d537..3961862 100644
--- a/pkg/front_end/testcases/rasta/previsit_deferred.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/previsit_deferred.dart.outline.expect

@@ -1,6 +1,8 @@
 library;
 import self as self;
 
+import "org-dartlang-testcase:///deferred_lib.dart" deferred as lib;
+
 static method main() → dynamic
   ;
 static method test() → dynamic

diff --git a/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.expect b/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.expect
index f479708..5d17727 100644
--- a/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.expect

@@ -2,6 +2,8 @@
 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::foo();

diff --git a/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.transformed.expect
index 935b4fb..0171ccf 100644
--- a/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/previsit_deferred.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::foo();

diff --git a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect
index 9219084..e3411dc 100644
--- a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./mixin_library.dart" as mix;
 
+import "org-dartlang-testcase:///mixin_library.dart";
+
 class Super<S extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::Super<self::Super::S>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect
index 97f3b5a..81fd15a 100644
--- a/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/super_mixin.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./mixin_library.dart" as mix;
 
+import "org-dartlang-testcase:///mixin_library.dart";
+
 class Super<S extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::Super<self::Super::S>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/rasta/super_mixin.dart.outline.expect b/pkg/front_end/testcases/rasta/super_mixin.dart.outline.expect
index 372c093..4a6efae 100644
--- a/pkg/front_end/testcases/rasta/super_mixin.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/super_mixin.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./mixin_library.dart" as mix;
 
+import "org-dartlang-testcase:///mixin_library.dart";
+
 class Super<S extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::Super<self::Super::S>
     ;

diff --git a/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect b/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect
index f79ab16..899b876 100644
--- a/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/super_mixin.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./mixin_library.dart" as mix;
 
+import "org-dartlang-testcase:///mixin_library.dart";
+
 class Super<S extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::Super<self::Super::S>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.expect
index 8517ec5..ceda317 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.expect

@@ -77,6 +77,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection" as collection;
+
 typedef VoidFunction = () → void;
 class Fisk extends core::Object {
   synthetic constructor •() → self::Fisk

diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.transformed.expect
index 8517ec5..ceda317 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.legacy.transformed.expect

@@ -77,6 +77,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection" as collection;
+
 typedef VoidFunction = () → void;
 class Fisk extends core::Object {
   synthetic constructor •() → self::Fisk

diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.outline.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.outline.expect
index dde777f..a27da5c 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection" as collection;
+
 typedef VoidFunction = () → void;
 class Fisk extends core::Object {
   synthetic constructor •() → self::Fisk

diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect
index 44a5a48..9714888 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.expect

@@ -95,6 +95,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection" as collection;
+
 typedef VoidFunction = () → void;
 class Fisk extends core::Object {
   synthetic constructor •() → self::Fisk

diff --git a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect
index be02cbc..47f060b 100644
--- a/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/unresolved_for_in.dart.strong.transformed.expect

@@ -95,6 +95,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection" as collection;
+
 typedef VoidFunction = () → void;
 class Fisk extends core::Object {
   synthetic constructor •() → self::Fisk

diff --git a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.expect b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.expect
index bef6d48..22b2878 100644
--- a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.expect
+++ b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.expect

@@ -1,4 +1,7 @@
 library;
 import self as self;
 
+import "dart:html";
+import "dart:io";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.transformed.expect b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.transformed.expect
index bef6d48..22b2878 100644
--- a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.legacy.transformed.expect

@@ -1,4 +1,7 @@
 library;
 import self as self;
 
+import "dart:html";
+import "dart:io";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.outline.expect b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.outline.expect
index 6a28c0d..d2b8d3d 100644
--- a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.outline.expect
+++ b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.outline.expect

@@ -1,5 +1,8 @@
 library;
 import self as self;
 
+import "dart:html";
+import "dart:io";
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.expect b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.expect
index bef6d48..22b2878 100644
--- a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.expect
+++ b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.expect

@@ -1,4 +1,7 @@
 library;
 import self as self;
 
+import "dart:html";
+import "dart:io";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.transformed.expect b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.transformed.expect
index bef6d48..22b2878 100644
--- a/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/rasta/unsupported_platform_library.dart.strong.transformed.expect

@@ -1,4 +1,7 @@
 library;
 import self as self;
 
+import "dart:html";
+import "dart:io";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.expect b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.expect
index 90b0fbf..bba4f23 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.transformed.expect b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.transformed.expect
index 90b0fbf..bba4f23 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.outline.expect b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.outline.expect
index 1454cdb..3b0ee19 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.outline.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.outline.expect

@@ -2,6 +2,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.expect b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.expect
index 530eceb..32a5b17 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.transformed.expect b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.transformed.expect
index d2d7128..5e6a996 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.expect b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.expect
index 6eb52f4..cee4e10 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.transformed.expect b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.transformed.expect
index 6eb52f4..cee4e10 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.outline.expect b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.outline.expect
index 2be51bd..2b481ac 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.outline.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.outline.expect

@@ -2,6 +2,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.expect b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.expect
index 981ccb8..09e1d27 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.transformed.expect b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.transformed.expect
index f2d09cc..eae9cec 100644
--- a/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/redirection_chain_type_arguments_subst.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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 field dynamic _redirecting# = <dynamic>[self::A::•];
   constructor empty() → self::A<self::A::T>

diff --git a/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.expect b/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.expect
index 3f0dbf7..2fff34d 100644
--- a/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.expect
+++ b/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::•];
   const constructor empty() → self::A

diff --git a/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.transformed.expect b/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.transformed.expect
index 3f0dbf7..2fff34d 100644
--- a/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/redirection_type_arguments.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::•];
   const constructor empty() → self::A

diff --git a/pkg/front_end/testcases/redirection_type_arguments.dart.outline.expect b/pkg/front_end/testcases/redirection_type_arguments.dart.outline.expect
index e6e3790..4e65df8 100644
--- a/pkg/front_end/testcases/redirection_type_arguments.dart.outline.expect
+++ b/pkg/front_end/testcases/redirection_type_arguments.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::•];
   const constructor empty() → self::A

diff --git a/pkg/front_end/testcases/redirection_type_arguments.dart.strong.expect b/pkg/front_end/testcases/redirection_type_arguments.dart.strong.expect
index 2e533bd..0dc1e9e 100644
--- a/pkg/front_end/testcases/redirection_type_arguments.dart.strong.expect
+++ b/pkg/front_end/testcases/redirection_type_arguments.dart.strong.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::•];
   const constructor empty() → self::A

diff --git a/pkg/front_end/testcases/redirection_type_arguments.dart.strong.transformed.expect b/pkg/front_end/testcases/redirection_type_arguments.dart.strong.transformed.expect
index a388ba6..d3d9485 100644
--- a/pkg/front_end/testcases/redirection_type_arguments.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/redirection_type_arguments.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class A extends core::Object {
   static field dynamic _redirecting# = <dynamic>[self::A::•];
   const constructor empty() → self::A

diff --git a/pkg/front_end/testcases/regress/issue_29977.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_29977.dart.legacy.expect
index 27a1465..7232adb 100644
--- a/pkg/front_end/testcases/regress/issue_29977.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_29977.dart.legacy.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?data%3Aasync";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_29977.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_29977.dart.legacy.transformed.expect
index 27a1465..7232adb 100644
--- a/pkg/front_end/testcases/regress/issue_29977.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_29977.dart.legacy.transformed.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?data%3Aasync";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_29977.dart.outline.expect b/pkg/front_end/testcases/regress/issue_29977.dart.outline.expect
index e858eaf..2f7359d 100644
--- a/pkg/front_end/testcases/regress/issue_29977.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_29977.dart.outline.expect

@@ -9,5 +9,7 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?data%3Aasync";
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/regress/issue_29977.dart.strong.expect b/pkg/front_end/testcases/regress/issue_29977.dart.strong.expect
index 27a1465..7232adb 100644
--- a/pkg/front_end/testcases/regress/issue_29977.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_29977.dart.strong.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?data%3Aasync";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_29977.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_29977.dart.strong.transformed.expect
index 27a1465..7232adb 100644
--- a/pkg/front_end/testcases/regress/issue_29977.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_29977.dart.strong.transformed.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?data%3Aasync";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_29987.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_29987.dart.legacy.expect
index 84c40be..118253d 100644
--- a/pkg/front_end/testcases/regress/issue_29987.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_29987.dart.legacy.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?dart_%3Acore";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_29987.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_29987.dart.legacy.transformed.expect
index 84c40be..118253d 100644
--- a/pkg/front_end/testcases/regress/issue_29987.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_29987.dart.legacy.transformed.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?dart_%3Acore";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_29987.dart.outline.expect b/pkg/front_end/testcases/regress/issue_29987.dart.outline.expect
index 8b78922..9c6b3f7 100644
--- a/pkg/front_end/testcases/regress/issue_29987.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_29987.dart.outline.expect

@@ -9,5 +9,7 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?dart_%3Acore";
+
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/regress/issue_29987.dart.strong.expect b/pkg/front_end/testcases/regress/issue_29987.dart.strong.expect
index 84c40be..118253d 100644
--- a/pkg/front_end/testcases/regress/issue_29987.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_29987.dart.strong.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?dart_%3Acore";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_29987.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_29987.dart.strong.transformed.expect
index 84c40be..118253d 100644
--- a/pkg/front_end/testcases/regress/issue_29987.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_29987.dart.strong.transformed.expect

@@ -9,4 +9,6 @@
 //
 import self as self;
 
+import "org-dartlang-malformed-uri:?dart_%3Acore";
+
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_30994.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_30994.dart.legacy.expect
index fff02be..cd1dab4 100644
--- a/pkg/front_end/testcases/regress/issue_30994.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_30994.dart.legacy.expect

@@ -32,4 +32,11 @@
 //
 import self as self;
 
+part org-dartlang-malformed-uri:bad235;
+part org-dartlang-malformed-uri:bad248;
+part org-dartlang-malformed-uri:bad265;
+part org-dartlang-malformed-uri:bad282;
+part org-dartlang-malformed-uri:bad298;
+part org-dartlang-malformed-uri:bad319;
+part org-dartlang-malformed-uri:bad348;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_30994.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_30994.dart.legacy.transformed.expect
index fff02be..cd1dab4 100644
--- a/pkg/front_end/testcases/regress/issue_30994.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_30994.dart.legacy.transformed.expect

@@ -32,4 +32,11 @@
 //
 import self as self;
 
+part org-dartlang-malformed-uri:bad235;
+part org-dartlang-malformed-uri:bad248;
+part org-dartlang-malformed-uri:bad265;
+part org-dartlang-malformed-uri:bad282;
+part org-dartlang-malformed-uri:bad298;
+part org-dartlang-malformed-uri:bad319;
+part org-dartlang-malformed-uri:bad348;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_30994.dart.outline.expect b/pkg/front_end/testcases/regress/issue_30994.dart.outline.expect
index 904aabb..0f4e633 100644
--- a/pkg/front_end/testcases/regress/issue_30994.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_30994.dart.outline.expect

@@ -32,5 +32,12 @@
 //
 import self as self;
 
+part org-dartlang-malformed-uri:bad235;
+part org-dartlang-malformed-uri:bad248;
+part org-dartlang-malformed-uri:bad265;
+part org-dartlang-malformed-uri:bad282;
+part org-dartlang-malformed-uri:bad298;
+part org-dartlang-malformed-uri:bad319;
+part org-dartlang-malformed-uri:bad348;
 static method main() → dynamic
   ;

diff --git a/pkg/front_end/testcases/regress/issue_30994.dart.strong.expect b/pkg/front_end/testcases/regress/issue_30994.dart.strong.expect
index fff02be..cd1dab4 100644
--- a/pkg/front_end/testcases/regress/issue_30994.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_30994.dart.strong.expect

@@ -32,4 +32,11 @@
 //
 import self as self;
 
+part org-dartlang-malformed-uri:bad235;
+part org-dartlang-malformed-uri:bad248;
+part org-dartlang-malformed-uri:bad265;
+part org-dartlang-malformed-uri:bad282;
+part org-dartlang-malformed-uri:bad298;
+part org-dartlang-malformed-uri:bad319;
+part org-dartlang-malformed-uri:bad348;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_30994.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_30994.dart.strong.transformed.expect
index fff02be..cd1dab4 100644
--- a/pkg/front_end/testcases/regress/issue_30994.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_30994.dart.strong.transformed.expect

@@ -32,4 +32,11 @@
 //
 import self as self;
 
+part org-dartlang-malformed-uri:bad235;
+part org-dartlang-malformed-uri:bad248;
+part org-dartlang-malformed-uri:bad265;
+part org-dartlang-malformed-uri:bad282;
+part org-dartlang-malformed-uri:bad298;
+part org-dartlang-malformed-uri:bad319;
+part org-dartlang-malformed-uri:bad348;
 static method main() → dynamic {}

diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect
index 2b0e26e..628ada3 100644
--- a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32182.dart" as self;
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect
index a9c10f4..1ce00d2 100644
--- a/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_32182.dart.legacy.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32182.dart" as self;
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.outline.expect b/pkg/front_end/testcases/regress/issue_32182.dart.outline.expect
index c5ce030..96244c9 100644
--- a/pkg/front_end/testcases/regress/issue_32182.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_32182.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32182.dart" as self;
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     ;

diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect b/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect
index ccec30c..e0b348f 100644
--- a/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_32182.dart.strong.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32182.dart" as self;
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect
index 063d09c..5b387e9 100644
--- a/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_32182.dart.strong.transformed.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32182.dart" as self;
+
 class A<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::A<self::A::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_32200.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_32200.dart.legacy.expect
index 287c06f..4e36d19 100644
--- a/pkg/front_end/testcases/regress/issue_32200.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_32200.dart.legacy.expect

@@ -9,6 +9,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32200.dart" as self;
+
 class Foo extends core::Object {
   field invalid-type self = null;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/regress/issue_32200.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_32200.dart.legacy.transformed.expect
index 287c06f..4e36d19 100644
--- a/pkg/front_end/testcases/regress/issue_32200.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_32200.dart.legacy.transformed.expect

@@ -9,6 +9,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32200.dart" as self;
+
 class Foo extends core::Object {
   field invalid-type self = null;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/regress/issue_32200.dart.outline.expect b/pkg/front_end/testcases/regress/issue_32200.dart.outline.expect
index 8a57a9f..d111290 100644
--- a/pkg/front_end/testcases/regress/issue_32200.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_32200.dart.outline.expect

@@ -9,6 +9,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32200.dart" as self;
+
 class Foo extends core::Object {
   field invalid-type self;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/regress/issue_32200.dart.strong.expect b/pkg/front_end/testcases/regress/issue_32200.dart.strong.expect
index cd875cb..3316d53 100644
--- a/pkg/front_end/testcases/regress/issue_32200.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_32200.dart.strong.expect

@@ -15,6 +15,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32200.dart" as self;
+
 class Foo extends core::Object {
   field invalid-type self = null;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/regress/issue_32200.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_32200.dart.strong.transformed.expect
index cd875cb..3316d53 100644
--- a/pkg/front_end/testcases/regress/issue_32200.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_32200.dart.strong.transformed.expect

@@ -15,6 +15,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_32200.dart" as self;
+
 class Foo extends core::Object {
   field invalid-type self = null;
   synthetic constructor •() → self::Foo

diff --git a/pkg/front_end/testcases/regress/issue_34291.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_34291.dart.legacy.expect
index bc156cf..305480e 100644
--- a/pkg/front_end/testcases/regress/issue_34291.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_34291.dart.legacy.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./issue_34291_lib.dart" as iss;
 
+import "org-dartlang-testcase:///issue_34291_lib.dart" as lib;
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34291.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_34291.dart.legacy.transformed.expect
index bc156cf..305480e 100644
--- a/pkg/front_end/testcases/regress/issue_34291.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34291.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./issue_34291_lib.dart" as iss;
 
+import "org-dartlang-testcase:///issue_34291_lib.dart" as lib;
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34291.dart.outline.expect b/pkg/front_end/testcases/regress/issue_34291.dart.outline.expect
index f3be0ec..654ddb5 100644
--- a/pkg/front_end/testcases/regress/issue_34291.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_34291.dart.outline.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "./issue_34291_lib.dart" as iss;
 
+import "org-dartlang-testcase:///issue_34291_lib.dart" as lib;
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     ;

diff --git a/pkg/front_end/testcases/regress/issue_34291.dart.strong.expect b/pkg/front_end/testcases/regress/issue_34291.dart.strong.expect
index ea66cca..564c0f6 100644
--- a/pkg/front_end/testcases/regress/issue_34291.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34291.dart.strong.expect

@@ -9,6 +9,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34291_lib.dart" as lib;
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34291.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_34291.dart.strong.transformed.expect
index ea66cca..564c0f6 100644
--- a/pkg/front_end/testcases/regress/issue_34291.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34291.dart.strong.transformed.expect

@@ -9,6 +9,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34291_lib.dart" as lib;
+
 class B extends core::Object {
   synthetic constructor •() → self::B
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_34403.dart.legacy.expect
index 5422427..542b344 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.legacy.expect

@@ -86,6 +86,8 @@
 import "dart:core" as core;
 import "./issue_34403_lib.dart" as iss;
 
+import "org-dartlang-testcase:///issue_34403_lib.dart" as p;
+
 class C<T extends core::Object = dynamic> extends core::Object {
   constructor bar() → self::C<self::C::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_34403.dart.legacy.transformed.expect
index 5422427..542b344 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.legacy.transformed.expect

@@ -86,6 +86,8 @@
 import "dart:core" as core;
 import "./issue_34403_lib.dart" as iss;
 
+import "org-dartlang-testcase:///issue_34403_lib.dart" as p;
+
 class C<T extends core::Object = dynamic> extends core::Object {
   constructor bar() → self::C<self::C::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.outline.expect b/pkg/front_end/testcases/regress/issue_34403.dart.outline.expect
index 405b23c..63d22a5 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34403_lib.dart" as p;
+
 class C<T extends core::Object = dynamic> extends core::Object {
   constructor bar() → self::C<self::C::T>
     ;

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.strong.expect b/pkg/front_end/testcases/regress/issue_34403.dart.strong.expect
index 447ffcf..0697638 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.strong.expect

@@ -86,6 +86,8 @@
 import "dart:core" as core;
 import "./issue_34403_lib.dart" as iss;
 
+import "org-dartlang-testcase:///issue_34403_lib.dart" as p;
+
 class C<T extends core::Object = dynamic> extends core::Object {
   constructor bar() → self::C<self::C::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34403.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_34403.dart.strong.transformed.expect
index 447ffcf..0697638 100644
--- a/pkg/front_end/testcases/regress/issue_34403.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34403.dart.strong.transformed.expect

@@ -86,6 +86,8 @@
 import "dart:core" as core;
 import "./issue_34403_lib.dart" as iss;
 
+import "org-dartlang-testcase:///issue_34403_lib.dart" as p;
+
 class C<T extends core::Object = dynamic> extends core::Object {
   constructor bar() → self::C<self::C::T>
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34498.dart.legacy.expect b/pkg/front_end/testcases/regress/issue_34498.dart.legacy.expect
index 553b149..9a74bf0 100644
--- a/pkg/front_end/testcases/regress/issue_34498.dart.legacy.expect
+++ b/pkg/front_end/testcases/regress/issue_34498.dart.legacy.expect

@@ -25,6 +25,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34498_lib.dart" as lib;
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34498.dart.legacy.transformed.expect b/pkg/front_end/testcases/regress/issue_34498.dart.legacy.transformed.expect
index 553b149..9a74bf0 100644
--- a/pkg/front_end/testcases/regress/issue_34498.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34498.dart.legacy.transformed.expect

@@ -25,6 +25,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34498_lib.dart" as lib;
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34498.dart.outline.expect b/pkg/front_end/testcases/regress/issue_34498.dart.outline.expect
index 7f86da8..1fe265f 100644
--- a/pkg/front_end/testcases/regress/issue_34498.dart.outline.expect
+++ b/pkg/front_end/testcases/regress/issue_34498.dart.outline.expect

@@ -25,6 +25,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34498_lib.dart" as lib;
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     ;

diff --git a/pkg/front_end/testcases/regress/issue_34498.dart.strong.expect b/pkg/front_end/testcases/regress/issue_34498.dart.strong.expect
index cbfeeae..9412007 100644
--- a/pkg/front_end/testcases/regress/issue_34498.dart.strong.expect
+++ b/pkg/front_end/testcases/regress/issue_34498.dart.strong.expect

@@ -25,6 +25,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34498_lib.dart" as lib;
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/regress/issue_34498.dart.strong.transformed.expect b/pkg/front_end/testcases/regress/issue_34498.dart.strong.transformed.expect
index cbfeeae..9412007 100644
--- a/pkg/front_end/testcases/regress/issue_34498.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/regress/issue_34498.dart.strong.transformed.expect

@@ -25,6 +25,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "org-dartlang-testcase:///issue_34498_lib.dart" as lib;
+
 class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.expect b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.expect
index b88dd51..b806941 100644
--- a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.transformed.expect b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.transformed.expect
index b88dd51..b806941 100644
--- a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.legacy.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.outline.expect b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.outline.expect
index 3f4889b..c1ceccf 100644
--- a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.outline.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.outline.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:async";
+
 class C extends core::Object {
   synthetic constructor •() → self::C
     ;

diff --git a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.expect b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.expect
index 5140370..ee98bf3 100644
--- a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.transformed.expect b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.transformed.expect
index 5140370..ee98bf3 100644
--- a/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/runtime_checks/call_method_implicit_tear_off_future_or.dart.strong.transformed.expect

@@ -3,6 +3,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.expect b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.expect
index 932c7ea..08f59f7 100644
--- a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.expect
+++ b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.expect

@@ -4,6 +4,9 @@
 import "dart:collection" as col;
 import "dart:async" as asy;
 
+import "dart:async";
+import "dart:collection";
+
 static method main() → dynamic async {
   core::Map<core::int, core::bool> m = <dynamic, dynamic>{};
   core::Set<core::int> s = <dynamic, dynamic>{};

diff --git a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.transformed.expect b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.transformed.expect
index 7ed15e3..192875a 100644
--- a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.legacy.transformed.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:async";
+import "dart:collection";
+
 static method main() → dynamic /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.outline.expect b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.outline.expect
index 4c67211..3267afb 100644
--- a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.outline.expect
+++ b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.outline.expect

@@ -4,6 +4,9 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:async";
+import "dart:collection";
+
 static method main() → dynamic
   ;
 static method mapfun() → asy::Future<core::Map<core::int, core::bool>>

diff --git a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.expect b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.expect
index c139a48..0db9ad9e 100644
--- a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.expect
+++ b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.expect

@@ -37,6 +37,9 @@
 import "dart:collection" as col;
 import "dart:async" as asy;
 
+import "dart:async";
+import "dart:collection";
+
 static method main() → dynamic async {
   core::Map<core::int, core::bool> m = <core::int, core::bool>{};
   core::Set<core::int> s = let final core::Set<core::int> #t1 = col::LinkedHashSet::•<core::int>() in #t1;

diff --git a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.transformed.expect b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.transformed.expect
index 02f99b6..1a139dc 100644
--- a/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/set_literals/disambiguation_rule.dart.strong.transformed.expect

@@ -37,6 +37,9 @@
 import "dart:core" as core;
 import "dart:collection" as col;
 
+import "dart:async";
+import "dart:collection";
+
 static method main() → dynamic /* originally async */ {
   final asy::_AsyncAwaitCompleter<dynamic> :async_completer = new asy::_AsyncAwaitCompleter::•<dynamic>();
   asy::FutureOr<dynamic> :return_value;

diff --git a/pkg/front_end/testcases/top_level_accessors.dart.legacy.expect b/pkg/front_end/testcases/top_level_accessors.dart.legacy.expect
index 35b8eac..55f39bd 100644
--- a/pkg/front_end/testcases/top_level_accessors.dart.legacy.expect
+++ b/pkg/front_end/testcases/top_level_accessors.dart.legacy.expect

@@ -2,6 +2,7 @@
 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);
 }

diff --git a/pkg/front_end/testcases/top_level_accessors.dart.legacy.transformed.expect b/pkg/front_end/testcases/top_level_accessors.dart.legacy.transformed.expect
index 35b8eac..55f39bd 100644
--- a/pkg/front_end/testcases/top_level_accessors.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/top_level_accessors.dart.legacy.transformed.expect

@@ -2,6 +2,7 @@
 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);
 }

diff --git a/pkg/front_end/testcases/top_level_accessors.dart.outline.expect b/pkg/front_end/testcases/top_level_accessors.dart.outline.expect
index da336ad..88e4404 100644
--- a/pkg/front_end/testcases/top_level_accessors.dart.outline.expect
+++ b/pkg/front_end/testcases/top_level_accessors.dart.outline.expect

@@ -2,6 +2,7 @@
 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

diff --git a/pkg/front_end/testcases/top_level_accessors.dart.strong.expect b/pkg/front_end/testcases/top_level_accessors.dart.strong.expect
index 35b8eac..55f39bd 100644
--- a/pkg/front_end/testcases/top_level_accessors.dart.strong.expect
+++ b/pkg/front_end/testcases/top_level_accessors.dart.strong.expect

@@ -2,6 +2,7 @@
 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);
 }

diff --git a/pkg/front_end/testcases/top_level_accessors.dart.strong.transformed.expect b/pkg/front_end/testcases/top_level_accessors.dart.strong.transformed.expect
index 35b8eac..55f39bd 100644
--- a/pkg/front_end/testcases/top_level_accessors.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/top_level_accessors.dart.strong.transformed.expect

@@ -2,6 +2,7 @@
 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);
 }

diff --git a/pkg/front_end/testcases/type_variable_prefix.dart.legacy.expect b/pkg/front_end/testcases/type_variable_prefix.dart.legacy.expect
index dbd5159a..e409640 100644
--- a/pkg/front_end/testcases/type_variable_prefix.dart.legacy.expect
+++ b/pkg/front_end/testcases/type_variable_prefix.dart.legacy.expect

@@ -9,6 +9,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/type_variable_prefix.dart.legacy.transformed.expect b/pkg/front_end/testcases/type_variable_prefix.dart.legacy.transformed.expect
index dbd5159a..e409640 100644
--- a/pkg/front_end/testcases/type_variable_prefix.dart.legacy.transformed.expect
+++ b/pkg/front_end/testcases/type_variable_prefix.dart.legacy.transformed.expect

@@ -9,6 +9,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/type_variable_prefix.dart.outline.expect b/pkg/front_end/testcases/type_variable_prefix.dart.outline.expect
index 9fa3e61..16cecb0 100644
--- a/pkg/front_end/testcases/type_variable_prefix.dart.outline.expect
+++ b/pkg/front_end/testcases/type_variable_prefix.dart.outline.expect

@@ -9,6 +9,8 @@
 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>
     ;

diff --git a/pkg/front_end/testcases/type_variable_prefix.dart.strong.expect b/pkg/front_end/testcases/type_variable_prefix.dart.strong.expect
index a4ca447..1ca7685 100644
--- a/pkg/front_end/testcases/type_variable_prefix.dart.strong.expect
+++ b/pkg/front_end/testcases/type_variable_prefix.dart.strong.expect

@@ -19,6 +19,8 @@
 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::•()

diff --git a/pkg/front_end/testcases/type_variable_prefix.dart.strong.transformed.expect b/pkg/front_end/testcases/type_variable_prefix.dart.strong.transformed.expect
index a4ca447..1ca7685 100644
--- a/pkg/front_end/testcases/type_variable_prefix.dart.strong.transformed.expect
+++ b/pkg/front_end/testcases/type_variable_prefix.dart.strong.transformed.expect

@@ -19,6 +19,8 @@
 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::•()

diff --git a/pkg/kernel/lib/text/ast_to_text.dart b/pkg/kernel/lib/text/ast_to_text.dart
index 33ce1dd..8844c12 100644
--- a/pkg/kernel/lib/text/ast_to_text.dart
+++ b/pkg/kernel/lib/text/ast_to_text.dart

@@ -380,9 +380,13 @@
     }
     endLine(';');
 
-    writeProblemsAsJson("Problems in library", library.problemsAsJson);
+    LibraryImportTable imports = new LibraryImportTable(library);
+    Printer inner = createInner(imports, library.enclosingComponent?.metadata);
+    inner.writeStandardLibraryContent(library,
+        outerPrinter: this, importsToPrint: imports);
+  }
 
-    var imports = new LibraryImportTable(library);
+  void printLibraryImportTable(LibraryImportTable imports) {
     for (var library in imports.importedLibraries) {
       var importPath = imports.getImportPath(library);
       if (importPath == "") {
@@ -394,47 +398,63 @@
         endLine('import "$importPath" as $prefix;');
       }
     }
+  }
 
-    // TODO(scheglov): Do we want to print dependencies? dartbug.com/30224
-    if (library.additionalExports.isNotEmpty) {
-      write('additionalExports = (');
-      bool isFirst = true;
-      for (var reference in library.additionalExports) {
-        if (isFirst) {
-          isFirst = false;
-        } else {
-          write(', ');
-        }
-        var node = reference.node;
-        if (node is Class) {
-          Library nodeLibrary = node.enclosingLibrary;
-          String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
-          write(prefix + '::' + node.name);
-        } else if (node is Field) {
-          Library nodeLibrary = node.enclosingLibrary;
-          String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
-          write(prefix + '::' + node.name.name);
-        } else if (node is Procedure) {
-          Library nodeLibrary = node.enclosingLibrary;
-          String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
-          write(prefix + '::' + node.name.name);
-        } else if (node is Typedef) {
-          Library nodeLibrary = node.enclosingLibrary;
-          String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
-          write(prefix + '::' + node.name);
-        } else {
-          throw new UnimplementedError('${node.runtimeType}');
-        }
+  void writeStandardLibraryContent(Library library,
+      {Printer outerPrinter, LibraryImportTable importsToPrint}) {
+    outerPrinter ??= this;
+    outerPrinter.writeProblemsAsJson(
+        "Problems in library", library.problemsAsJson);
+
+    if (importsToPrint != null) {
+      outerPrinter.printLibraryImportTable(importsToPrint);
+    }
+
+    writeAdditionalExports(library.additionalExports);
+    endLine();
+    library.dependencies.forEach(writeNode);
+    if (library.dependencies.isNotEmpty) endLine();
+    library.parts.forEach(writeNode);
+    library.typedefs.forEach(writeNode);
+    library.classes.forEach(writeNode);
+    library.fields.forEach(writeNode);
+    library.procedures.forEach(writeNode);
+  }
+
+  void writeAdditionalExports(List<Reference> additionalExports) {
+    if (additionalExports.isEmpty) return;
+    write('additionalExports = (');
+    bool isFirst = true;
+    for (Reference reference in additionalExports) {
+      if (isFirst) {
+        isFirst = false;
+      } else {
+        write(', ');
+      }
+      var node = reference.node;
+      if (node is Class) {
+        Library nodeLibrary = node.enclosingLibrary;
+        String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
+        write(prefix + '::' + node.name);
+      } else if (node is Field) {
+        Library nodeLibrary = node.enclosingLibrary;
+        String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
+        write(prefix + '::' + node.name.name);
+      } else if (node is Procedure) {
+        Library nodeLibrary = node.enclosingLibrary;
+        String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
+        write(prefix + '::' + node.name.name);
+      } else if (node is Typedef) {
+        Library nodeLibrary = node.enclosingLibrary;
+        String prefix = syntheticNames.nameLibraryPrefix(nodeLibrary);
+        write(prefix + '::' + node.name);
+      } else {
+        throw new UnimplementedError('${node.runtimeType}');
       }
       endLine(')');
     }
 
     endLine();
-    var inner = createInner(imports, library.enclosingComponent?.metadata);
-    library.typedefs.forEach(inner.writeNode);
-    library.classes.forEach(inner.writeNode);
-    library.fields.forEach(inner.writeNode);
-    library.procedures.forEach(inner.writeNode);
   }
 
   void writeComponentFile(Component component) {
@@ -468,12 +488,8 @@
       writeWord(prefix);
       endLine(' {');
       ++inner.indentation;
-      writeProblemsAsJson("Problems in library", library.problemsAsJson);
-      library.dependencies.forEach(inner.writeNode);
-      library.typedefs.forEach(inner.writeNode);
-      library.classes.forEach(inner.writeNode);
-      library.fields.forEach(inner.writeNode);
-      library.procedures.forEach(inner.writeNode);
+
+      inner.writeStandardLibraryContent(library);
       --inner.indentation;
       endLine('}');
     }
@@ -1398,6 +1414,14 @@
     state = WORD;
   }
 
+  visitLibraryPart(LibraryPart node) {
+    writeAnnotationList(node.annotations);
+    writeIndentation();
+    writeWord('part');
+    writeWord(node.partUri);
+    endLine(";");
+  }
+
   visitLibraryDependency(LibraryDependency node) {
     writeIndentation();
     writeWord(node.isImport ? 'import' : 'export');

diff --git a/pkg/vm/testcases/bytecode/async.dart.expect b/pkg/vm/testcases/bytecode/async.dart.expect
index 115e062..9218869 100644
--- a/pkg/vm/testcases/bytecode/async.dart.expect
+++ b/pkg/vm/testcases/bytecode/async.dart.expect

@@ -3,6 +3,8 @@
 import "dart:async" as asy;
 import "dart:core" as core;
 
+import "dart:async";
+
 [@vm.bytecode=
 Bytecode {
   Entry                3

diff --git a/pkg/vm/testcases/bytecode/deferred_lib.dart.expect b/pkg/vm/testcases/bytecode/deferred_lib.dart.expect
index ec106c3..b9e2d09 100644
--- a/pkg/vm/testcases/bytecode/deferred_lib.dart.expect
+++ b/pkg/vm/testcases/bytecode/deferred_lib.dart.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "./hello.dart" as hel;
 
+import "#pkg/vm/testcases/bytecode/hello.dart" deferred as lib;
+
 [@vm.bytecode=
 Bytecode {
   Entry                1

diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect
index b2c1ba2..fb2975e 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/bench_vector.dart.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:typed_data" as typ;
 
+import "dart:typed_data";
+
 class _Vector extends core::Object {
 [@vm.inferred-type.metadata=dart.core::_Smi] [@vm.procedure-attributes.metadata=hasDynamicUses:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false]  final field core::int _offset;
 [@vm.inferred-type.metadata=dart.core::_Smi] [@vm.procedure-attributes.metadata=hasDynamicUses:false,hasThisUses:false,hasNonThisUses:false,hasTearOffUses:false]  final field core::int _length;

diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect
index a84a25f..122b604 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/class_generics_case1.dart.expect

@@ -2,6 +2,8 @@
 import self as self;
 import "dart:core" as core;
 
+import "dart:collection";
+
 class Element extends core::Object {
   synthetic constructor •() → self::Element
     : super core::Object::•()

diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect
index 3998132..0af71e5 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/future.dart.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 class C<T extends core::Object = dynamic> extends core::Object {
   synthetic constructor •() → self::C<self::C::T>
     : super core::Object::•()

diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect
index 4a94677..5b867b7 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/future_or.dart.expect

@@ -3,6 +3,8 @@
 import "dart:core" as core;
 import "dart:async" as asy;
 
+import "dart:async";
+
 abstract class A extends core::Object {
   synthetic constructor •() → self::A
     : super core::Object::•()

diff --git a/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect b/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
index feb28eb..0630a2a 100644
--- a/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect
+++ b/pkg/vm/testcases/transformations/type_flow/transformer/regress_flutter16182.dart.expect

@@ -4,6 +4,8 @@
 import "dart:_internal" as _in;
 import "package:expect/expect.dart" as exp;
 
+import "package:expect/expect.dart";
+
 class T1 extends core::Object {
   synthetic constructor •() → self::T1
     : super core::Object::•()
commit	1bad9304a026418871b2f6468d2a87f9caea8b09	[log] [tgz]
author	Jens Johansen <jensj@google.com>	Mon Jan 21 12:10:16 2019 +0000
committer	commit-bot@chromium.org <commit-bot@chromium.org>	Mon Jan 21 12:10:16 2019 +0000
tree	16e22021e6ffb81462b611d972e6de23f120ebad
parent	bc81271f290b24f9f143392044bc3dc080c03ef6 [diff]