Skip to content

Commit 85730ef

Browse files
committed
Auto merge of #140842 - tmiasko:print-mono-items, r=saethlin
Remove mono item collection strategy override from -Zprint-mono-items Previously `-Zprint-mono-items` would override the mono item collection strategy. When debugging one doesn't want to change the behaviour, so this was counter productive. Additionally, the produced behaviour was artificial and might never arise without using the option in the first place (`-Zprint-mono-items=eager` without `-Clink-dead-code`). Finally, the option was incorrectly marked as `UNTRACKED`. Resolve those issues, by turning `-Zprint-mono-items` into a boolean flag that prints results of mono item collection without changing the behaviour of mono item collection. For codegen-units test incorporate `-Zprint-mono-items` flag directly into compiletest tool. Test changes are mechanical. `-Zprint-mono-items=lazy` was removed without additional changes, and `-Zprint-mono-items=eager` was turned into `-Clink-dead-code`. Linking dead code disables internalization, so tests have been updated accordingly.
2 parents 4fffc99 + b82a852 commit 85730ef

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/tests/compiletest.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,8 @@ The tests in [`tests/codegen-units`] test the
325325
[monomorphization](../backend/monomorph.md) collector and CGU partitioning.
326326

327327
These tests work by running `rustc` with a flag to print the result of the
328-
monomorphization collection pass, and then special annotations in the file are
329-
used to compare against that.
330-
331-
Each test should be annotated with the `//@
332-
compile-flags:-Zprint-mono-items=VAL` directive with the appropriate `VAL` to
333-
instruct `rustc` to print the monomorphization information.
328+
monomorphization collection pass, i.e., `-Zprint-mono-items`, and then special
329+
annotations in the file are used to compare against that.
334330

335331
Then, the test should be annotated with comments of the form `//~ MONO_ITEM
336332
name` where `name` is the monomorphized string printed by rustc like `fn <u32 as

0 commit comments

Comments
 (0)