Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #92027

Closed
wants to merge 21 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cbeuw and others added 21 commits December 5, 2021 20:49
I think it's helpful to know what type was unused when looking at these
warnings. The type will likely determine whether the result *should* be
used, or whether it should just be ignored.

Including the type also matches the behavior of the `must_use` lint:
unused `SomeType` that must be used.
 
DF_ORIGIN flag signifies that the object being loaded may make reference to the $ORIGIN substitution string.

Some implementations are just ignoring DF_ORIGIN and do substitution for $ORIGIN if present (whatever DF_ORIGIN presence or not) like glibc. But some others mandate the present of DF_ORIGIN for the substitution (like OpenBSD).
 
Set the flag inconditionally if rpath is wanted.
Apply path remapping to DW_AT_GNU_dwo_name when producing split DWARF

`--remap-path-prefix` doesn't apply to paths to `.o` (in case of packed) or `.dwo` (in case of unpacked) files in `DW_AT_GNU_dwo_name`. GCC also has this bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91888
Show the unused type for `unused_results` lint

I think it's helpful to know what type was unused when looking at these
warnings. The type will likely determine whether the result *should* be
used, or whether it should just be ignored.

Including the type also matches the behavior of the `must_use` lint:
unused `SomeType` that must be used.
pass -Wl,-z,origin to set DF_ORIGIN when using rpath

DF_ORIGIN flag signifies that the object being loaded may make reference to the $ORIGIN substitution string.

Some implementations are just ignoring [DF_ORIGIN](http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#df_flags) and do [substitution](http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#substitution) for $ORIGIN if present (whatever DF_ORIGIN presence or not) like glibc. But some others mandate the present of DF_ORIGIN for the substitution (like OpenBSD).

Set the flag inconditionally if rpath is wanted.

One possible fallout is if the linker rejects `-z origin` option.
miri: lift restriction on extern types being the only field in a struct

Fixes rust-lang#91827.

r? `@RalfJung`
…mpl, r=michaelwoerister

Remove `in_band_lifetimes` from `rustc_query_impl`

See rust-lang#91867 for more information.
Update cargo

8 commits in a359ce16073401f28b84840da85b268aa3d37c88..fcef61230c3b6213b6b0d233a36ba4ebd1649ec3
2021-12-14 18:40:22 +0000 to 2021-12-17 02:30:38 +0000
- Minor docs change for `cargo test --help` (rust-lang/cargo#10210)
- Make clippy happy (rust-lang/cargo#10205)
- Enhance descriptions of issue templates (rust-lang/cargo#10202)
- Add workaround for sporadic kills when building on Macos (rust-lang/cargo#10196)
- Detect filesystem loop during walking the projects (rust-lang/cargo#10188)
- Error about not having any crates with documentation (rust-lang/cargo#10204)
- Don't document libs with doc=false (rust-lang/cargo#10201)
- Bumps up tar to 0.4.36 (rust-lang/cargo#10198)
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Dec 17, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Dec 17, 2021

📌 Commit 3a256f4 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 17, 2021
@bors
Copy link
Contributor

bors commented Dec 17, 2021

⌛ Testing commit 3a256f4 with merge 46bfd2796a76d7b876c03d276e48f498c402b6ee...

@bors
Copy link
Contributor

bors commented Dec 17, 2021

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 17, 2021
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2021
@semarie
Copy link
Contributor

semarie commented Dec 17, 2021

@matthiaskrgr the error is related to #91858 : the apple linker seems to not support -z option.

error: linking with `cc` failed: exit status: 1
   |
   = note: "cc" "-m64" "-arch" "x86_64" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/lint/dead-code/unused-variant-pub/unused-variant-pub.unused_variant_pub.9641604c-cgu.0.rcgu.o" "-L" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/native/rust-test-helpers" "-L" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/lint/dead-code/unused-variant-pub/auxiliary" "-L" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib" "-L" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib" "-lstd-21bc79810f65aca7" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib/libcompiler_builtins-619b8ddb39045aa8.rlib" "-lSystem" "-lresolv" "-lc" "-lm" "-liconv" "-L" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/lint/dead-code/unused-variant-pub/unused-variant-pub" "-Wl,-dead_strip" "-nodefaultlibs" "-Wl,-z,origin" "-Wl,-rpath,@loader_path/../../../../../stage2/lib/rustlib/x86_64-apple-darwin/lib"
   = note: ld: warning: directory not found for option '-L/Users/runner/work/rust/rust/build/x86_64-apple-darwin/test/ui/lint/dead-code/unused-variant-pub/auxiliary'
           ld: unknown option: -z
           clang: error: linker command failed with exit code 1 (use -v to see invocation)

@matthiaskrgr
Copy link
Member Author

Thanks for the analysis. Seems a bit strange to me that this happens in the tests but not while building rustc itself..?

@semarie
Copy link
Contributor

semarie commented Dec 17, 2021

no, rpath code for rustc itself is "special". -Wl,-z,origin was passed only on targets !apply and !windows

@matthiaskrgr matthiaskrgr deleted the rollup-y7azmsf branch January 2, 2022 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants