Rollup of 7 pull requests #131372

workingjubilee · 2024-10-07T18:10:56Z

Successful merges:

Don't allow the #[pointee] attribute where it doesn't belong #128721 (Don't allow the #[pointee] attribute where it doesn't belong)
skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on #130479 (skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on)
Couple of changes to make it easier to compile rustc for wasm #130899 (Couple of changes to make it easier to compile rustc for wasm)
rustc_borrowck memory management tweaks #131225 (rustc_borrowck memory management tweaks)
Remove valgrind test suite and support from compiletest, bootstrap and opt-dist #131351 (Remove valgrind test suite and support from compiletest, bootstrap and opt-dist)
Fix used_underscore_binding in rustc_serialize #131359 (Fix used_underscore_binding in rustc_serialize)
Mark Boxy as on vacation #131367 (Mark Boxy as on vacation)

r? @ghost
@rustbot modify labels: rollup

Signed-off-by: onur-ozkan <work@onurozkan.dev>

This is a subset of the patches I have on my rust fork to compile rustc for wasm32-wasip1.

The `regioncx` and `borrow_set` fields can be references instead of `Rc`. They use the existing `'a` lifetime. This avoids some heap allocations and is a bit simpler.

Refcounting isn't needed.

It can own these two fields.

Either `&T` or `Rc<T>` is preferable.

By making it own two of its fields.

…r=pnkfelix Don't allow the `#[pointee]` attribute where it doesn't belong Error if the `#[pointee]` attribute is applied to anything but generic type parameters. Closes rust-lang#128485 Related to rust-lang#123430

…tiple-candidates, r=Kobzol skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on Similar to rust-lang#108767, resolves the `multiple candidates` problem for ci-rustc. See rust-lang#122709 (comment) for more context. Blocker for rust-lang#122709.

…idtwco Couple of changes to make it easier to compile rustc for wasm This is a subset of the patches I have on my rust fork to compile rustc for wasm32-wasip1.

`rustc_borrowck` memory management tweaks Minor cleanups in `rustc_borrowck` relating to memory management. r? `@lqd`

Remove valgrind test suite and support from compiletest, bootstrap and opt-dist The `run-pass-valgrind` test suite is not exercised in CI, and as far as I'm aware nobody runs it (asked in https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Are.20the.20valgrind.20tests.20even.20used.20by.20anyone.3F). What's remaining of valgrind support in compiletest isn't even properly hooked up with bootstrap. The existing valgrind logic in compiletest is also straight up questionable, i.e. https://github.com/rust-lang/rust/blob/1b3b8e7b0265162853c650ead09905bc3cdaeae9/src/tools/compiletest/src/runtest/valgrind.rs#L7-L12 It just runs valgrind tests as `rpass` if no valgrind path is provided to compiletest from bootstrap -- but bootstrap doesn't even pass a valgrind path to compiletest in the first place, so this always ran as `rpass` tests. So what is this even testing? So if it's not testing anything, let's delete it. Closes rust-lang#44816 by deleting the test suite :3 <img src="https://github.com/user-attachments/assets/99525bf7-e85b-40ba-9281-e4e1e275c4e8" width=300 />

…nding, r=jieyouxu Fix used_underscore_binding in rustc_serialize Hi, This PR fixes the following clippy warnings in rustc_serialize ``` warning: used underscore-prefixed binding --> compiler/rustc_serialize/src/opaque.rs:443:27 | 443 | debug_assert_eq!((_end_pos - _start_pos), IntEncodedWithFixedSize::ENCODED_SIZE); | ^^^^^^^^ | note: binding is defined here --> compiler/rustc_serialize/src/opaque.rs:442:13 | 442 | let _end_pos = e.position(); | ^^^^^^^^ = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#used_underscore_binding = note: requested on the command line with `-W clippy::used-underscore-binding` warning: used underscore-prefixed binding --> compiler/rustc_serialize/src/opaque.rs:443:38 | 443 | debug_assert_eq!((_end_pos - _start_pos), IntEncodedWithFixedSize::ENCODED_SIZE); | ^^^^^^^^^^ | note: binding is defined here --> compiler/rustc_serialize/src/opaque.rs:440:13 | 440 | let _start_pos = e.position(); | ^^^^^^^^^^ = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#used_underscore_binding ``` Best regards, Michal

Mark Boxy as on vacation Boxy asked me to do this since she's busy :D cc `@BoxyUwU`

workingjubilee · 2024-10-07T18:11:03Z

@bors r+ rollup=never p=7

bors · 2024-10-07T18:11:06Z

📌 Commit ee6663e has been approved by workingjubilee

It is now in the queue for this repository.

bors · 2024-10-07T18:12:31Z

⌛ Testing commit ee6663e with merge baaf3e6...

bors · 2024-10-07T21:03:44Z

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

rust-timer · 2024-10-07T21:05:43Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#128721	Don't allow the `#[pointee]` attribute where it doesn't bel…	`a31fdf79cd352e289805d5c40442ffeededb75e0` (link)
#130479	skip in-tree compiler build for llvm-bitcode-linker if ci-r…	`f46a037a783d2c3b6c6a328011d33e03870bc738` (link)
#130899	Couple of changes to make it easier to compile rustc for wa…	`1c71c1fb95866c4e6e8af0e1ff5ef575fbcc7581` (link)
#131225	`rustc_borrowck` memory management tweaks	`02fcdd229a131b1b1ead93112c41627887ae5eb5` (link)
#131351	Remove valgrind test suite and support from compiletest, bo…	`fb35d20c448e59ad7aaf39727dfe260b32609894` (link)
#131359	Fix used_underscore_binding in rustc_serialize	`67d212a64f928488c231b32d411209148ee7865c` (link)
#131367	Mark Boxy as on vacation	`7916ac073a65d426e37f4613bb6cea76c774e2eb` (link)

previous master: 7caad69253

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-10-07T22:20:55Z

Finished benchmarking commit (baaf3e6): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.3%	[-0.3%, -0.2%]	3
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.1%]	9
All ❌✅ (primary)	-0.3%	[-0.3%, -0.2%]	3

Max RSS (memory usage)

Results (primary 2.4%, secondary 0.5%)

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)	2.4%	[1.5%, 3.2%]	2
Regressions ❌ (secondary)	1.5%	[0.8%, 2.9%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.8%	[-0.8%, -0.8%]	3
All ❌✅ (primary)	2.4%	[1.5%, 3.2%]	2

Cycles

Results (primary 5.7%, secondary 2.6%)

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.7%	[5.7%, 5.7%]	1
Regressions ❌ (secondary)	2.6%	[2.1%, 3.0%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	5.7%	[5.7%, 5.7%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 774.662s -> 775.495s (0.11%)
Artifact size: 329.35 MiB -> 329.59 MiB (0.07%)

onur-ozkan and others added 23 commits September 18, 2024 07:03

skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on

c592eac

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Couple of changes to make it easier to compile rustc for wasm

6414d9f

This is a subset of the patches I have on my rust fork to compile rustc for wasm32-wasip1.

Use Rc less in MirBorrowckCtxt.

89e84c0

The `regioncx` and `borrow_set` fields can be references instead of `Rc`. They use the existing `'a` lifetime. This avoids some heap allocations and is a bit simpler.

Use Box instead of Rc for polonius_output.

3d7fe9e

Refcounting isn't needed.

Avoid Rc in BodyWithBorrowckFacts.

d9975ce

It can own these two fields.

Avoid &Rc<T> arguments.

56e849c

Either `&T` or `Rc<T>` is preferable.

Remove unnecessary lifetime in ConditionVisitor.

c69d174

By making it own two of its fields.

Disable -Zdual-proc-macros if the target doesn't support proc-macros

68034f8

Avoid unused import warning for the Ctrl-C handler on wasm

bf1f5c9

Check that #[pointee] is applied only to generic arguments

aa4f16a

Remove valgrind test suite and support from compiletest

a961be9

Remove valgrind test suite support from bootstrap

de588a6

Remove valgrind test suite from opt-dist

f1e408a

Delete the run-pass-valgrind test suite

fa3c25e

Fix used_underscore_binding in rustc_serialize

4085b48

Mark Boxy as on vacation

65cff8a

Rollup merge of rust-lang#130899 - bjorn3:wasi_bootstrap_fixes, r=dav…

31fbf67

…idtwco Couple of changes to make it easier to compile rustc for wasm This is a subset of the patches I have on my rust fork to compile rustc for wasm32-wasip1.

Rollup merge of rust-lang#131225 - nnethercote:rustc_borrowck-mm, r=lqd

9c4732a

`rustc_borrowck` memory management tweaks Minor cleanups in `rustc_borrowck` relating to memory management. r? `@lqd`

Rollup merge of rust-lang#131367 - compiler-errors:unboxy, r=lqd

ee6663e

Mark Boxy as on vacation Boxy asked me to do this since she's busy :D cc `@BoxyUwU`

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 Oct 7, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 7, 2024

bors merged commit baaf3e6 into rust-lang:master Oct 7, 2024
7 checks passed

rustbot added this to the 1.83.0 milestone Oct 7, 2024

This was referenced Oct 7, 2024

Rename macro SmartPointer to CoercePointee #131284

Merged

compiler: apply clippy::clone_on_ref_ptr for CI #131375

Merged

workingjubilee deleted the rollup-4tyqgx2 branch October 7, 2024 22:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #131372

Rollup of 7 pull requests #131372

workingjubilee commented Oct 7, 2024

workingjubilee commented Oct 7, 2024

bors commented Oct 7, 2024

bors commented Oct 7, 2024

bors commented Oct 7, 2024

rust-timer commented Oct 7, 2024

rust-timer commented Oct 7, 2024

Rollup of 7 pull requests #131372

Rollup of 7 pull requests #131372

Conversation

workingjubilee commented Oct 7, 2024

workingjubilee commented Oct 7, 2024

bors commented Oct 7, 2024

bors commented Oct 7, 2024

bors commented Oct 7, 2024

rust-timer commented Oct 7, 2024

rust-timer commented Oct 7, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size