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

Unified Diff: pkg/front_end/lib/src/fasta/compile_platform.dart

Issue 2979463002: Revert "Tweak public APIs and use them in patch_sdk, dart2js, and kernel-service." (Closed)
Patch Set: Created 3 years, 5 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/src/fasta/builder/library_builder.dart ('k') | pkg/front_end/lib/src/fasta/fasta.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/front_end/lib/src/fasta/compile_platform.dart
diff --git a/pkg/front_end/lib/src/fasta/compile_platform.dart b/pkg/front_end/lib/src/fasta/compile_platform.dart
index 5ab6acf899534d534c1c2e97b559ffae5e3820e0..750d2da3d417c46e5905232aa58d87430669fd4f 100644
--- a/pkg/front_end/lib/src/fasta/compile_platform.dart
+++ b/pkg/front_end/lib/src/fasta/compile_platform.dart
@@ -6,24 +6,24 @@ library fasta.compile_platform;
import 'dart:async' show Future;
-import 'dart:io' show exitCode, File;
-
-import '../../compiler_options.dart' show CompilerOptions;
-
-import '../base/processed_options.dart' show ProcessedOptions;
-
-import '../kernel_generator_impl.dart' show generateKernel;
+import 'dart:io' show exitCode;
import 'compiler_command_line.dart' show CompilerCommandLine;
import 'compiler_context.dart' show CompilerContext;
+import 'dill/dill_target.dart' show DillTarget;
+
import 'errors.dart' show InputError;
-import 'kernel/utils.dart' show writeProgramToFile;
+import 'kernel/kernel_target.dart' show KernelTarget;
+
+import 'kernel/utils.dart' show printProgramText, writeProgramToFile;
import 'ticker.dart' show Ticker;
+import 'translate_uri.dart' show TranslateUri;
+
const int iterations = const int.fromEnvironment("iterations", defaultValue: 1);
Future mainEntryPoint(List<String> arguments) async {
@@ -56,31 +56,38 @@ Future compilePlatform(List<String> arguments) async {
Future compilePlatformInternal(CompilerContext c, Ticker ticker, Uri patchedSdk,
Uri fullOutput, Uri outlineOutput) async {
- var options = new CompilerOptions()
- ..strongMode = c.options.strongMode
- ..sdkRoot = patchedSdk
- ..packagesFileUri = c.options.packages
- ..compileSdk = true
- ..chaseDependencies = true
- ..target = c.options.target
- ..debugDump = c.options.dumpIr
- ..verify = c.options.verify
- ..verbose = c.options.verbose;
-
- if (options.strongMode) {
+ if (c.options.strongMode) {
print("Note: strong mode support is preliminary and may not work.");
}
- if (options.verbose) {
+ ticker.isVerbose = c.options.verbose;
+ Uri deps = Uri.base.resolveUri(new Uri.file("${fullOutput.toFilePath()}.d"));
+ ticker.logMs("Parsed arguments");
+ if (ticker.isVerbose) {
print("Generating outline of $patchedSdk into $outlineOutput");
print("Compiling $patchedSdk to $fullOutput");
}
- var result = await generateKernel(
- new ProcessedOptions(options, false, [Uri.parse('dart:core')]),
- buildSummary: true,
- buildProgram: true);
- new File.fromUri(outlineOutput).writeAsBytesSync(result.summary);
+ TranslateUri uriTranslator = await TranslateUri
+ .parse(c.fileSystem, patchedSdk, packages: c.options.packages);
+ ticker.logMs("Read packages file");
+
+ DillTarget dillTarget =
+ new DillTarget(ticker, uriTranslator, c.options.target);
+ KernelTarget kernelTarget =
+ new KernelTarget(c.fileSystem, dillTarget, uriTranslator, c.uriToSource);
+
+ kernelTarget.read(Uri.parse("dart:core"));
+ await dillTarget.buildOutlines();
+ var outline = await kernelTarget.buildOutlines();
+
+ await writeProgramToFile(outline, outlineOutput);
ticker.logMs("Wrote outline to ${outlineOutput.toFilePath()}");
- await writeProgramToFile(result.program, fullOutput);
+
+ if (exitCode != 0) return null;
+
+ var program = await kernelTarget.buildProgram(verify: c.options.verify);
+ if (c.options.dumpIr) printProgramText(program);
+ await writeProgramToFile(program, fullOutput);
ticker.logMs("Wrote program to ${fullOutput.toFilePath()}");
+ await kernelTarget.writeDepsFile(fullOutput, deps);
}
« no previous file with comments | « pkg/front_end/lib/src/fasta/builder/library_builder.dart ('k') | pkg/front_end/lib/src/fasta/fasta.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698