languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-19 14:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't invalidate the entry point for no reason

Browse source 
In the incremental compiler we used to invalidate the entry point for
every invocation. This is no longer necessary, and we should stop.

Change-Id: I563bdea53c8ec85657fbb8be96d15ba3a7b57e3c
Reviewed-on: https://dart-review.googlesource.com/c/91824
Reviewed-by: Peter von der Ahé <ahe@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>
This commit is contained in:
Jens Johansen 2019-02-22 10:52:25 +00:00 committed by commit-bot@chromium.org
parent af65aec21f
commit 93eca7745a
3 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
pkg/front_end/lib/src/fasta/incremental_compiler.dart
View file

@ -91,7 +91,7 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
List<LibraryBuilder> platformBuilders;
Map<Uri, LibraryBuilder> userBuilders;
final Uri initializeFromDillUri;
Component componentToInitializeFrom;
final Component componentToInitializeFrom;
bool initializedFromDill = false;
bool hasToCheckPackageUris = false;
Map<Uri, List<DiagnosticMessageFromJson>> remainingComponentProblems =
@ -190,19 +190,6 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
data.initializationBytes = null;
Set<Uri> invalidatedUris = this.invalidatedUris.toSet();
if ((data.includeUserLoadedLibraries &&
componentToInitializeFrom ==
null) // when loading state from component no need to invalidate anything
||
fullComponent) {
invalidatedUris.add(entryPoint);
}
if (componentToInitializeFrom != null) {
// Once compiler was initialized from component, no need to skip logic
// above that adds entryPoint to invalidatedUris for successive
// [computeDelta] calls.
componentToInitializeFrom = null;
}
ClassHierarchy hierarchy = userCode?.loader?.hierarchy;
Set<LibraryBuilder> notReusedLibraries = new Set<LibraryBuilder>();
@ -253,15 +240,16 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
for (LibraryBuilder library in reusedLibraries) {
userCode.loader.builders[library.uri] = library;
if (entryPoint == library.uri) {
userCode.loader.first = library;
}
if (library.uri.scheme == "dart" && library.uri.path == "core") {
userCode.loader.coreLibrary = library;
}
}
entryPoint = userCode.setEntryPoints(<Uri>[entryPoint]).single;
if (userCode.loader.first == null &&
userCode.loader.builders[entryPoint] != null) {
userCode.loader.first = userCode.loader.builders[entryPoint];
}
await userCode.buildOutlines();
// This is not the full component. It is the component including all
@ -332,7 +320,7 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
List<String> reissueComponentProblems(Component componentWithDill) {
// These problems have already been reported.
Set<String> issuedProblems = new Set<String>();
if (componentWithDill.problemsAsJson != null) {
if (componentWithDill?.problemsAsJson != null) {
issuedProblems.addAll(componentWithDill.problemsAsJson);
}
@ -348,7 +336,7 @@ class IncrementalCompiler implements IncrementalKernelGenerator {
}
// Save any new component-problems.
if (componentWithDill.problemsAsJson != null) {
if (componentWithDill?.problemsAsJson != null) {
for (String jsonString in componentWithDill.problemsAsJson) {
DiagnosticMessageFromJson message =
new DiagnosticMessageFromJson.fromJson(jsonString);

4
pkg/front_end/lib/src/fasta/source/source_loader.dart
View file

@ -768,7 +768,9 @@ class SourceLoader extends Loader<Library> {
List<Library> workList = <Library>[];
builders.forEach((Uri uri, LibraryBuilder library) {
if (!library.isPatch &&
(library.loader == this || library.uri.scheme == "dart")) {
(library.loader == this ||
library.uri.scheme == "dart" ||
library == this.first)) {
if (libraries.add(library.target)) {
workList.add(library.target);
}

3
pkg/front_end/test/incremental_utils.dart
View file

@ -12,11 +12,14 @@ List<int> postProcess(Component c) {
return "${l1.fileUri}".compareTo("${l2.fileUri}");
});
c.problemsAsJson?.sort();
c.computeCanonicalNames();
for (Library library in c.libraries) {
library.additionalExports.sort((Reference r1, Reference r2) {
return "${r1.canonicalName}".compareTo("${r2.canonicalName}");
});
library.problemsAsJson?.sort();
}
return serializeComponent(c);