Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: pkg/front_end/lib/src/fasta/kernel/kernel_target.dart

Issue 2874723002: Add a way to use shared CanonicalName root to deserialize Program. (Closed)
Patch Set: Always compute canonical names. Use shared name root. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
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 fbb3a9abfbda5ef5f0d55414f527837d4a10b32f..681b628757ee3a3b46da01179cc6ede8192de269 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_target.dart
@@ -372,17 +372,16 @@ class KernelTarget extends TargetImplementation {
Map<String, Source> uriToSource =
new Map<String, Source>.from(this.uriToSource);
- final Program binary = dillTarget.loader.program;
- if (binary != null) {
- libraries.addAll(binary.libraries);
- uriToSource.addAll(binary.uriToSource);
- }
+ libraries.addAll(dillTarget.loader.libraries);
// TODO(ahe): Remove this line. Kernel seems to generate a default line map
// that used when there's no fileUri on an element. Instead, ensure all
// elements have a fileUri.
uriToSource[""] = new Source(<int>[0], const <int>[]);
- Program program = new Program(libraries, uriToSource);
+ Program program = new Program(
+ nameRoot: dillTarget.nameRoot,
Siggi Cherem (dart-lang) 2017/05/12 16:27:57 I think I don't have the full picture yet. I'm cu
scheglov 2017/05/12 17:15:16 Done.
+ libraries: libraries,
+ uriToSource: uriToSource);
if (loader.first != null) {
Builder builder = loader.first.lookup("main", -1, null);
if (builder is KernelProcedureBuilder) {

Powered by Google App Engine
This is Rietveld 408576698