Add support for SDK outline in IKG.

pkg/front_end/test/incremental_kernel_generator_test.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 
 import 'package:front_end/compiler_options.dart';
 import 'package:front_end/incremental_kernel_generator.dart';
 import 'package:front_end/memory_file_system.dart';
 import 'package:front_end/src/incremental/byte_store.dart';
 import 'package:front_end/src/incremental_kernel_generator_impl.dart';
+import 'package:front_end/summary_generator.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/text/ast_to_text.dart';
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
 import 'src/incremental/mock_sdk.dart';
 
 main() {
   defineReflectiveSuite(() {
     defineReflectiveTests(IncrementalKernelGeneratorTest);
   });
 }
 
 @reflectiveTest
 class IncrementalKernelGeneratorTest {
   /// Virtual filesystem for testing.
   final fileSystem = new MemoryFileSystem(Uri.parse('file:///'));
 
   /// The used file watcher.
   WatchUsedFilesFn watchFn = (uri, used) {};
 
   /// The object under test.
   IncrementalKernelGeneratorImpl incrementalKernelGenerator;
 
   /// Compute the initial [Program] for the given [entryPoint].
   Future<Program> getInitialState(Uri entryPoint,
-      {bool setPackages: true}) async {
+      {Uri sdkOutlineUri, bool setPackages: true}) async {
     createSdkFiles(fileSystem);
     // TODO(scheglov) Builder the SDK kernel and set it into the options.
 
     var compilerOptions = new CompilerOptions()
       ..fileSystem = fileSystem
       ..byteStore = new MemoryByteStore()
 //      ..logger = new PerformanceLog(stdout)
       ..strongMode = true
       ..chaseDependencies = true
-      ..librariesSpecificationUri = Uri.parse('file:///sdk/lib/libraries.json');
+      ..librariesSpecificationUri = Uri.parse('file:///sdk/lib/libraries.json')
+      ..sdkSummary = sdkOutlineUri;
 
     if (setPackages) {
       compilerOptions.packagesFileUri = Uri.parse('file:///test/.packages');
     }
     incrementalKernelGenerator = await IncrementalKernelGenerator
         .newInstance(compilerOptions, entryPoint, watch: watchFn);
     return (await incrementalKernelGenerator.computeDelta()).newProgram;
   }
 
   test_compile_chain() async {
@@ skipping 108 matching lines @@
       Program program = delta.newProgram;
       _assertLibraryUris(program,
           includes: [aUri, bUri, cUri],
           excludes: [dUri, Uri.parse('dart:core')]);
       // While a.dart and b.dart are is included (VM needs them), they were not
       // recompiled, because the change to c.dart was in the function body.
       _assertCompiledUris([cUri]);
     }
   }
 
+  solo_test_compile_useSdkOutline() async {

[Paul Berry, 2017/08/07 18:37:13]

Remove "solo_"

[scheglov, 2017/08/07 20:47:51]

Done.

+    createSdkFiles(fileSystem);
+    List<int> sdkOutlineBytes = await _computeSdkOutlineBytes();
+
+    Uri sdkOutlineUri = Uri.parse('file:///sdk/outline.dill');
+    fileSystem.entityForUri(sdkOutlineUri).writeAsBytesSync(sdkOutlineBytes);
+
+    writeFile('/test/.packages', 'test:lib/');
+    String path = '/test/lib/test.dart';
+    Uri uri = writeFile(path, r'''
+import 'dart:async';
+var a = 1;
+Future<String> b;
+''');
+
+    Program program = await getInitialState(uri, sdkOutlineUri: sdkOutlineUri);
+    _assertLibraryUris(program,
+        includes: [uri], excludes: [Uri.parse('dart:core')]);
+
+    Library library = _getLibrary(program, uri);
+    expect(_getLibraryText(library), r'''library;
+import self as self;
+import "dart:core" as core;
+import "dart:async" as asy;
+
+static field core::int a = 1;
+static field asy::Future<core::String> b;
+''');
+  }

[Siggi Cherem (dart-lang), 2017/08/07 19:12:52]

consider adding a test that we don't use the summary when we don't intend to.
Maybe by testing that you can modify the sdk itself (which I expect will show a
change in one scenario, but not in the other)?

[scheglov, 2017/08/07 20:47:51]

Hm...
We could do this, but it seems a bit stretched.
When we don't intend to use it, we don't pass "sdkOutlineUri".

+
+  test_inferPackagesFile() async {
+    writeFile('/test/.packages', 'test:lib/');
+    String aPath = '/test/lib/a.dart';
+    String bPath = '/test/lib/b.dart';
+    writeFile(aPath, 'var a = 1;');
+    Uri bUri = writeFile(bPath, r'''
+import "package:test/a.dart";
+var b = a;
+''');
+
+    // Ensures that the `.packages` file can be discovered automatically
+    // from the entry point file.
+    Program program = await getInitialState(bUri, setPackages: false);
+    Library library = _getLibrary(program, bUri);
+    expect(_getLibraryText(library), r'''
+library;
+import self as self;
+import "dart:core" as core;
+import "package:test/a.dart" as a;
+
+static field core::int b = a::a;
+''');
+  }
+
   test_updateEntryPoint() async {
     writeFile('/test/.packages', 'test:lib/');
     String path = '/test/lib/test.dart';
     Uri uri = writeFile(path, r'''
 main() {
   var v = 1;
 }
 ''');
 
     String initialText = r'''
@@ skipping 38 matching lines @@
 import self as self;
 import "dart:core" as core;
 
 static method main() → dynamic {
   core::double v = 2.3;
 }
 ''');
     }
   }
 
-  test_inferPackagesFile() async {
-    writeFile('/test/.packages', 'test:lib/');
-    String aPath = '/test/lib/a.dart';
-    String bPath = '/test/lib/b.dart';
-    writeFile(aPath, 'var a = 1;');
-    Uri bUri = writeFile(bPath, r'''
-import "package:test/a.dart";
-var b = a;
-''');
-
-    // Ensures that the `.packages` file can be discovered automatically
-    // from the entry point file.
-    Program program = await getInitialState(bUri, setPackages: false);
-    Library library = _getLibrary(program, bUri);
-    expect(_getLibraryText(library), r'''
-library;
-import self as self;
-import "dart:core" as core;
-import "package:test/a.dart" as a;
-
-static field core::int b = a::a;
-''');
-  }
-
   test_watch() async {
     writeFile('/test/.packages', 'test:lib/');
     String aPath = '/test/lib/a.dart';
     String bPath = '/test/lib/b.dart';
     String cPath = '/test/lib/c.dart';
     Uri aUri = writeFile(aPath, '');
     Uri bUri = writeFile(bPath, '');
     Uri cUri = writeFile(cPath, r'''
 import 'a.dart';
 ''');
@@ skipping 95 matching lines @@
     List<Uri> libraryUris =
         program.libraries.map((library) => library.importUri).toList();
     for (var shouldInclude in includes) {
       expect(libraryUris, contains(shouldInclude));
     }
     for (var shouldExclude in excludes) {
       expect(libraryUris, isNot(contains(shouldExclude)));
     }
   }
 
+  Future<List<int>> _computeSdkOutlineBytes() async {
+    var options = new CompilerOptions()
+      ..fileSystem = fileSystem
+      ..sdkRoot = Uri.parse('file:///sdk/')
+      ..compileSdk = true
+      ..chaseDependencies = true
+      ..strongMode = true;
+    var inputs = [Uri.parse('dart:core')];
+    return summaryFor(inputs, options);
+  }
+
   Library _getLibrary(Program program, Uri uri) {
     for (var library in program.libraries) {
       if (library.importUri == uri) return library;
     }
     throw fail('No library found with URI "$uri"');
   }
 
   String _getLibraryText(Library library) {
     StringBuffer buffer = new StringBuffer();
     new Printer(buffer, syntheticNames: new NameSystem())
         .writeLibraryFile(library);
     return buffer.toString();
   }
 }