[cfe] Prepare compiler_common for use in annotated code tests

Change-Id: I99b52ad25fdbde7b2211f29795cfaad32b90c09f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/108405
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/front_end/lib/src/api_prototype/kernel_generator.dart

@@ -18,7 +18,7 @@ import '../fasta/fasta_codes.dart' show messageMissingMain, noLength;
 import '../fasta/severity.dart' show Severity;
 
 import '../kernel_generator_impl.dart'
-    show generateKernel, generateKernelInternal;
+    show CompilerResult, generateKernel, generateKernelInternal;
 
 import 'compiler_options.dart' show CompilerOptions;
 
@@ -43,9 +43,17 @@ import 'compiler_options.dart' show CompilerOptions;
 /// an error is reported.
 // TODO(sigmund): rename to kernelForScript?
 Future<Component> kernelForProgram(Uri source, CompilerOptions options) async {
+  return (await kernelForProgramInternal(source, options))?.component;
+}
+
+Future<CompilerResult> kernelForProgramInternal(
+    Uri source, CompilerOptions options,
+    {bool retainDataForTesting: false}) async {
   var pOptions = new ProcessedOptions(options: options, inputs: [source]);
   return await CompilerContext.runWithOptions(pOptions, (context) async {
-    var component = (await generateKernelInternal())?.component;
+    CompilerResult result = await generateKernelInternal(
+        retainDataForTesting: retainDataForTesting);
+    var component = result?.component;
     if (component == null) return null;
 
     if (component.mainMethod == null) {
@@ -54,7 +62,7 @@ Future<Component> kernelForProgram(Uri source, CompilerOptions options) async {
           Severity.error);
       return null;
     }
-    return component;
+    return result;
   });
 }
 

pkg/front_end/lib/src/kernel_generator_impl.dart

@@ -50,7 +50,8 @@ Future<CompilerResult> generateKernelInternal(
     {bool buildSummary: false,
     bool buildComponent: true,
     bool truncateSummary: false,
-    bool includeOffsets: true}) async {
+    bool includeOffsets: true,
+    bool retainDataForTesting: false}) async {
   var options = CompilerContext.current.options;
   var fs = options.fileSystem;
 
@@ -159,7 +160,8 @@ Future<CompilerResult> generateKernelInternal(
     return new CompilerResult(
         summary: summary,
         component: component,
-        deps: new List<Uri>.from(CompilerContext.current.dependencies));
+        deps: new List<Uri>.from(CompilerContext.current.dependencies),
+        kernelTargetForTesting: retainDataForTesting ? kernelTarget : null);
   }, () => sourceLoader?.currentUriForCrashReporting ?? options.inputs.first);
 }
 
@@ -177,5 +179,11 @@ class CompilerResult {
   /// using the compiler itself.
   final List<Uri> deps;
 
-  CompilerResult({this.summary, this.component, this.deps});
+  /// The [KernelTarget] used to generated the component.
+  ///
+  /// This is only provided for use in testing.
+  final KernelTarget kernelTargetForTesting;
+
+  CompilerResult(
+      {this.summary, this.component, this.deps, this.kernelTargetForTesting});
 }

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

@@ -10,7 +10,11 @@ import 'dart:async' show Future;
 import 'package:kernel/ast.dart' show Library, Component;
 
 import '../api_prototype/front_end.dart'
-    show CompilerOptions, kernelForComponent, kernelForProgram, summaryFor;
+    show
+        CompilerOptions,
+        kernelForComponent,
+        kernelForProgramInternal,
+        summaryFor;
 
 import '../api_prototype/memory_file_system.dart' show MemoryFileSystem;
 
@@ -19,18 +23,21 @@ import '../compute_platform_binaries_location.dart'
 
 import '../fasta/hybrid_file_system.dart' show HybridFileSystem;
 
+import '../kernel_generator_impl.dart' show CompilerResult;
+
 /// Generate kernel for a script.
 ///
 /// [scriptOrSources] can be a String, in which case it is the script to be
 /// compiled, or a Map containing source files. In which case, this function
 /// compiles the entry whose name is [fileName].
 ///
 /// Wraps [kernelForProgram] with some default testing options (see [setup]).
-Future<Component> compileScript(dynamic scriptOrSources,
+Future<CompilerResult> compileScript(dynamic scriptOrSources,
     {fileName: 'main.dart',
     List<String> inputSummaries: const [],
     List<String> linkedDependencies: const [],
-    CompilerOptions options}) async {
+    CompilerOptions options,
+    bool retainDataForTesting: false}) async {
   options ??= new CompilerOptions();
   Map<String, dynamic> sources;
   if (scriptOrSources is String) {
@@ -41,10 +48,11 @@ Future<Component> compileScript(dynamic scriptOrSources,
   }
   await setup(options, sources,
       inputSummaries: inputSummaries, linkedDependencies: linkedDependencies);
-  return await kernelForProgram(toTestUri(fileName), options);
+  return await kernelForProgramInternal(toTestUri(fileName), options,
+      retainDataForTesting: retainDataForTesting);
 }
 
-/// Generate a component for a modular complation unit.
+/// Generate a component for a modular compilation unit.
 ///
 /// Wraps [kernelForComponent] with some default testing options (see [setup]).
 Future<Component> compileUnit(List<String> inputs, Map<String, dynamic> sources,

pkg/front_end/test/fasta/assert_locations_test.dart

@@ -137,8 +137,9 @@ void main() {
         Expect.fail(
             "Unexpected message: ${message.plainTextFormatted.join('\n')}");
       };
-    Component p = await compileScript(test.source,
-        options: options, fileName: 'synthetic-test.dart');
+    Component p = (await compileScript(test.source,
+            options: options, fileName: 'synthetic-test.dart'))
+        ?.component;
     Expect.isNotNull(p);
     VerifyingVisitor visitor = new VerifyingVisitor(test);
     p.mainMethod.enclosingLibrary.accept(visitor);

pkg/front_end/test/kernel_generator_test.dart

@@ -43,8 +43,9 @@ main() {
         ..compileSdk = true // To prevent FE from loading an sdk-summary.
         ..onDiagnostic = errors.add;
 
-      var component =
-          await compileScript('main() => print("hi");', options: options);
+      Component component =
+          (await compileScript('main() => print("hi");', options: options))
+              ?.component;
       expect(component, isNotNull);
       expect(errors, isNotEmpty);
     });
@@ -56,8 +57,9 @@ main() {
             Uri.parse('org-dartlang-test:///not_existing_summary_file')
         ..onDiagnostic = errors.add;
 
-      var component =
-          await compileScript('main() => print("hi");', options: options);
+      Component component =
+          (await compileScript('main() => print("hi");', options: options))
+              ?.component;
       expect(component, isNotNull);
       expect(errors, isNotEmpty);
     });
@@ -69,8 +71,9 @@ main() {
         // contains broken URIs to ensure we do not attempt to lookup for
         // sources of the sdk directly.
         ..librariesSpecificationUri = invalidCoreLibsSpecUri;
-      var component =
-          await compileScript('main() => print("hi");', options: options);
+      Component component =
+          (await compileScript('main() => print("hi");', options: options))
+              ?.component;
       var core = component.libraries.firstWhere(isDartCoreLibrary);
       var printMember = core.members.firstWhere((m) => m.name.name == 'print');
 
@@ -87,8 +90,10 @@ main() {
     });
 
     test('generated program contains source-info', () async {
-      var component = await compileScript('a() => print("hi"); main() {}',
-          fileName: 'a.dart');
+      Component component = (await compileScript(
+              'a() => print("hi"); main() {}',
+              fileName: 'a.dart'))
+          ?.component;
       // Kernel always store an empty '' key in the map, so there is always at
       // least one. Having more means that source-info is added.
       expect(component.uriToSource.keys.length, greaterThan(1));
@@ -98,8 +103,10 @@ main() {
     });
 
     test('code from summary dependencies are marked external', () async {
-      var component = await compileScript('a() => print("hi"); main() {}',
-          fileName: 'a.dart');
+      Component component = (await compileScript(
+              'a() => print("hi"); main() {}',
+              fileName: 'a.dart'))
+          ?.component;
       for (var lib in component.libraries) {
         if (lib.importUri.scheme == 'dart') {
           expect(lib.isExternal, isTrue);
@@ -108,36 +115,40 @@ main() {
 
       // Pretend that the compiled code is a summary
       var bytes = serializeComponent(component);
-      component = await compileScript(
-          {
-            'b.dart': 'import "a.dart" as m; b() => m.a(); main() {}',
-            'summary.dill': bytes
-          },
-          fileName: 'b.dart',
-          inputSummaries: ['summary.dill']);
+      component = (await compileScript(
+              {
+                'b.dart': 'import "a.dart" as m; b() => m.a(); main() {}',
+                'summary.dill': bytes
+              },
+              fileName: 'b.dart',
+              inputSummaries: ['summary.dill']))
+          ?.component;
 
       var aLib = component.libraries
           .firstWhere((lib) => lib.importUri.path == '/a/b/c/a.dart');
       expect(aLib.isExternal, isTrue);
     });
 
     test('code from linked dependencies are not marked external', () async {
-      var component = await compileScript('a() => print("hi"); main() {}',
-          fileName: 'a.dart');
+      Component component = (await compileScript(
+              'a() => print("hi"); main() {}',
+              fileName: 'a.dart'))
+          ?.component;
       for (var lib in component.libraries) {
         if (lib.importUri.scheme == 'dart') {
           expect(lib.isExternal, isTrue);
         }
       }
 
       var bytes = serializeComponent(component);
-      component = await compileScript(
-          {
-            'b.dart': 'import "a.dart" as m; b() => m.a(); main() {}',
-            'link.dill': bytes
-          },
-          fileName: 'b.dart',
-          linkedDependencies: ['link.dill']);
+      component = (await compileScript(
+              {
+                'b.dart': 'import "a.dart" as m; b() => m.a(); main() {}',
+                'link.dill': bytes
+              },
+              fileName: 'b.dart',
+              linkedDependencies: ['link.dill']))
+          ?.component;
 
       var aLib = component.libraries
           .firstWhere((lib) => lib.importUri.path == '/a/b/c/a.dart');