Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-debug/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ENV RUST_CONFIGURE_ARGS \
--build=x86_64-unknown-linux-gnu \
--enable-debug \
--enable-lld \
--set rust.debuginfo-level-tests=1 \
--set rust.debuginfo-level-tests=2 \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark: (not against this change) I seem to recall that there are meaningful differences between debuginfo level 1 and 2 (in that some bugs are present only at specific debuginfo levels)...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that testing both level 1 and level 2 give the most test coverage, but I also suspect that only level 2 will be sufficient in practice.

If we end up getting a lot of debuginfo level 1-specific problems I think we should look into testing both levels in CI.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, let's see if there are a few specific-to-1 problems.

--set llvm.use-linker=lld \
--set target.x86_64-unknown-linux-gnu.linker=clang \
--set target.x86_64-unknown-linux-gnu.cc=clang \
Expand Down
2 changes: 2 additions & 0 deletions tests/ui/async-await/future-sizes/async-awaiting-fut.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
//@ compile-flags: -C debuginfo=0
//@ compile-flags: -C panic=abort -Z print-type-sizes --crate-type lib
//@ needs-deterministic-layouts
//@ edition:2021
Expand Down
2 changes: 2 additions & 0 deletions tests/ui/async-await/future-sizes/large-arg.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
//@ compile-flags: -C debuginfo=0
//@ compile-flags: -C panic=abort -Z print-type-sizes --crate-type=lib
//@ needs-deterministic-layouts
//@ edition: 2021
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
error[E0080]: evaluation panicked: explicit panic
--> $DIR/collect-in-promoted-const.rs:9:19
--> $DIR/collect-in-promoted-const.rs:11:19
|
LL | const C: () = panic!();
| ^^^^^^^^ evaluation of `Fail::<i32>::C` failed here

note: erroneous constant encountered
--> $DIR/collect-in-promoted-const.rs:20:21
--> $DIR/collect-in-promoted-const.rs:22:21
|
LL | let _val = &Fail::<T>::C;
| ^^^^^^^^^^^^

note: the above error was encountered while instantiating `fn f::<i32>`
--> $DIR/collect-in-promoted-const.rs:25:5
--> $DIR/collect-in-promoted-const.rs:27:5
|
LL | f::<i32>();
| ^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
error[E0080]: evaluation panicked: explicit panic
--> $DIR/collect-in-promoted-const.rs:9:19
--> $DIR/collect-in-promoted-const.rs:11:19
|
LL | const C: () = panic!();
| ^^^^^^^^ evaluation of `Fail::<T>::C` failed here

note: erroneous constant encountered
--> $DIR/collect-in-promoted-const.rs:20:21
--> $DIR/collect-in-promoted-const.rs:22:21
|
LL | let _val = &Fail::<T>::C;
| ^^^^^^^^^^^^

error[E0080]: evaluation panicked: explicit panic
--> $DIR/collect-in-promoted-const.rs:9:19
--> $DIR/collect-in-promoted-const.rs:11:19
|
LL | const C: () = panic!();
| ^^^^^^^^ evaluation of `Fail::<i32>::C` failed here

note: erroneous constant encountered
--> $DIR/collect-in-promoted-const.rs:20:21
--> $DIR/collect-in-promoted-const.rs:22:21
|
LL | let _val = &Fail::<T>::C;
| ^^^^^^^^^^^^
|
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

note: the above error was encountered while instantiating `fn f::<i32>`
--> $DIR/collect-in-promoted-const.rs:25:5
--> $DIR/collect-in-promoted-const.rs:27:5
|
LL | f::<i32>();
| ^^^^^^^^^^
Expand Down
2 changes: 2 additions & 0 deletions tests/ui/consts/required-consts/collect-in-promoted-const.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
//@revisions: noopt opt
//@ build-fail
//@[noopt] compile-flags: -Copt-level=0
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
//@[opt] compile-flags: -C debuginfo=0
//@[opt] compile-flags: -O
//! Make sure we error on erroneous consts even if they get promoted.

Expand Down
2 changes: 2 additions & 0 deletions tests/ui/print_type_sizes/async.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// FIXME(#61117): Respect debuginfo-level-tests, do not force debuginfo=0
//@ compile-flags: -C debuginfo=0
//@ compile-flags: -C panic=abort -Z print-type-sizes --crate-type lib
//@ needs-deterministic-layouts
//@ edition:2021
Expand Down
Loading