Skip to content

Rollup of 9 pull requests #142545

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

Closed
wants to merge 21 commits into from
Closed

Rollup of 9 pull requests #142545

wants to merge 21 commits into from

Conversation

fmease
Copy link
Member

@fmease fmease commented Jun 15, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

WaffleLapkin and others added 21 commits June 3, 2025 10:49
And move passing it to the linker to the driver code.
This deduplicates some code between codegen backends and may in the
future allow adding extra metadata that is only known at link time.
This test currently fails (as expected).

    --- stderr -------------------------------
    Pretty-printer lost necessary parentheses
      BEFORE: (#[attr] loop {}).field
       AFTER: #[attr] loop {}.field
    ------------------------------------------
Reduce precedence of expressions that have an outer attr

Previously, `-Zunpretty=expanded` would expand this program as follows:

```rust
#![feature(stmt_expr_attributes)]

macro_rules! repro {
    ($e:expr) => {
        #[allow(deprecated)] $e
    };
}

#[derive(Default)]
struct Thing {
    #[deprecated]
    field: i32,
}

fn main() {
    let thing = Thing::default();
    let _ = repro!(thing).field;
}
```

```rs
#![feature(prelude_import)]
#![feature(stmt_expr_attributes)]
#[prelude_import]
use std::prelude::rust_2021::*;
#[macro_use]
extern crate std;

struct Thing {
    #[deprecated]
    field: i32,
}

#[automatically_derived]
impl ::core::default::Default for Thing {
    #[inline]
    fn default() -> Thing {
        Thing { field: ::core::default::Default::default() }
    }
}

fn main() {
    let thing = Thing::default();
    let _ = #[allow(deprecated)] thing.field;
}
```

This is not the correct expansion. The correct output would have `(#[allow(deprecated)] thing).field` with the attribute applying only to `thing`, not to `thing.field`.
…ork, r=workingjubilee,saethlin

Move metadata object generation for dylibs to the linker code

This deduplicates some code between codegen backends and may in the future allow adding extra metadata that is only known at link time.

Prerequisite of rust-lang#96708.
Handle win32 separator for cygwin paths

This PR handles a issue that cygwin actually supports Win32 path, so we need to handle the Win32 prefix and separaters.

r? ````@mati865````

cc ````@jeremyd2019````

~~Not sure if I should handle the prefix like the windows target... Cygwin *does* support win32 paths directly going through the APIs, but I think it's not the recommended way.~~

Here I just use `cygwin_conv_path` because it handles both cygwin and win32 paths correctly and convert them into absolute POSIX paths.

UPDATE: Windows path prefix is handled.
… r=oli-obk,traviscross

Report never type lints in dependencies

This PR marks never type lints (`never_type_fallback_flowing_into_unsafe` & `dependency_on_unit_never_type_fallback`) to be included in cargo's reports / to be emitted when they happen in dependencies.

This PR is based on rust-lang#141936
r? oli-obk
…-live-dead-fix, r=oli-obk

Async drop - fix for StorageLive/StorageDead codegen for pinned future

Fixes: rust-lang#140429, Fixes: rust-lang#140531, Fixes: rust-lang#141761, Fixes: rust-lang#141409.

StorageLive/StorageDead codegen is corrected for pinned async drop future.
Apply ABI attributes on return types in `rustc_codegen_cranelift`

- The [x86-64 System V ABI standard](https://gitlab.com/x86-psABIs/x86-64-ABI/-/jobs/artifacts/master/raw/x86-64-ABI/abi.pdf?job=build) doesn't sign/zero-extend integer arguments or return types.
- But the de-facto standard as implemented by Clang and GCC is to sign/zero-extend arguments to 32 bits (but not return types).
- Additionally, Apple targets [sign/zero-extend both arguments and return values to 32 bits](https://developer.apple.com/documentation/xcode/writing-64-bit-intel-code-for-apple-platforms#Pass-arguments-to-functions-correctly).
- However, the `rustc_target` ABI adjustment code currently [unconditionally extends both arguments and return values to 32 bits](https://github.com/rust-lang/rust/blame/e703dff8fe220b78195c53478e83fb2f68d8499c/compiler/rustc_target/src/callconv/x86_64.rs#L240) on all targets.
- This doesn't cause a miscompilation when compiling with LLVM as LLVM will ignore the `signext`/`zeroext` attribute when applied to return types on non-Apple x86-64 targets.
- Cranelift, however, does not have a similar special case, requiring `rustc` to set the argument extension attribute correctly.
- However, `rustc_codegen_cranelift` doesn't currently apply ABI attributes to return types at all, meaning `rustc_codegen_cranelift` will currently miscompile `i8`/`u8`/`i16`/`u16` returns on x86-64 Apple targets as those targets require sign/zero-extension of return types.

This PR fixes the bug(s) by making the `rustc_target` x86-64 System V ABI only mark return types as sign/zero-extended on Apple platforms, while also making `rustc_codegen_cranelift` apply ABI attributes to return types. The RISC-V and s390x C ABIs also require sign/zero extension of return types, so this will fix those targets when building with `rustc_codegen_cranelift` too.

r? ````@bjorn3````
Add `f16` inline asm support for LoongArch

r? ````@Amanieu````
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jun 15, 2025
@fmease
Copy link
Member Author

fmease commented Jun 15, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Jun 15, 2025

📌 Commit 562859f has been approved by fmease

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 15, 2025
@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 Jun 15, 2025
@bors
Copy link
Collaborator

bors commented Jun 15, 2025

⌛ Testing commit 562859f with merge ef2efa4...

bors added a commit that referenced this pull request Jun 15, 2025
Rollup of 9 pull requests

Successful merges:

 - #133952 (Remove wasm legacy abi)
 - #134661 (Reduce precedence of expressions that have an outer attr)
 - #141769 (Move metadata object generation for dylibs to the linker code )
 - #141864 (Handle win32 separator for cygwin paths)
 - #141937 (Report never type lints in dependencies)
 - #142347 (Async drop - fix for StorageLive/StorageDead codegen for pinned future)
 - #142389 (Apply ABI attributes on return types in `rustc_codegen_cranelift`)
 - #142470 (Add some missing mailmap entries)
 - #142481 (Add `f16` inline asm support for LoongArch)

r? `@ghost`
`@rustbot` modify labels: rollup
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-msvc-ext2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
   Compiling rustc-demangle v0.1.25
    Finished `test` profile [unoptimized + debuginfo] target(s) in 2.31s
     Running unittests src\lib.rs (build\x86_64-pc-windows-msvc\stage1-std\miri\x86_64-pc-windows-msvc\debug\deps\std-9628feef2f24ef97.exe)
error[E0425]: cannot find function `parse_next_component` in this scope
##[error]   --> library\std\src\sys\path\windows\tests.rs:6:9
    |
6   |         parse_next_component(OsStr::new(r"server\share"), true),
    |         ^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
note: function `crate::sys::path::windows_prefix::parse_next_component` exists but is inaccessible
   --> library\std\src\sys\path\windows_prefix.rs:156:1
    |
156 | fn parse_next_component(path: &OsStr, verbatim: bool) -> (&OsStr, &OsStr) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible

error[E0425]: cannot find function `parse_next_component` in this scope
##[error]   --> library\std\src\sys\path\windows\tests.rs:11:9
    |
11  |         parse_next_component(OsStr::new(r"server/share"), true),
    |         ^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
note: function `crate::sys::path::windows_prefix::parse_next_component` exists but is inaccessible
   --> library\std\src\sys\path\windows_prefix.rs:156:1
    |
156 | fn parse_next_component(path: &OsStr, verbatim: bool) -> (&OsStr, &OsStr) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible

error[E0425]: cannot find function `parse_next_component` in this scope
##[error]   --> library\std\src\sys\path\windows\tests.rs:16:9
    |
16  |         parse_next_component(OsStr::new(r"server/share"), false),
    |         ^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
note: function `crate::sys::path::windows_prefix::parse_next_component` exists but is inaccessible
   --> library\std\src\sys\path\windows_prefix.rs:156:1
    |
156 | fn parse_next_component(path: &OsStr, verbatim: bool) -> (&OsStr, &OsStr) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible

error[E0425]: cannot find function `parse_next_component` in this scope
##[error]   --> library\std\src\sys\path\windows\tests.rs:21:9
    |
21  |         parse_next_component(OsStr::new(r"server\"), false),
    |         ^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
note: function `crate::sys::path::windows_prefix::parse_next_component` exists but is inaccessible
   --> library\std\src\sys\path\windows_prefix.rs:156:1
    |
156 | fn parse_next_component(path: &OsStr, verbatim: bool) -> (&OsStr, &OsStr) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible

error[E0425]: cannot find function `parse_next_component` in this scope
##[error]   --> library\std\src\sys\path\windows\tests.rs:26:9
    |
26  |         parse_next_component(OsStr::new(r"\server\"), false),
    |         ^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
note: function `crate::sys::path::windows_prefix::parse_next_component` exists but is inaccessible
   --> library\std\src\sys\path\windows_prefix.rs:156:1
    |
156 | fn parse_next_component(path: &OsStr, verbatim: bool) -> (&OsStr, &OsStr) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible

error[E0425]: cannot find function `parse_next_component` in this scope
##[error]   --> library\std\src\sys\path\windows\tests.rs:31:9
    |
31  |         parse_next_component(OsStr::new(r"servershare"), false),
    |         ^^^^^^^^^^^^^^^^^^^^ not found in this scope
    |
note: function `crate::sys::path::windows_prefix::parse_next_component` exists but is inaccessible
   --> library\std\src\sys\path\windows_prefix.rs:156:1
    |
156 | fn parse_next_component(path: &OsStr, verbatim: bool) -> (&OsStr, &OsStr) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible

error[E0412]: cannot find type `Prefix` in this scope
##[error]  --> library\std\src\sys\path\windows\tests.rs:88:39
   |
88 | fn parse_prefix(path: &str) -> Option<Prefix<'_>> {
   |                                       ^^^^^^ not found in this scope
   |
help: consider importing one of these enums
   |
1  + use crate::path::Prefix;
   |
1  + use crate::realstd::path::Prefix;
   |

error[E0433]: failed to resolve: use of undeclared type `Prefix`
##[error]  --> library\std\src\sys\path\windows\tests.rs:94:23
   |
94 |     let prefix = Some(Prefix::VerbatimDisk(b'C'));
   |                       ^^^^^^ use of undeclared type `Prefix`
   |
help: consider importing one of these enums
   |
1  + use crate::path::Prefix;
   |
1  + use crate::realstd::path::Prefix;
   |

error[E0433]: failed to resolve: use of undeclared type `Prefix`
##[error]   --> library\std\src\sys\path\windows\tests.rs:101:23
    |
101 |     let prefix = Some(Prefix::UNC(OsStr::new("?"), OsStr::new("C:")));
    |                       ^^^^^^ use of undeclared type `Prefix`
    |
help: consider importing one of these enums
    |
1   + use crate::path::Prefix;
    |
---
For more information about an error, try `rustc --explain E0412`.
error: test failed, to rerun pass `-p std --lib`

Caused by:
  process didn't exit successfully: `D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1\bin\cargo-miri.exe runner 'D:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-std\miri\x86_64-pc-windows-msvc\debug\deps\std-9628feef2f24ef97.exe' notest -Z unstable-options --format json` (exit code: 1)
note: test exited abnormally; to see the full output pass --nocapture to the harness.
Build completed unsuccessfully in 0:00:17
  local time: Sun Jun 15 21:36:19 CUT 2025
  network time: Sun, 15 Jun 2025 21:36:19 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Jun 15, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 15, 2025
@fmease fmease closed this Jun 15, 2025
@fmease fmease deleted the rollup-pylzhqt branch June 15, 2025 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.