From b9469f452a85de5cfa423b17e94ca71fef695835 Mon Sep 17 00:00:00 2001 From: Nicholas Shahan Date: Wed, 21 Dec 2022 23:35:45 +0000 Subject: [PATCH] [ddc] Always explicitly pass null safety mode Add explicit mode flags for DDC related compiles. Change-Id: Icb9e21a4b8786a0de620bcc387cafbe8d27d0e86 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/277042 Reviewed-by: Nate Bosch Commit-Queue: Nicholas Shahan Reviewed-by: Mark Zhou --- pkg/dev_compiler/test/modular_suite.dart | 4 ++-- pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart | 1 + pkg/dev_compiler/tool/ddb | 2 +- pkg/test_runner/lib/src/compiler_configuration.dart | 5 ++++- tools/bots/test_matrix.json | 2 ++ utils/dartdevc/BUILD.gn | 8 +++++++- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkg/dev_compiler/test/modular_suite.dart b/pkg/dev_compiler/test/modular_suite.dart index 61133497a6b..9f2bb08ae4e 100644 --- a/pkg/dev_compiler/test/modular_suite.dart +++ b/pkg/dev_compiler/test/modular_suite.dart @@ -87,7 +87,6 @@ class SourceToSummaryDillStep implements IOModularStep { extraArgs = [ '--libraries-file', '$rootScheme:///sdk/lib/libraries.json', - '--no-sound-null-safety', ]; assert(transitiveDependencies.isEmpty); } else { @@ -111,6 +110,7 @@ class SourceToSummaryDillStep implements IOModularStep { '--multi-root-scheme', rootScheme, ...extraArgs, + '--no-sound-null-safety', '--output', '${toUri(module, dillId)}', if (!module.isSdk) ...[ @@ -175,7 +175,6 @@ class DDCStep implements IOModularStep { '--compile-sdk', '--libraries-file', '$rootScheme:///sdk/lib/libraries.json', - '--no-sound-null-safety', ]; assert(transitiveDependencies.isEmpty); } else { @@ -206,6 +205,7 @@ class DDCStep implements IOModularStep { rootScheme, ...sources, ...extraArgs, + '--no-sound-null-safety', for (String flag in flags) '--enable-experiment=$flag', ...transitiveDependencies .where((m) => !m.isSdk) diff --git a/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart b/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart index 94bf1f8b1c6..a402e5dfbd3 100644 --- a/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart +++ b/pkg/dev_compiler/test/sourcemap/sourcemaps_ddk_suite.dart @@ -65,6 +65,7 @@ class DevCompilerRunner implements CompilerRunner { '--packages=$packageConfigPath', '--modules=es6', '--dart-sdk-summary=${ddcSdkSummary.path}', + '--no-sound-null-safety', '-o', outputFile.toFilePath(), inputFile.toFilePath() diff --git a/pkg/dev_compiler/tool/ddb b/pkg/dev_compiler/tool/ddb index 3d2aab5e61d..2267a6f3b90 100755 --- a/pkg/dev_compiler/tool/ddb +++ b/pkg/dev_compiler/tool/ddb @@ -239,7 +239,7 @@ void main(List args) async { '--dart-sdk-summary=$sdkOutlineDill', for (var summary in summaries) '--summary=$summary', for (var experiment in experiments) '--enable-experiment=$experiment', - if (soundNullSafety) '--sound-null-safety', + if (soundNullSafety) '--sound-null-safety' else '--no-sound-null-safety', if (options['packages'] != null) '--packages=${options['packages']}', if (emitDebugSymbols) '--emit-debug-symbols', if (canaryFeatures) '--canary', diff --git a/pkg/test_runner/lib/src/compiler_configuration.dart b/pkg/test_runner/lib/src/compiler_configuration.dart index 968a0fa79ab..a231ffcf47f 100644 --- a/pkg/test_runner/lib/src/compiler_configuration.dart +++ b/pkg/test_runner/lib/src/compiler_configuration.dart @@ -606,7 +606,10 @@ class DevCompilerConfiguration extends CompilerConfiguration { ..._configuration.sharedOptions, ..._experimentsArgument(_configuration, testFile), ...testFile.ddcOptions, - if (_configuration.nnbdMode == NnbdMode.strong) '--sound-null-safety', + if (_configuration.nnbdMode == NnbdMode.strong) + '--sound-null-safety' + else + '--no-sound-null-safety', if (_configuration.configuration.builderTag == 'canary') '--canary', // The file being compiled is the last argument. args.last diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json index 2d75741070f..7ed4cdadb12 100644 --- a/tools/bots/test_matrix.json +++ b/tools/bots/test_matrix.json @@ -2418,6 +2418,7 @@ "--enable-asserts", "pkg/dev_compiler/bin/dartdevc.dart", "-k", + "--sound-null-safety", "-o", "out/ReleaseX64/dartdevk.js", "pkg/dev_compiler/bin/dartdevc.dart" @@ -2673,6 +2674,7 @@ "--enable-asserts", "pkg/dev_compiler/bin/dartdevc.dart", "-k", + "--sound-null-safety", "-o", "xcodebuild/ReleaseX64/dartdevk.js", "pkg/dev_compiler/bin/dartdevc.dart" diff --git a/utils/dartdevc/BUILD.gn b/utils/dartdevc/BUILD.gn index d2bcd693afd..341ef140c01 100644 --- a/utils/dartdevc/BUILD.gn +++ b/utils/dartdevc/BUILD.gn @@ -29,7 +29,7 @@ application_snapshot("dartdevc") { rebase_path("../../sdk"), "--dart-sdk-summary", rebase_path(sdk_outline_dill), - "-k", + "--no-sound-null-safety", "-o", "dartdevc.js", rebase_path("../../pkg/dev_compiler/bin/dartdevc.dart"), @@ -218,6 +218,8 @@ template("dartdevc_kernel_compile") { if (invoker.sound_null_safety) { args += [ "--sound-null-safety" ] + } else { + args += [ "--no-sound-null-safety" ] } } } @@ -288,6 +290,8 @@ template("compile_dartdevc_platform") { sdk_outline_sound_dill, ] } else { + args += [ "--nnbd-weak" ] + outputs = [ sdk_full_dill, sdk_outline_dill, @@ -368,6 +372,8 @@ template("dartdevc_sdk_js") { if (invoker.sound_null_safety) { args += [ "--sound-null-safety" ] + } else { + args += [ "--no-sound-null-safety" ] } if (ddc_canary) {