Skip to content

Rollup of 6 pull requests #141879

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 14 commits into from

Conversation

matthiaskrgr
Copy link
Member

@matthiaskrgr matthiaskrgr commented Jun 2, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lukaslueg and others added 14 commits May 28, 2025 18:31
`equialent` => `equivalent`
…ss35

Clarify &mut-methods' docs on sync::OnceLock

Three small changes to the docs of `sync::OnceLock`:

* The docs for `OnceLock::take()` used to [say](https://doc.rust-lang.org/std/sync/struct.OnceLock.html#method.take) "**Safety** is guaranteed by requiring a mutable reference." (emphasis mine). While technically correct, imho its not necessary to even mention safety - as opposed to unsafety - here: Safety never comes up wrt `OnceLock`, as there is (currently) no way to interact with a `OnceLock` in an unsafe way; there are no unsafe methods on `OnceLock`, so there is "safety" guarantee required anywhere. What we simply meant to say is "**Synchronization** is guaranteed...".
* I've add that phrase to the other methods of `OnceLock` which take a `&mut self`, to highlight the fact that having a `&mut OnceLock` guarantees that synchronization with other threads is not required. This is the same as with [`Mutex::get_mut()`](https://doc.rust-lang.org/std/sync/struct.Mutex.html#method.get_mut), [`Cell::get_mut()`](https://doc.rust-lang.org/std/cell/struct.Cell.html#method.get_mut), and others.
* In that spirit, the half-sentence "or being initialized" was removed from `get_mut()`, as there is no way that the `OnceLock` is being initialized while we are holding `&mut` to it. Probably a copy&paste from `.get()`
…nikic

x86 (32/64): go back to passing SIMD vectors by-ptr

Fixes rust-lang#139029 by partially reverting rust-lang#135408 and going back to passing SIMD vectors by-ptr on x86. Sadly, by-val confuses the LLVM inliner so much that it's not worth it...

Also fixes rust-lang#141848 by no longer actually using vector registers with the "Rust" ABI.

r? `@tgross35`
Cc `@nikic`

try-job: `test-various*`
try-job: x86_64-gnu-nopt
try-job: dist-i586-gnu-i586-i686-musl
try-job: x86_64-msvc-1
…ted-type-instead-of-drop-fn-fix, r=oli-obk

Async drop - type instead of async drop fn, fixes rust-lang#140484

Fixes: rust-lang#140484
Fixes: rust-lang#140500

Fixes ICE, when type is provided in AsyncDrop trait instead of `async fn drop()`.
Fixes ICE, when async drop fn has wrong signature.
…y-speed, r=nnethercote

C-variadic functions must be unsafe

tracking issue: rust-lang#44930

A function that uses `...` is always unsafe to call, because it is UB to provide the wrong number of arguments, or arguments of an unexpected type. Hence, an `unsafe extern "C" { /* ... */ }` block should not be able to declare a `safe fn` that uses `...`.

cc `@joshtriplett` `@workingjubilee`

I'm not really sure who'd be a good reviewer for the actual parser code.

`@rustbot` label: +F-c_variadic
…Void

Fix typo in `StructuralPartialEq` docs

`equialent` => `equivalent`
add f16_epsilon and f128_epsilon diagnostic items

cc rust-lang#116909
r? `@tgross35`
@rustbot rustbot added 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 2, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Jun 2, 2025

📌 Commit bb56268 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 2, 2025
@matthiaskrgr
Copy link
Member Author

@bors p=5

@bors
Copy link
Collaborator

bors commented Jun 2, 2025

⌛ Testing commit bb56268 with merge 58ea9b3...

bors added a commit that referenced this pull request Jun 2, 2025
Rollup of 6 pull requests

Successful merges:

 - #140715 (Clarify &mut-methods' docs on sync::OnceLock)
 - #141309 (x86 (32/64): go back to passing SIMD vectors by-ptr)
 - #141677 (Async drop - type instead of async drop fn, fixes #140484)
 - #141733 (C-variadic functions must be unsafe)
 - #141858 (Fix typo in `StructuralPartialEq` docs)
 - #141874 (add f16_epsilon and f128_epsilon diagnostic items)

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

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

Click to see the possible cause of the failure (guessed by this bot)
failures:

---- [codegen] tests\codegen\simd-intrinsic\simd-intrinsic-transmute-array.rs stdout ----

error: verification with 'FileCheck' failed
status: exit code: 1
command: PATH=";C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.43.34808\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.43.34808\bin\HostX64\x86;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0-bootstrap-tools\i686-pc-windows-msvc\release\deps;D:\a\rust\rust\build\i686-pc-windows-msvc\stage0\bin;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Users\runneradmin\bin;D:\a\rust\rust\ninja;D:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\3.5.1\x64;C:\cabal\bin;C:\ghcup\bin;C:\mingw64\bin;C:\Program Files\dotnet;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Program Files\R\R-4.4.2\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\SeleniumWebDrivers\ChromeDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\usr\bin;C:\Program Files (x86)\pipx_bin;C:\npm\prefix;C:\hostedtoolcache\windows\go\1.24.3\x64\bin;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\hostedtoolcache\windows\Ruby\3.0.7\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.452-9\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\ProgramData\Chocolatey\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files\Microsoft SQL Server\150\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\WiX Toolset v3.14\bin;C:\Program Files\Microsoft SQL Server\130\DTS\Binn;C:\Program Files\Microsoft SQL Server\140\DTS\Binn;C:\Program Files\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\Microsoft SQL Server\160\DTS\Binn;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.9\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.43.34808\bin\HostX64\x86" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\llvm\\build\\bin\\FileCheck.exe" "--input-file" "D:\\a\\rust\\rust\\build\\i686-pc-windows-msvc\\test\\codegen\\simd-intrinsic\\simd-intrinsic-transmute-array\\simd-intrinsic-transmute-array.ll" "D:\\a\\rust\\rust\\tests\\codegen\\simd-intrinsic\\simd-intrinsic-transmute-array.rs" "--check-prefix=CHECK" "--allow-unused-prefixes" "--dump-input-context" "100"
stdout: none
--- stderr -------------------------------
D:\a\rust\rust\tests\codegen\simd-intrinsic\simd-intrinsic-transmute-array.rs:41:12: error: CHECK: expected string not found in input
 // CHECK: store <4 x float> %[[VAL:.+]], ptr %_0, align [[VECTOR_ALIGN]]
           ^
D:\a\rust\rust\build\i686-pc-windows-msvc\test\codegen\simd-intrinsic\simd-intrinsic-transmute-array\simd-intrinsic-transmute-array.ll:28:40: note: scanning from here
 %0 = load <4 x float>, ptr %x, align 4
                                       ^
D:\a\rust\rust\build\i686-pc-windows-msvc\test\codegen\simd-intrinsic\simd-intrinsic-transmute-array\simd-intrinsic-transmute-array.ll:28:40: note: with "VECTOR_ALIGN" equal to "16"
 %0 = load <4 x float>, ptr %x, align 4
                                       ^
D:\a\rust\rust\build\i686-pc-windows-msvc\test\codegen\simd-intrinsic\simd-intrinsic-transmute-array\simd-intrinsic-transmute-array.ll:29:2: note: possible intended match here
 store <4 x float> %0, ptr %_0, align 4
 ^
D:\a\rust\rust\tests\codegen\simd-intrinsic\simd-intrinsic-transmute-array.rs:56:12: error: CHECK: expected string not found in input
 // CHECK: store <4 x float> %[[VAL:.+]], ptr %_0, align [[VECTOR_ALIGN]]
           ^
D:\a\rust\rust\build\i686-pc-windows-msvc\test\codegen\simd-intrinsic\simd-intrinsic-transmute-array\simd-intrinsic-transmute-array.ll:43:40: note: scanning from here
 %0 = load <4 x float>, ptr %x, align 4
                                       ^
D:\a\rust\rust\build\i686-pc-windows-msvc\test\codegen\simd-intrinsic\simd-intrinsic-transmute-array\simd-intrinsic-transmute-array.ll:43:40: note: with "VECTOR_ALIGN" equal to "16"
 %0 = load <4 x float>, ptr %x, align 4
                                       ^
D:\a\rust\rust\build\i686-pc-windows-msvc\test\codegen\simd-intrinsic\simd-intrinsic-transmute-array\simd-intrinsic-transmute-array.ll:44:2: note: possible intended match here
 store <4 x float> %0, ptr %_0, align 4
 ^

Input file: D:\a\rust\rust\build\i686-pc-windows-msvc\test\codegen\simd-intrinsic\simd-intrinsic-transmute-array\simd-intrinsic-transmute-array.ll
Check file: D:\a\rust\rust\tests\codegen\simd-intrinsic\simd-intrinsic-transmute-array.rs

-dump-input=help explains the following input dump.

Input was:
<<<<<<
            1: ; ModuleID = 'simd_intrinsic_transmute_array.3f564baaaff31982-cgu.0' 
            2: source_filename = "simd_intrinsic_transmute_array.3f564baaaff31982-cgu.0" 
            3: target datalayout = "e-m:x-p:32:32-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32-a:0:32-S32" 
            4: target triple = "i686-pc-windows-msvc" 
            5:  
            6: ; Function Attrs: uwtable 
            7: define noundef i32 @array_align() unnamed_addr #0 { 
            8: start: 
            9:  ret i32 4 
           10: } 
           11:  
           12: ; Function Attrs: uwtable 
           13: define noundef i32 @vector_align() unnamed_addr #0 { 
           14: start: 
           15:  ret i32 16 
           16: } 
           17:  
           18: ; Function Attrs: uwtable 
           19: define void @build_array_s(ptr dead_on_unwind noalias nocapture noundef writable sret([16 x i8]) align 16 dereferenceable(16) %_0, ptr noalias nocapture noundef readonly align 4 dereferenceable(16) %x) unnamed_addr #0 { 
           20: start: 
           21:  call void @llvm.memcpy.p0.p0.i32(ptr align 16 %_0, ptr align 4 %x, i32 16, i1 false) 
           22:  ret void 
           23: } 
           24:  
           25: ; Function Attrs: uwtable 
           26: define void @build_array_transmute_s(ptr dead_on_unwind noalias nocapture noundef writable sret([16 x i8]) align 16 dereferenceable(16) %_0, ptr noalias nocapture noundef readonly align 4 dereferenceable(16) %x) unnamed_addr #0 { 
           27: start: 
           28:  %0 = load <4 x float>, ptr %x, align 4 
check:41'0                                            X error: no match found
check:41'1                                              with "VECTOR_ALIGN" equal to "16"
           29:  store <4 x float> %0, ptr %_0, align 4 
check:41'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:41'2      ?                                       possible intended match
           30:  ret void 
check:41'0     ~~~~~~~~~~
           31: } 
check:41'0     ~~
           32:  
check:41'0     ~
           33: ; Function Attrs: uwtable 
check:41'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~
           34: define void @build_array_t(ptr dead_on_unwind noalias nocapture noundef writable sret([16 x i8]) align 16 dereferenceable(16) %_0, ptr noalias nocapture noundef readonly align 4 dereferenceable(16) %x) unnamed_addr #0 { 
check:41'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~
           35: start: 
           36:  call void @llvm.memcpy.p0.p0.i32(ptr align 16 %_0, ptr align 4 %x, i32 16, i1 false) 
           37:  ret void 
           38: } 
           39:  
           40: ; Function Attrs: uwtable 
           41: define void @build_array_transmute_t(ptr dead_on_unwind noalias nocapture noundef writable sret([16 x i8]) align 16 dereferenceable(16) %_0, ptr noalias nocapture noundef readonly align 4 dereferenceable(16) %x) unnamed_addr #0 { 
           42: start: 
           43:  %0 = load <4 x float>, ptr %x, align 4 
check:56'0                                            X error: no match found
check:56'1                                              with "VECTOR_ALIGN" equal to "16"
           44:  store <4 x float> %0, ptr %_0, align 4 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
check:56'2      ?                                       possible intended match
           45:  ret void 
check:56'0     ~~~~~~~~~~
           46: } 
check:56'0     ~~
           47:  
check:56'0     ~
           48: ; Function Attrs: nocallback nofree nounwind willreturn memory(argmem: readwrite) 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           49: declare void @llvm.memcpy.p0.p0.i32(ptr noalias nocapture writeonly, ptr noalias nocapture readonly, i32, i1 immarg) #1 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           50:  
check:56'0     ~
           51: attributes #0 = { uwtable "target-cpu"="pentium4" } 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           52: attributes #1 = { nocallback nofree nounwind willreturn memory(argmem: readwrite) } 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           53:  
check:56'0     ~
           54: !llvm.module.flags = !{!0} 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
           55: !llvm.ident = !{!1} 
check:56'0     ~~~~~~~~~~~~~~~~~~~~
           56:  
check:56'0     ~
           57: !0 = !{i32 8, !"PIC Level", i32 2} 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
           58: !1 = !{!"rustc version 1.89.0-nightly (58ea9b320 2025-06-02)"} 
check:56'0     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>>>
------------------------------------------



failures:
    [codegen] tests\codegen\simd-intrinsic\simd-intrinsic-transmute-array.rs

test result: FAILED. 629 passed; 1 failed; 218 ignored; 0 measured; 3 filtered out; finished in 25.52s

Some tests failed in compiletest suite=codegen mode=codegen host=i686-pc-windows-msvc target=i686-pc-windows-msvc
Build completed unsuccessfully in 1:38:49
make: *** [Makefile:113: ci-msvc-py] Error 1
  local time: Mon Jun  2 12:54:14 CUT 2025
  network time: Mon, 02 Jun 2025 12:54:14 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

@bors
Copy link
Collaborator

bors commented Jun 2, 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 2, 2025
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. 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.

ICE: unexpected sort of node in fn_sig(): ImplItem(ImplItem
10 participants