diff --git a/pkg/analyzer_fe_comparison/lib/src/kernel.dart b/pkg/analyzer_fe_comparison/lib/src/kernel.dart index bb87e0b8e59..bb7e3289fc4 100644 --- a/pkg/analyzer_fe_comparison/lib/src/kernel.dart +++ b/pkg/analyzer_fe_comparison/lib/src/kernel.dart @@ -64,7 +64,7 @@ ComparisonNode _diagnosticMessageToNode(DiagnosticMessage message) { CompilerOptions _makeCompilerOptions(Uri packagesFileUri, Uri platformUri, DiagnosticMessageHandler onDiagnostic) { - var targetFlags = TargetFlags(syncAsync: true); + var targetFlags = TargetFlags(); var target = NoneTarget(targetFlags); var fileSystem = StandardFileSystem.instance; diff --git a/pkg/compiler/lib/src/kernel/loader.dart b/pkg/compiler/lib/src/kernel/loader.dart index 4d14f55066a..efd4baf992a 100644 --- a/pkg/compiler/lib/src/kernel/loader.dart +++ b/pkg/compiler/lib/src/kernel/loader.dart @@ -69,7 +69,7 @@ class KernelLoaderTask extends CompilerTask { String platform = '${targetName}_platform.dill'; initializedCompilerState = fe.initializeCompiler( initializedCompilerState, - new Dart2jsTarget(targetName, new TargetFlags()), + new Dart2jsTarget(targetName, new TargetFlags(syncAsync: false)), _options.librariesSpecificationUri, _options.platformBinaries.resolve(platform), _options.packageConfig); diff --git a/pkg/compiler/tool/generate_kernel.dart b/pkg/compiler/tool/generate_kernel.dart index f610317483e..ea923533da3 100644 --- a/pkg/compiler/tool/generate_kernel.dart +++ b/pkg/compiler/tool/generate_kernel.dart @@ -25,7 +25,8 @@ import 'package:kernel/target/targets.dart'; main(List args) async { ArgResults flags = _argParser.parse(args); var options = new CompilerOptions() - ..target = new Dart2jsTarget("dart2js", new TargetFlags(legacyMode: true)) + ..target = new Dart2jsTarget( + "dart2js", new TargetFlags(legacyMode: true, syncAsync: false)) ..packagesFileUri = Uri.base.resolve('.packages') ..setExitCodeOnProblem = true ..linkedDependencies = [ diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart index 126a0c0f0dd..196a03f3a08 100644 --- a/pkg/front_end/lib/src/base/processed_options.dart +++ b/pkg/front_end/lib/src/base/processed_options.dart @@ -290,8 +290,8 @@ class ProcessedOptions { bool get bytecode => _raw.bytecode; Target _target; - Target get target => _target ??= - _raw.target ?? new NoneTarget(new TargetFlags(legacyMode: legacyMode)); + Target get target => _target ??= _raw.target ?? + new NoneTarget(new TargetFlags(legacyMode: legacyMode, syncAsync: false)); /// Get an outline component that summarizes the SDK, if any. // TODO(sigmund): move, this doesn't feel like an "option". diff --git a/pkg/front_end/test/fasta/expression_test.dart b/pkg/front_end/test/fasta/expression_test.dart index 0a895c897f6..c2eacd37623 100644 --- a/pkg/front_end/test/fasta/expression_test.dart +++ b/pkg/front_end/test/fasta/expression_test.dart @@ -388,7 +388,7 @@ Future createContext( final List errors = []; final CompilerOptions optionBuilder = new CompilerOptions() - ..target = new VmTarget(new TargetFlags()) + ..target = new VmTarget(new TargetFlags(syncAsync: false)) ..verbose = true ..fileSystem = fs ..sdkSummary = sdkSummary diff --git a/pkg/front_end/test/fasta/generator_to_string_test.dart b/pkg/front_end/test/fasta/generator_to_string_test.dart index 7580c2a22fd..bb79be55bf4 100644 --- a/pkg/front_end/test/fasta/generator_to_string_test.dart +++ b/pkg/front_end/test/fasta/generator_to_string_test.dart @@ -100,8 +100,11 @@ main() { new KernelTarget( null, false, - new DillTarget(null, null, - new NoneTarget(new TargetFlags(legacyMode: true))), + new DillTarget( + null, + null, + new NoneTarget( + new TargetFlags(legacyMode: true, syncAsync: false))), null) .loader, null, diff --git a/pkg/front_end/test/fasta/incremental_hello_test.dart b/pkg/front_end/test/fasta/incremental_hello_test.dart index 1ac768de291..b9fcf5f111b 100644 --- a/pkg/front_end/test/fasta/incremental_hello_test.dart +++ b/pkg/front_end/test/fasta/incremental_hello_test.dart @@ -35,7 +35,7 @@ void diagnosticMessageHandler(DiagnosticMessage message) { test({bool sdkFromSource}) async { final CompilerOptions optionBuilder = new CompilerOptions() ..packagesFileUri = Uri.base.resolve(".packages") - ..target = new VmTarget(new TargetFlags(legacyMode: true)) + ..target = new VmTarget(new TargetFlags(legacyMode: true, syncAsync: false)) ..legacyMode = true ..onDiagnostic = diagnosticMessageHandler; diff --git a/pkg/front_end/test/fasta/messages_test.dart b/pkg/front_end/test/fasta/messages_test.dart index de25e187ead..650bcc4693b 100644 --- a/pkg/front_end/test/fasta/messages_test.dart +++ b/pkg/front_end/test/fasta/messages_test.dart @@ -461,7 +461,7 @@ class Compile extends Step { new CompilerOptions() ..sdkSummary = computePlatformBinariesLocation(forceBuildDir: true) .resolve("vm_platform_strong.dill") - ..target = new VmTarget(new TargetFlags()) + ..target = new VmTarget(new TargetFlags(syncAsync: false)) ..fileSystem = new HybridFileSystem(suite.fileSystem) ..onDiagnostic = messages.add, main, diff --git a/pkg/front_end/test/fasta/super_mixins_test.dart b/pkg/front_end/test/fasta/super_mixins_test.dart index 03f30afcbdd..d15d9d95af3 100644 --- a/pkg/front_end/test/fasta/super_mixins_test.dart +++ b/pkg/front_end/test/fasta/super_mixins_test.dart @@ -105,7 +105,7 @@ testEnabledSuperMixins() async { var missingSuperMethodNames = new Set(); var options = new CompilerOptions() ..onDiagnostic = _makeDiagnosticMessageHandler(missingSuperMethodNames) - ..target = new NoneTargetWithSuperMixins(new TargetFlags()); + ..target = new NoneTargetWithSuperMixins(new TargetFlags(syncAsync: false)); await compileScript(testSource, options: options); Expect.setEquals( const ['baz', 'foo', 'quux'], missingSuperMethodNames); diff --git a/pkg/front_end/test/fasta/testing/suite.dart b/pkg/front_end/test/fasta/testing/suite.dart index 69fd53dcdfc..3e53a801cd2 100644 --- a/pkg/front_end/test/fasta/testing/suite.dart +++ b/pkg/front_end/test/fasta/testing/suite.dart @@ -291,8 +291,11 @@ class Outline extends Step { CompilerContext.current.disableColors(); Component platform = await context.loadPlatform(); Ticker ticker = new Ticker(); - DillTarget dillTarget = new DillTarget(ticker, context.uriTranslator, - new TestVmTarget(new TargetFlags(legacyMode: legacyMode))); + DillTarget dillTarget = new DillTarget( + ticker, + context.uriTranslator, + new TestVmTarget( + new TargetFlags(legacyMode: legacyMode, syncAsync: false))); dillTarget.loader.appendLibraries(platform); // We create a new URI translator to avoid reading platform libraries from // file system. diff --git a/pkg/front_end/test/fasta/unlinked_scope_test.dart b/pkg/front_end/test/fasta/unlinked_scope_test.dart index e58294cee3c..02cd4b122ca 100644 --- a/pkg/front_end/test/fasta/unlinked_scope_test.dart +++ b/pkg/front_end/test/fasta/unlinked_scope_test.dart @@ -49,8 +49,11 @@ class MockLibraryBuilder extends KernelLibraryBuilder { new KernelTarget( null, false, - new DillTarget(null, null, - new NoneTarget(new TargetFlags(legacyMode: true))), + new DillTarget( + null, + null, + new NoneTarget(new TargetFlags( + legacyMode: true, syncAsync: false))), null) .loader, null, diff --git a/pkg/front_end/test/incremental_load_from_dill_test.dart b/pkg/front_end/test/incremental_load_from_dill_test.dart index 8a1495d4dfe..a27a78c2310 100644 --- a/pkg/front_end/test/incremental_load_from_dill_test.dart +++ b/pkg/front_end/test/incremental_load_from_dill_test.dart @@ -356,7 +356,8 @@ CompilerOptions getOptions(bool strong) { final Uri sdkRoot = computePlatformBinariesLocation(forceBuildDir: true); CompilerOptions options = new CompilerOptions() ..sdkRoot = sdkRoot - ..target = new VmTarget(new TargetFlags(legacyMode: !strong)) + ..target = + new VmTarget(new TargetFlags(legacyMode: !strong, syncAsync: false)) ..librariesSpecificationUri = Uri.base.resolve("sdk/lib/libraries.json") ..onDiagnostic = (DiagnosticMessage message) { if (message.severity == Severity.error || diff --git a/pkg/front_end/tool/_fasta/entry_points.dart b/pkg/front_end/tool/_fasta/entry_points.dart index c5dea7cca86..3f8f6b1f18e 100644 --- a/pkg/front_end/tool/_fasta/entry_points.dart +++ b/pkg/front_end/tool/_fasta/entry_points.dart @@ -346,7 +346,7 @@ Future> computeHostDependencies(Uri hostPlatform) async { // mode), this is only an approximation, albeit accurate. Once Fasta is // self-hosting, this isn't an approximation. Regardless, strong mode // shouldn't affect which files are read. - Target hostTarget = getTarget("vm", new TargetFlags()); + Target hostTarget = getTarget("vm", new TargetFlags(syncAsync: false)); return getDependencies(Platform.script, platform: hostPlatform, target: hostTarget); } diff --git a/pkg/front_end/tool/perf_common.dart b/pkg/front_end/tool/perf_common.dart index a6054ccbe31..5c1d4c5e96c 100644 --- a/pkg/front_end/tool/perf_common.dart +++ b/pkg/front_end/tool/perf_common.dart @@ -71,7 +71,7 @@ DiagnosticMessageHandler onDiagnosticMessageHandler({bool legacyMode: false}) { // legacyMode flag get merged, and we have a single way of specifying the // legacy-mode flag to the FE. Target createTarget({bool isFlutter: false, bool legacyMode: false}) { - var flags = new TargetFlags(legacyMode: legacyMode); + var flags = new TargetFlags(legacyMode: legacyMode, syncAsync: false); if (isFlutter) { return legacyMode ? new LegacyFlutterTarget(flags) diff --git a/pkg/kernel/lib/target/targets.dart b/pkg/kernel/lib/target/targets.dart index c540910c154..2448bb6c1ca 100644 --- a/pkg/kernel/lib/target/targets.dart +++ b/pkg/kernel/lib/target/targets.dart @@ -22,7 +22,7 @@ class TargetFlags { TargetFlags( {this.legacyMode: false, this.treeShake: false, - this.syncAsync: false, + this.syncAsync: true, this.programRoots: const [], this.kernelRuntime}); } diff --git a/pkg/vm/bin/kernel_service.dart b/pkg/vm/bin/kernel_service.dart index b5d7d034224..8d7e15cc801 100644 --- a/pkg/vm/bin/kernel_service.dart +++ b/pkg/vm/bin/kernel_service.dart @@ -87,7 +87,7 @@ abstract class Compiler { options = new CompilerOptions() ..fileSystem = fileSystem - ..target = new VmTarget(new TargetFlags(syncAsync: true)) + ..target = new VmTarget(new TargetFlags()) ..packagesFileUri = packagesUri ..sdkSummary = platformKernelPath ..verbose = verbose diff --git a/pkg/vm/test/common_test_utils.dart b/pkg/vm/test/common_test_utils.dart index 9669536db0c..3423be96416 100644 --- a/pkg/vm/test/common_test_utils.dart +++ b/pkg/vm/test/common_test_utils.dart @@ -32,7 +32,7 @@ Future compileTestCaseToKernelProgram(Uri sourceUri, {Target target, bool enableSuperMixins: false}) async { final platformKernel = computePlatformBinariesLocation().resolve('vm_platform_strong.dill'); - target ??= new TestingVmTarget(new TargetFlags()) + target ??= new TestingVmTarget(new TargetFlags(syncAsync: false)) ..enableSuperMixins = enableSuperMixins; final options = new CompilerOptions() ..target = target diff --git a/pkg/vm/test/incremental_compiler_test.dart b/pkg/vm/test/incremental_compiler_test.dart index 4050a600832..ab74b2af8aa 100644 --- a/pkg/vm/test/incremental_compiler_test.dart +++ b/pkg/vm/test/incremental_compiler_test.dart @@ -29,7 +29,7 @@ main() { final sdkRoot = computePlatformBinariesLocation(); final options = new CompilerOptions() ..sdkRoot = sdkRoot - ..target = new VmTarget(new TargetFlags()) + ..target = new VmTarget(new TargetFlags(syncAsync: false)) ..linkedDependencies = [platformKernel] ..onDiagnostic = (DiagnosticMessage message) { fail("Compilation error: ${message.plainTextFormatted.join('\n')}"); diff --git a/pkg/vm/test/transformations/type_flow/summary_collector_test.dart b/pkg/vm/test/transformations/type_flow/summary_collector_test.dart index 1ec8d87cf1b..c12ecc6e401 100644 --- a/pkg/vm/test/transformations/type_flow/summary_collector_test.dart +++ b/pkg/vm/test/transformations/type_flow/summary_collector_test.dart @@ -49,7 +49,7 @@ class PrintSummaries extends RecursiveVisitor { } runTestCase(Uri source) async { - final Target target = new TestingVmTarget(new TargetFlags()); + final Target target = new TestingVmTarget(new TargetFlags(syncAsync: false)); final Component component = await compileTestCaseToKernelProgram(source); final Library library = component.mainMethod.enclosingLibrary; final CoreTypes coreTypes = new CoreTypes(component); diff --git a/pkg/vm/test/transformations/type_flow/transformer_test.dart b/pkg/vm/test/transformations/type_flow/transformer_test.dart index d031f10f769..e12c97fb205 100644 --- a/pkg/vm/test/transformations/type_flow/transformer_test.dart +++ b/pkg/vm/test/transformations/type_flow/transformer_test.dart @@ -18,7 +18,7 @@ import '../../common_test_utils.dart'; final String pkgVmDir = Platform.script.resolve('../../..').toFilePath(); runTestCase(Uri source) async { - final target = new TestingVmTarget(new TargetFlags()); + final target = new TestingVmTarget(new TargetFlags(syncAsync: false)); Component component = await compileTestCaseToKernelProgram(source, target: target);