Skip to content

Commit

Permalink
[ddc] Remove unsound dart2js dependency
Browse files Browse the repository at this point in the history
DDC does not depend on the stack trace mapper application being built
with unsound null safety so the unsound .dill files are unused.

Add the unsound .dill files to the `dart2js_bot` target because they
are dependencies of the `dart2js-hostasserts-linux-unsound` and
`dart2js-unit-linux-x64-release` configurations.

Update build step of `front-end-linux-release-x64` configuraton to
build the dart2js_bot target instead of relying on the unsound
dart2js .dill files through the `ddc_stable_test` target.

Change-Id: Ia29740b60f93d1d0b4a978ff5e37080e537401a7
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403382
Reviewed-by: Sigmund Cherem <[email protected]>
Commit-Queue: Nicholas Shahan <[email protected]>
  • Loading branch information
nshahan authored and Commit Queue committed Jan 8, 2025
1 parent b69f6c1 commit c1ce43f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
5 changes: 4 additions & 1 deletion BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,10 @@ group("tools") {
# It must depend on anything that is required by the dart2js
# test suites.
group("dart2js_bot") {
deps = [ ":create_sdk" ]
deps = [
":create_sdk",
"utils/compiler:compile_dart2js_platform_unsound",
]
}

# This rule and the compressed_observatory_archive rule are for the Fuchsia
Expand Down
3 changes: 2 additions & 1 deletion tools/bots/test_matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -677,6 +677,7 @@
"script": "tools/build.py",
"arguments": [
"create_sdk",
"dart2js_bot",
"ddc_stable_test",
"kernel_platform_files",
"runtime"
Expand Down Expand Up @@ -2487,7 +2488,7 @@
"name": "build dart",
"script": "tools/build.py",
"arguments": [
"create_sdk"
"dart2js_bot"
]
},
{
Expand Down
7 changes: 1 addition & 6 deletions utils/ddc/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,11 @@ template("dart2js_compile") {
abs_output = rebase_path(out)

prebuilt_dart_action(target_name) {
deps = invoker.deps + [
"../compiler:compile_dart2js_platform",
"../compiler:compile_dart2js_platform_unsound",
]
deps = invoker.deps + [ "../compiler:compile_dart2js_platform" ]

inputs = [
"$root_out_dir/dart2js_platform.dill",
"$root_out_dir/dart2js_platform_unsound.dill",
"$root_out_dir/dart2js_outline.dill",
"$root_out_dir/dart2js_outline_unsound.dill",
]
outputs = [ out ]

Expand Down

0 comments on commit c1ce43f

Please sign in to comment.