Ensure patch parts know they're patches
Change-Id: I159634af72a34b9537c8d77a2f0a6258d8344bd7
Reviewed-on: https://dart-review.googlesource.com/c/86021
Reviewed-by: Dmitry Stefantsov <dmitryas@google.com>
Commit-Queue: Peter von der Ahé <ahe@google.com>
Auto-Submit: Peter von der Ahé <ahe@google.com>
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
index 424d996..cea63eb 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
@@ -807,8 +807,8 @@
} else {
// If there's more than one patch file, it's interpreted as a part of
// the patch library.
- KernelLibraryBuilder part =
- library.loader.read(patch, -1, fileUri: patch, accessor: first);
+ KernelLibraryBuilder part = library.loader.read(patch, -1,
+ origin: library, fileUri: patch, accessor: library);
first.parts.add(part);
part.partOfUri = first.uri;
}
diff --git a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
index ceae497..bfb77b6 100644
--- a/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/source_library_builder.dart
@@ -675,7 +675,11 @@
this.fileUri, -1, noLength)
]);
} else {
- usedParts.add(part.uri);
+ if (isPatch) {
+ usedParts.add(part.fileUri);
+ } else {
+ usedParts.add(part.uri);
+ }
includePart(part, usedParts);
}
} else {
