Add LibraryLoader.resetLibraries

pkg/compiler/lib/src/library_loader.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.library_loader;
 
 import 'dart:async';
 
 import 'dart2jslib.dart' show
     Compiler,
@@ skipping 137 matching lines @@
   Future<LibraryElement> loadLibrary(Uri resolvedUri);
 
   /// Reset the library loader task to prepare for compilation. If provided,
   /// libraries matching [reuseLibrary] are reused.
   ///
   /// This method is used for incremental compilation.
   void reset({bool reuseLibrary(LibraryElement library)});
 
   /// Asynchronous version of [reset].
   Future resetAsync(Future<bool> reuseLibrary(LibraryElement library));
+
+  /// Similar to [resetAsync] but [reuseLibrary] maps all libraries to a list
+  /// of libraries that can be reused.
+  Future<Null> resetLibraries(
+      Future<Iterable<LibraryElement>> reuseLibraries(

[Johnni Winther, 2015/11/19 10:04:31]

Maybe typedef this to make it more readable.

[ahe, 2015/11/19 11:20:56]

I find typedefs less readable, but if you prefer a typedef, I'll use a typedef.
Let me know.

[Johnni Winther, 2015/11/19 11:25:37]

In this case where the signature is too long, I do:

typedef Future<Iterable<LibraryElement>> ReuseLibrariesFunction(
     Iterable<LibraryElement> libraries));

Future<Null> resetLibraries(ReuseLibrariesFunction reuseLibraries);

[ahe, 2015/11/19 11:33:13]

OK. Calling it *Function helps a bit.

[ahe, 2016/01/08 10:25:23]

Done.

+          Iterable<LibraryElement> libraries));
+
 }
 
 /// Handle for creating synthesized/patch libraries during library loading.
 abstract class LibraryLoader {
   /// This method must be called when a new synthesized/patch library has been
   /// created to ensure that [library] will part of library dependency graph
   /// used for computing import/export scopes.
   void registerNewLibrary(LibraryElement library);
 
   /// This method must be called when a new synthesized/patch library has been
@@ skipping 149 matching lines @@
               'Uncaught exception in reuseLibrary', exception, trace);
           rethrow;
         }
       }
 
       List<Future<LibraryElement>> reusedLibrariesFuture =
           compiler.reuseLibraryTask.measure(
               () => libraryCanonicalUriMap.values.map(wrapper).toList());
 
       return Future.wait(reusedLibrariesFuture).then(
-          (List<LibraryElement> reusedLibraries) {
+          (Iterable<LibraryElement> reusedLibraries) {
             resetImplementation(reusedLibraries.where((e) => e != null));
           });
     });
   }
 
+  Future<Null> resetLibraries(
+      Future<Iterable<LibraryElement>> reuseLibraries(
+          Iterable<LibraryElement> libraries)) {
+    assert(currentHandler == null);
+    return compiler.reuseLibraryTask.measure(() {
+      return new Future<Iterable<LibraryElement>>(() {
+        // Wrap in Future to shield against errors in user code.
+        return reuseLibraries(libraryCanonicalUriMap.values);
+      }).catchError((exception, StackTrace trace) {
+        compiler.diagnoseCrashInUserCode(
+            'Uncaught exception in reuseLibraries', exception, trace);
+        throw exception; // Async rethrow.
+      }).then((Iterable<LibraryElement> reusedLibraries) {
+        measure(() {
+          resetImplementation(reusedLibraries);
+        });
+      });
+    });
+  }
+
   /// Insert [library] in the internal maps. Used for compiler reuse.
   void mapLibrary(LibraryElement library) {
     libraryCanonicalUriMap[library.canonicalUri] = library;
 
     Uri resourceUri = library.entryCompilationUnit.script.resourceUri;
     libraryResourceUriMap[resourceUri] = library;
 
     String name = library.getLibraryOrScriptName();
     libraryNames[name] = library;
   }
@@ skipping 873 matching lines @@
         }
         suffixes.add(const Link<Uri>().prepend(canonicalUri));
       }
       suffixChainMap[library] = suffixes;
       return;
     }
 
     computeSuffixes(rootLibrary, const Link<Uri>());
   }
 }