diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn index 3263ccb1f5a..5d8dbe01045 100644 --- a/runtime/bin/BUILD.gn +++ b/runtime/bin/BUILD.gn @@ -552,9 +552,7 @@ gen_snapshot_action("generate_snapshot_bin") { ] args = [] if (use_nnbd) { - # TODO(sigmund): reenable this flag once the CFE can build targets without - # issues. - # args += [ "--enable-experiment=non-nullable" ] + args += [ "--enable-experiment=non-nullable" ] } args += [ "--deterministic", diff --git a/runtime/vm/BUILD.gn b/runtime/vm/BUILD.gn index 1b76c4eea3e..153726c840d 100644 --- a/runtime/vm/BUILD.gn +++ b/runtime/vm/BUILD.gn @@ -153,9 +153,7 @@ template("gen_vm_platform") { "-Ddart.isVM=true", ] if (use_nnbd) { - # TODO(sigmund): reenable this flag once the CFE can build targets without - # issues. - # args += [ "--enable-experiment=non-nullable" ] + args += [ "--enable-experiment=non-nullable" ] } if (defined(invoker.exclude_source) && invoker.exclude_source) { args += [ "--exclude-source" ] diff --git a/sdk_nnbd/bin/dartdevc b/sdk_nnbd/bin/dartdevc index 5b75ad2fdec..c2c25d903ab 100755 --- a/sdk_nnbd/bin/dartdevc +++ b/sdk_nnbd/bin/dartdevc @@ -45,4 +45,4 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)" DEV_COMPILER="$DART_ROOT/pkg/dev_compiler/bin/dartdevc.dart" -exec "$DART" "--packages=$DART_ROOT/.packages" "${EXTRA_VM_OPTIONS[@]}" "$DEV_COMPILER" "$SDK_ARG" "$@" +exec "$DART" "--packages=$DART_ROOT/.packages" --enable_experiment=non-nullable "${EXTRA_VM_OPTIONS[@]}" "$DEV_COMPILER" "$SDK_ARG" "$@" diff --git a/sdk_nnbd/bin/dartdevc_sdk b/sdk_nnbd/bin/dartdevc_sdk index 6cba7d8a096..c687bdd9472 100755 --- a/sdk_nnbd/bin/dartdevc_sdk +++ b/sdk_nnbd/bin/dartdevc_sdk @@ -35,4 +35,4 @@ if [[ $DART_VM_OPTIONS ]]; then EXTRA_VM_OPTIONS+=("${OPTIONS[@]}") fi -exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$SNAPSHOT" "$@" +exec "$DART" --enable_experiment=non-nullable "${EXTRA_VM_OPTIONS[@]}" "$SNAPSHOT" "$@" diff --git a/utils/application_snapshot.gni b/utils/application_snapshot.gni index c012046090b..50b90afad5d 100644 --- a/utils/application_snapshot.gni +++ b/utils/application_snapshot.gni @@ -4,6 +4,7 @@ import("../build/dart/dart_action.gni") import("../runtime/runtime_args.gni") +import("../sdk_args.gni") _dart_root = get_path_info("..", "abspath") @@ -146,6 +147,10 @@ template("_application_snapshot") { "--snapshot-depfile=$abs_depfile", ] + snapshot_vm_args + if (use_nnbd) { + vm_args += [ "--enable-experiment=non-nullable" ] + } + if (dart_snapshot_kind == "kernel") { vm_args += [ "--snapshot-kind=kernel" ] assert(training_args != "", "Ignoring unused argument")