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

Unified Diff: pkg/front_end/lib/kernel_generator.dart

Issue 2660553003: Extend front_end API to accept patch files (Closed)
Patch Set: Created 3 years, 11 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
« no previous file with comments | « pkg/front_end/lib/compiler_options.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/front_end/lib/kernel_generator.dart
diff --git a/pkg/front_end/lib/kernel_generator.dart b/pkg/front_end/lib/kernel_generator.dart
index 348d1f9021571c70c7bdbc8b1044a7b91e038f31..40920a652767f2bbd8da968f5e6c5061179635e8 100644
--- a/pkg/front_end/lib/kernel_generator.dart
+++ b/pkg/front_end/lib/kernel_generator.dart
@@ -37,6 +37,17 @@ import 'package:source_span/source_span.dart' show SourceSpan;
/// needed to access the contents of method bodies).
Future<Program> kernelForProgram(Uri source, CompilerOptions options) async {
var loader = await _createLoader(options, entry: source);
+ // TODO(sigmund): delete this. At this time we have no need to explicitly list
+ // VM libraries, since they are normally found by chasing dependencies.
+ // `dart:_builtin` is an exception because it is used by the kernel
+ // transformers to inform the VM about where the main entrypoint is. This is
+ // expected to change, and we should be able to remove these lines at that
+ // point. We check for the presense of `dart:developer` in the targetPatches
+ // to ensure we only load this library while running on the VM.
+ if (options.compileSdk &&
+ options.targetPatches.containsKey(Uri.parse('dart:developer'))) {
+ loader.loadLibrary(Uri.parse('dart:_builtin'));
Siggi Cherem (dart-lang) 2017/01/27 21:55:51 this came up in the context of my other CL where I
+ }
// TODO(sigmund): merge what we have in loadEverything and the logic below in
// kernelForBuildUnit so there is a single place where we crawl for
// dependencies.
@@ -131,8 +142,18 @@ Future<DartLoader> _createLoader(CompilerOptions options,
var packages = await createPackages(
_uriToPath(options.packagesFileUri, options),
discoveryPath: entry?.path);
- return new DartLoader(
+ var loader = new DartLoader(
repository ?? new Repository(), kernelOptions, packages);
+ var patchPaths = {};
+
+ String resolve(Uri patch) =>
+ options.fileSystem.context.fromUri(options.sdkRoot.resolveUri(patch));
Siggi Cherem (dart-lang) 2017/01/27 21:55:51 you'll see in the other CL that this is not used y
Paul Berry 2017/01/27 22:49:19 Add a TODO comment here: we should switch this cod
Siggi Cherem (dart-lang) 2017/01/27 23:00:19 Done.
+
+ options.targetPatches.forEach((uri, patches) {
+ patchPaths['$uri'] = patches.map(resolve).toList();
+ });
+ loader.context.analysisOptions.patchPaths = patchPaths;
+ return loader;
}
DartOptions _convertOptions(CompilerOptions options) {
@@ -144,6 +165,7 @@ DartOptions _convertOptions(CompilerOptions options) {
sdkSummary:
options.compileSdk ? null : _uriToPath(options.sdkSummary, options),
packagePath: _uriToPath(options.packagesFileUri, options),
+ customUriMappings: options.uriOverride,
declaredVariables: options.declaredVariables);
}
« no previous file with comments | « pkg/front_end/lib/compiler_options.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698