Skip to content

Rollup of 9 pull requests #140495

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 20 commits into from
Closed

Conversation

ChrisDenton
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

koalatux and others added 20 commits April 29, 2025 10:20
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
…provenance-139008, r=RalfJung

mention provenance in the pointer::wrapping_offset docs

fixes rust-lang#139008
Fix linking statics on Arm64EC

Arm64EC builds recently started to fail due to the linker not finding a symbol:
```
symbols.o : error LNK2001: unresolved external symbol #_ZN3std9panicking11EMPTY_PANIC17hc8d2b903527827f1E (EC Symbol)
          C:\Code\hello-world\target\arm64ec-pc-windows-msvc\debug\deps\hello_world.exe : fatal error LNK1120: 1 unresolved externals
```

It turns out that `EMPTY_PANIC` is a new static variable that was being exported then imported from the standard library, but when exporting LLVM didn't prepend the name with `#` (as only functions are prefixed with this character), whereas Rust was prefixing with `#` when attempting to import it.

The fix is to have Rust not prefix statics with `#` when importing.

Adding tests discovered another issue: we need to correctly mark static exported from dylibs with `DATA`, otherwise MSVC's linker assumes they are functions and complains that there is no exit thunk for them.

Fixes rust-lang#138541
…=compiler-errors

rm `TypeVistable` impls for `Canonical`

similar to `EarlyBinder`, you generally do not want to fold a canonical value directly without first instantiating it. In places where you do want to look into the `Canonical`, it's likely better to do so manually.

r? `@compiler-errors`
…s-msa, r=jieyouxu

enable msa feature for mips in codegen tests

Fix codegen unit tests for mips by enabling the msa target feature.
…s, r=Kobzol

Add `rust.debug-assertions-tools` option

Before this PR, the two only options to configure the presence of debug assertions were the `rust.debug-assertions` and `rust.debug-assertions-std` options. The former applied to everything, and the latter allowed to override the setting just for the standard library. This combination of settings doesn't allow to enable debug assertions for the std and the compiler but not tools.

Some tools (like Cargo) are not really meant to be executed with debug assertions enabled, and in Ferrocene we hit some debug assertions in it that are exclusively meant for its test suite. We'd thus like to enable debug assertions everywhere but in tools.

This PR adds a `rust.debug-assertions-tools` setting that does exactly this.
CI: rfl: move job forward to Linux v6.15-rc4

A hopefully routine upgrade to Linux v6.15-rc4!

r? `@lqd` `@Kobzol`
try-job: x86_64-rust-for-linux
`@rustbot` label A-rust-for-linux
`@bors` try
chore: delete unused ui/auxiliary crates

It appears that all the tests that used it have been moved to tests/ui/editions/ (or elsewhere) already.

r? `@jieyouxu`
Require sanitizers be enabled for asan_odr_windows.rs

Issue Details:
The `asan_odr_windows.rs` test is failing on AArch64 Windows, as sanitizers aren't supported on that platform.

Fix Details:
Apply the correct "need sanitizer" requirements to the test.
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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 Apr 30, 2025
@ChrisDenton
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Apr 30, 2025

📌 Commit c9e0cce has been approved by ChrisDenton

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 Apr 30, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2025
…enton

Rollup of 9 pull requests

Successful merges:

 - rust-lang#139192 (mention provenance in the pointer::wrapping_offset docs)
 - rust-lang#140176 (Fix linking statics on Arm64EC)
 - rust-lang#140404 (rm `TypeVistable` impls for `Canonical`)
 - rust-lang#140437 (enable msa feature for mips in codegen tests)
 - rust-lang#140438 (Add `rust.debug-assertions-tools` option)
 - rust-lang#140446 (chore: fix some tests)
 - rust-lang#140470 (CI: rfl: move job forward to Linux v6.15-rc4)
 - rust-lang#140476 (chore: delete unused ui/auxiliary crates)
 - rust-lang#140481 (Require sanitizers be enabled for asan_odr_windows.rs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Apr 30, 2025

⌛ Testing commit c9e0cce with merge 0b7df37...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
[RUSTC-TIMING] cranelift_codegen test:false 126.798
   Compiling rustc_codegen_cranelift v0.1.0 (C:\a\rust\rust\compiler\rustc_codegen_cranelift)
error: linking with `link.exe` failed: exit code: 1120
  |
  = note: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Tools\\MSVC\\14.43.34808\\bin\\HostX64\\x64\\link.exe" "/DEF:C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\lib.def" "/NOLOGO" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\symbols.o" "<1 object files omitted>" "<sysroot>-codegen\\x86_64-pc-windows-msvc\\release\\deps\\rustc_codegen_cranelift-08ee86f158b48789.7eo049j35kj9tdsgfqa97waba.rcgu.rmeta" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage1-codegen\\x86_64-pc-windows-msvc\\release\\deps/{libcranelift_native-587192213bb1dbdc.rlib,libcranelift_object-d9f31794bb8cf217.rlib,libobject-0864381632913ca8.rlib,libcrc32fast-04e1f2a59dfd6859.rlib,libcfg_if-fa6f47ccf9a2d91c.rlib,libmemchr-5ee95b7130e3c54b.rlib,libcranelift_frontend-4f862da63370b4f9.rlib,libcranelift_module-fe174f91c4fe7492.rlib,libanyhow-5ad14b6fb307f628.rlib,libcranelift_codegen-1e61656be4ef46c5.rlib,libcranelift_assembler_x64-fd8b3dc086946433.rlib,libtarget_lexicon-0d0ca4c61e4eade4.rlib,libcranelift_codegen_shared-e7980d2aecd7ab44.rlib,libregalloc2-1ac3ae6023c8c975.rlib,libbumpalo-cb898fb209a43ff8.rlib,liblog-e1444ece7681ef38.rlib,libsmallvec-734ed62a630f2f62.rlib,librustc_hash-87080dc4987f7f45.rlib,liballocator_api2-309b7c65a53884aa.rlib,libgimli-c2e5c3e1208c632d.rlib,libindexmap-3f1ce45f112ee07d.rlib,libequivalent-0e85e77070c1f32c.rlib,libhashbrown-4c836bb79bbedb07.rlib,libfoldhash-6f0376b8f1de76db.rlib,libcranelift_control-c7dc69e89c21e480.rlib,libarbitrary-cedb0d0fac8b53f3.rlib,libcranelift_bforest-f8cd4bd7811dd9bd.rlib,libcranelift_entity-8997d9342e427b94.rlib,libcranelift_bitset-bbab62dcbba00611.rlib}.rlib" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib\\rustc_driver-e94a2758c4cd013b.dll.lib" "<sysroot>\\lib\\rustlib\\x86_64-pc-windows-msvc\\lib/{libprofiler_builtins-*,libcompiler_builtins-*}.rlib" "psapi.lib" "shell32.lib" "ole32.lib" "uuid.lib" "advapi32.lib" "ws2_32.lib" "ntdll.lib" "kernel32.lib" "advapi32.lib" "ole32.lib" "oleaut32.lib" "advapi32.lib" "cfgmgr32.lib" "gdi32.lib" "kernel32.lib" "msimg32.lib" "opengl32.lib" "user32.lib" "winspool.lib" "bcrypt.lib" "advapi32.lib" "legacy_stdio_definitions.lib" "kernel32.lib" "kernel32.lib" "kernel32.lib" "ntdll.lib" "userenv.lib" "ws2_32.lib" "dbghelp.lib" "/defaultlib:libcmt" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\advapi32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-errorhandling-l1-1-3.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-file-fromapp-l1-1-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-handle-l1-1-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-ioring-l1-1-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-libraryloader-l2-1-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-memory-l1-1-3.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-memory-l1-1-4.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-memory-l1-1-5.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-memory-l1-1-6.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-memory-l1-1-7.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-memory-l1-1-8.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-synch-l1-2-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-sysinfo-l1-2-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-sysinfo-l1-2-3.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-sysinfo-l1-2-4.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-sysinfo-l1-2-6.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-util-l1-1-1.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-winrt-error-l1-1-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-winrt-l1-1-0.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-core-wow64-l1-1-1.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\api-ms-win-security-base-l1-2-2.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\avrt.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\bcp47mrm.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\bcryptprimitives.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\clfsw32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\dbghelp.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\elscore.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\gdi32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\icu.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\icuin.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\icuuc.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\imagehlp.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\kernel32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\ktmw32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\netapi32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\normaliz.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\ntdll.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\ntdllk.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\ole32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\oleacc.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\oleaut32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\psapi.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\rtworkq.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\txfw32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\user32.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\usp10.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\version.dll_imports_indirect.lib" "C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\rustcyqBRdv\\wofutil.dll_imports_indirect.lib" "/NXCOMPAT" "/OUT:<sysroot>-codegen\\x86_64-pc-windows-msvc\\release\\deps\\rustc_codegen_cranelift-08ee86f158b48789.dll" "/OPT:REF,ICF" "/DLL" "/IMPLIB:<sysroot>-codegen\\x86_64-pc-windows-msvc\\release\\deps\\rustc_codegen_cranelift-08ee86f158b48789.dll.lib" "/DEBUG" "/PDBALTPATH:%_PDB%" "-LIBPATH:C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\llvm\\lib"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note:    Creating library C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-codegen\x86_64-pc-windows-msvc\release\deps\rustc_codegen_cranelift-08ee86f158b48789.dll.lib and object C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-codegen\x86_64-pc-windows-msvc\release\deps\rustc_codegen_cranelift-08ee86f158b48789.dll.exp␍
          libarbitrary-cedb0d0fac8b53f3.rlib(arbitrary-cedb0d0fac8b53f3.arbitrary.6b12efd9bc1680c-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libtarget_lexicon-0d0ca4c61e4eade4.rlib(target_lexicon-0d0ca4c61e4eade4.target_lexicon.8cf036c7205fb5e4-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libregalloc2-1ac3ae6023c8c975.rlib(regalloc2-1ac3ae6023c8c975.regalloc2.9850b5efd454deef-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libbumpalo-cb898fb209a43ff8.rlib(bumpalo-cb898fb209a43ff8.bumpalo.2ef99f1ba8181a3-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libgimli-c2e5c3e1208c632d.rlib(gimli-c2e5c3e1208c632d.gimli.e08538e5122f3d4e-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libcranelift_module-fe174f91c4fe7492.rlib(cranelift_module-fe174f91c4fe7492.cranelift_module.8d8db3c621e91a3e-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libanyhow-5ad14b6fb307f628.rlib(anyhow-5ad14b6fb307f628.anyhow.eccfa2800178e816-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libcranelift_codegen-1e61656be4ef46c5.rlib(cranelift_codegen-1e61656be4ef46c5.cranelift_codegen.f7020f61e50267bc-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libcranelift_assembler_x64-fd8b3dc086946433.rlib(cranelift_assembler_x64-fd8b3dc086946433.cranelift_assembler_x64.ba0b19b7a64cc41e-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          rustc_codegen_cranelift-08ee86f158b48789.rustc_codegen_cranelift.278344e8980f8c6b-cgu.0.rcgu.o : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libcranelift_object-d9f31794bb8cf217.rlib(cranelift_object-d9f31794bb8cf217.cranelift_object.9e9ed148eb7c10f3-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libobject-0864381632913ca8.rlib(object-0864381632913ca8.object.462cdea0b1a83830-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          libcranelift_frontend-4f862da63370b4f9.rlib(cranelift_frontend-4f862da63370b4f9.cranelift_frontend.e5ee9d60ee92ad2e-cgu.0.rcgu.o) : error LNK2001: unresolved external symbol __rust_no_alloc_shim_is_unstable␍
          C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-codegen\x86_64-pc-windows-msvc\release\deps\rustc_codegen_cranelift-08ee86f158b48789.dll : fatal error LNK1120: 1 unresolved externals␍
          

[RUSTC-TIMING] rustc_codegen_cranelift test:false 32.050
error: could not compile `rustc_codegen_cranelift` (lib) due to 1 previous error
Build completed unsuccessfully in 0:30:46

@bors
Copy link
Collaborator

bors commented Apr 30, 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 Apr 30, 2025
@Zalathar
Copy link
Contributor

I've kicked off some try jobs to check whether #140176 is the cause of this failure or not.

@ChrisDenton ChrisDenton deleted the rollup-wqm2yat branch April 30, 2025 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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.