Rollup of 14 pull requests #130133

workingjubilee · 2024-09-09T07:17:53Z

Successful merges:

Update mingw-w64 + GNU toolchain #119229 (Update mingw-w64 + GNU toolchain)
added support for GNU/Hurd on x86_64 #128345 (added support for GNU/Hurd on x86_64)
rustdoc: normalise type/field names #128667 (rustdoc: normalise type/field names)
Use sysroot crates maximally in rustc_codegen_gcc. #129876 (Use sysroot crates maximally in rustc_codegen_gcc.)
Fix enabling wasm-component-ld to match other tools #130034 ( Fix enabling wasm-component-ld to match other tools )
run-make-support: Add llvm-pdbutil #130048 (run-make-support: Add llvm-pdbutil)
Test codegen when setting deployment target #130068 (Test codegen when setting deployment target)
Rename variant AddrOfRegion of RegionVariableOrigin to BorrowRegion #130070 (Rename variant AddrOfRegion of RegionVariableOrigin to BorrowRegion)
remove 'const' from 'Option::iter' #130087 (remove 'const' from 'Option::iter')
make Result::copied unstably const #130090 (make Result::copied unstably const)
Fixes typo in wasm32-wasip2 doc comment #130092 (Fixes typo in wasm32-wasip2 doc comment)
const: make ptr.is_null() stop execution on ambiguity #130107 (const: make ptr.is_null() stop execution on ambiguity)
Remove needless returns detected by clippy in libraries #130115 (Remove needless returns detected by clippy in libraries)
Miri subtree update #130130 (Miri subtree update)

r? @ghost
@rustbot modify labels: rollup

Automatic Rustup

This shrinks `compiler/rustc_codegen_gcc/Cargo.lock` quite a bit. The only remaining dependencies in `compiler/rustc_codegen_gcc/Cargo.lock` are `gccjit`, `lang_tester`, and `boml`, all of which aren't used in any other compiler crates. The commit also reorders and adds comments to the `extern crate` items so they match those in miri.

Automatic Rustup

Fixes rust-lang#3595 by using -fvisibility=hidden and the visibility attribute supported by both gcc and clang rather than the previous gcc-only mechanism for symbol hiding. Also brings over cfg changes from rust-lang#3594 which enable native-lib functionality on all unixes.

Enable native libraries on macOS Fixes rust-lang#3595 by using `-fvisibility=hidden` and the visibility attribute supported by both gcc and clang rather than the previous gcc-only mechanism for symbol hiding. Also brings over cfg changes from rust-lang#3594 which enable native-lib functionality on all unixes. Thanks for taking a look, feedback very welcome! cc `@RalfJung`

See: rust-lang#3749

…alfJung Detect when pthread_mutex_t is moved What I am not sure about this PR is how to support storing the additional mutex data like its address and kind. If I understand correctly the `concurrency::sync::Mutex` struct is to be used by any mutex implementation. This possibly means that different implementation might want to store different data in the mutex. So any additional data should be implementation defined somehow. Solutions that come to mind: - Store the additional data as `Box<dyn Any>` and the implementations can downcast their data when they fetch them. - Have each shim implementation define a `static mut` map between `MutexID`s and the additional data. Let me know Fixes rust-lang#3749

Automatic Rustup

miri.bat: use nightly toolchain Hopefully fixes rust-lang/miri#3863 (but I can't test that)

We no longer store the kind inside the pthread_mutex_t, so this comment is outdated.

…fJung Fix comment in mutex_id_offset We no longer store the kind inside the pthread_mutex_t, so this comment is outdated. Sorry I didn't catch this in the original PR.

It was [pointed out recently][comment] that enabling `wasm-component-ld` as a host tool is different from other host tools. This commit refactors the logic to match by deduplicating selection of when to build other tools and then using the same logic for `wasm-component-ld`. [comment]: rust-lang#127866 (comment)

…ion` because "Borrow" is the more idiomatic Rust term than "AddrOf".

Miri subtree update r? `@ghost`

workingjubilee · 2024-09-09T07:19:57Z

@bors rollup=never p=14 r+

bors · 2024-09-09T07:20:00Z

📌 Commit 3e01a5d has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2024-09-09T09:24:15Z

⌛ Testing commit 3e01a5d with merge 1f44f0a...

bors · 2024-09-09T11:48:00Z

☀️ Test successful - checks-actions
Approved by: workingjubilee
Pushing 1f44f0a to master...

rust-timer · 2024-09-09T11:51:55Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#119229	Update mingw-w64 + GNU toolchain	`36f3dd6a5ee545cc396847e30083e7e2d6f96206` (link)
#128345	added support for GNU/Hurd on x86_64	`65025506e9d258ea07fbe3129b085d43430ec9bf` (link)
#128667	rustdoc: normalise type/field names	`8e1d0fdb1d59a7f259f1cc4e6b437847cc84fec8` (link)
#129876	Use sysroot crates maximally in `rustc_codegen_gcc`.	`f62dcc441a5c97baef86f8f76689de2658051813` (link)
#130034	Fix enabling wasm-component-ld to match other tools	`d048925d3ff065dd27b09aab5858a8a354bfb9a9` (link)
#130048	run-make-support: Add llvm-pdbutil	`35664cc0ccd00ad1cf5ff5b30159b44a1e1b2566` (link)
#130068	Test codegen when setting deployment target	`73e94fa061526f9309af41977f82f1ba25c9e9e8` (link)
#130070	Rename variant `AddrOfRegion` of `RegionVariableOrigin` to …	`815c2f18050e413da176e2fae3e1906cd9dd70e2` (link)
#130087	remove 'const' from 'Option::iter'	`618fa5a95d8346fdc9469107c37f19ca1b1f528b` (link)
#130090	make Result::copied unstably const	`e835bdd0959777a05b28a9ff72a08cfec619b7c3` (link)
#130092	Fixes typo in wasm32-wasip2 doc comment	`37c16b3edfc51b49f05934a7cd4ff81db6feca14` (link)
#130107	const: make ptr.is_null() stop execution on ambiguity	`ffe6eeadc5a580cb39edc1bcbacea5e61ddc818f` (link)
#130115	Remove needless returns detected by clippy in libraries	`07bab9c5cac97a00d4c3c3d429e6b9fa35539540` (link)
#130130	Miri subtree update	`ce5ccade59984d6745fff9116c9e99523ef8b1c5` (link)

previous master: 263a3aeeb8

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2024-09-09T13:03:22Z

Finished benchmarking commit (1f44f0a): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.2%	[0.2%, 0.2%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[0.2%, 0.2%]	1

Max RSS (memory usage)

Results (primary 2.7%, secondary -3.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	5.5%	[2.4%, 13.6%]	4
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-3.0%	[-3.7%, -2.3%]	2
Improvements ✅ (secondary)	-3.7%	[-3.7%, -3.7%]	1
All ❌✅ (primary)	2.7%	[-3.7%, 13.6%]	6

Cycles

Results (primary 3.9%, secondary -4.0%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.9%	[3.9%, 3.9%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.0%	[-4.0%, -4.0%]	1
All ❌✅ (primary)	3.9%	[3.9%, 3.9%]	1

Binary size

Results (primary 0.1%, secondary 0.2%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.0%, 0.8%]	22
Regressions ❌ (secondary)	0.2%	[0.0%, 0.3%]	15
Improvements ✅ (primary)	-0.1%	[-0.4%, -0.0%]	6
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[-0.4%, 0.8%]	28

Bootstrap: 757.632s -> 756.978s (-0.09%)
Artifact size: 341.17 MiB -> 341.27 MiB (0.03%)

The Miri Cronjob Bot and others added 30 commits September 1, 2024 04:55

Preparing for merge from rustc

3a693f2

Merge from rustc

a9477c7

fmt

b71297f

move addr_from_alloc_id logic into its own function

53451c2

Auto merge of rust-lang#3854 - rust-lang:rustup-2024-09-01, r=RalfJung

3c0996b

Automatic Rustup

Upgrade CI's mingw-w64 toolchain

4ee58db

rustdoc: normalise type/field names in rustdoc-json-types/jsondoclint

f2696ab

Preparing for merge from rustc

6c09243

Merge from rustc

9fe4539

Auto merge of rust-lang#3857 - rust-lang:rustup-2024-09-02, r=RalfJung

d0f23b4

Automatic Rustup

Detect pthread_mutex_t is moved

5f22103

See: rust-lang#3749

Preparing for merge from rustc

81a08bc

Merge from rustc

2fccb4b

Auto merge of rust-lang#3862 - rust-lang:rustup-2024-09-06, r=RalfJung

0903724

Automatic Rustup

miri.bat: use nightly toolchain

2d6489e

Auto merge of rust-lang#3864 - RalfJung:miri-bat-nightly, r=RalfJung

72aa65b

miri.bat: use nightly toolchain Hopefully fixes rust-lang/miri#3863 (but I can't test that)

Fix comment in mutex_id_offset

4dfafb1

We no longer store the kind inside the pthread_mutex_t, so this comment is outdated.

Auto merge of rust-lang#3865 - Mandragorian:doc_fixes_pthreads, r=Ral…

59cb24d

…fJung Fix comment in mutex_id_offset We no longer store the kind inside the pthread_mutex_t, so this comment is outdated. Sorry I didn't catch this in the original PR.

Fix a typo in the wasm-component-ld README

c1ff6fd

Test codegen when setting deployment target

c788dcc

Rename variant AddrOfRegion of RegionVariableOrigin to `BorrowReg…

c0b0627

…ion` because "Borrow" is the more idiomatic Rust term than "AddrOf".

remove 'const' from 'Option::iter'

f7d4da6

make Result::copied unstably const

03e0c8e

Fixes typo in wasm32-wasip2 doc comment

cfe85a3

add some FIXME(const-hack)

3de6838

Rollup merge of rust-lang#130130 - RalfJung:miri-sync, r=RalfJung

3e01a5d

Miri subtree update r? `@ghost`

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 Sep 9, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 9, 2024

bors merged commit 1f44f0a into rust-lang:master Sep 9, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Sep 9, 2024

This was referenced Sep 9, 2024

unify llvm-bitcode-linker, wasm-component-ld and llvm-tools logics #130040

Merged

[Testing] use llvm-pdbutil #130049

Closed

rustdoc-json: change item ID's repr from a string to an int #130078

Merged

workingjubilee deleted the rollup-t5o827k branch September 9, 2024 18:19

This was referenced Sep 11, 2024

Update code to match rust-lang changes to rustdoc type/field names rust-lang/rustdoc-types#32

Closed

Failure with nightly-2024-09-10 and later due to renamed rustdoc JSON elements cargo-public-api/cargo-public-api#616

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 14 pull requests #130133

Rollup of 14 pull requests #130133

workingjubilee commented Sep 9, 2024

workingjubilee commented Sep 9, 2024

bors commented Sep 9, 2024

bors commented Sep 9, 2024

bors commented Sep 9, 2024

rust-timer commented Sep 9, 2024

rust-timer commented Sep 9, 2024

Rollup of 14 pull requests #130133

Rollup of 14 pull requests #130133

Conversation

workingjubilee commented Sep 9, 2024

workingjubilee commented Sep 9, 2024

bors commented Sep 9, 2024

bors commented Sep 9, 2024

bors commented Sep 9, 2024

rust-timer commented Sep 9, 2024

rust-timer commented Sep 9, 2024

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size