Rollup of 8 pull requests #126965

matthiaskrgr · 2024-06-25T19:33:46Z

Successful merges:

Detect unused structs which derived Default #126302 (Detect unused structs which derived Default)
Remove internal PathBuf::as_mut_vec #126885 (Remove internal PathBuf::as_mut_vec)
Specify target specific linker for riscv64gc-gnu job #126916 (Specify target specific linker for riscv64gc-gnu job)
Tweak a confusing comment in create_match_candidates #126926 (Tweak a confusing comment in create_match_candidates)
core: VaArgSafe is an unsafe trait #126927 (core: VaArgSafe is an unsafe trait)
Tweak FlatPat::new to avoid a temporarily-invalid state #126932 (Tweak FlatPat::new to avoid a temporarily-invalid state)
Add missing slash in const_eval_select doc comment #126946 (Add missing slash in const_eval_select doc comment)
Delegation: ast lowering refactor #126947 (Delegation: ast lowering refactor)

r? @ghost
@rustbot modify labels: rollup

`T: VaArgSafe` is relied on for soundness. Safe impls promise nothing. Therefore this must be an unsafe trait. Slightly pedantic, as only core can impl this, but we could choose to unseal the trait. That would allow soundly (but unsafely) implementing this for e.g. a `#[repr(C)] struct` that should be passable by varargs.

It was somewhat confusing that the old constructor would create a `FlatPat` in a (possibly) non-simplified state, and then simplify its contents in-place. So instead we now create its fields as local variables, perform simplification, and then create the struct afterwards. This doesn't affect correctness, but is less confusing.

…thBuf::_push`

…orms rust-lang#126333

…=michaelwoerister Detect unused structs which derived Default  Fixes rust-lang#98871

…ec, r=workingjubilee Remove internal `PathBuf::as_mut_vec` closes rust-lang#126333

…specify-linker, r=Kobzol Specify target specific linker for `riscv64gc-gnu` job In rust-lang#125669 I updated the `riscv64gc-gnu` job to be more in line with other jobs, like the `armhf-gnu` one. I missed something important, though! Since the `riscv64gc-unknown-linux-gnu` builds go through a cross compiler, invoking `cc` is not correct! That would invoke the `x86_64-unknown-linux-gnu` linker, instead of the `riscv64gc-unknown-linux-gnu` linker. While developing rust-lang#125669 I assumed this line would have been sufficient, however it was not: https://github.com/rust-lang/rust/blob/553a69030e5a086eb3841d020db8c9c463948c72/src/ci/docker/host-x86_64/disabled/riscv64gc-gnu/Dockerfile#L27-L28 Unfortunately, without the linker set, `cc` is invoked, and the following linker error occurs: <details> <summary>Long output</summary> ``` 2024-06-21T14:37:54.4786899Z === HAYSTACK === 2024-06-21T14:37:54.4787240Z error: linking with `cc` failed: exit status: 1 2024-06-21T14:37:54.4787589Z | 2024-06-21T14:37:54.4806781Z = note: LC_ALL="C" PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" VSLANG="1033" "cc" "/tmp/rustc7Ju6va/symbols.o" "inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o" "inaccessible/tmp/program.dv9uftjrq86w5xa7l2eo7g9l7.rcgu.o" "-Wl,--as-needed" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib" "-Wl,-Bstatic" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libstd-bb9ed017b7d70437.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libpanic_unwind-5b34ef68c22a7b9b.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libobject-4b9224407e296f51.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libmemchr-1eaaa8d74bbe0b36.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libaddr2line-b34292f7086867e9.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libgimli-1927540c5dff6690.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/librustc_demangle-ab493befe3742702.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libstd_detect-41195694489636c4.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libhashbrown-6905da49c8a1542a.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/librustc_std_workspace_alloc-bbc6290f03f92349.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libminiz_oxide-7a4683d4a82cf47c.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libadler-071583516cdbce90.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libunwind-d84b176d2f4c1334.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libcfg_if-92b7de0160f87442.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/liblibc-cff1533ea7c26263.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/liballoc-49e374c13f9e6132.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/librustc_std_workspace_core-9389dcc15b2f7f7b.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libcore-46f0fa14905fdc5c.rlib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib/libcompiler_builtins-20e1af401f90cd1c.rlib" "-Wl,-Bdynamic" "-lgcc_s" "-lutil" "-lrt" "-lpthread" "-lm" "-ldl" "-lc" "-Wl,--eh-frame-hdr" "-Wl,-z,noexecstack" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib" "-o" "program" "-Wl,--gc-sections" "-pie" "-Wl,-z,relro,-z,now" "-nodefaultlibs" 2024-06-21T14:37:54.4823900Z = note: /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4825032Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4826130Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4827200Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4828279Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4829365Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4830474Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4831554Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4833002Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4834116Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: Relocations in generic ELF (EM: 243) 2024-06-21T14:37:54.4835237Z /usr/bin/ld: inaccessible/tmp/program.program.45572bc5f2b14090-cgu.0.rcgu.o: error adding symbols: file in wrong format 2024-06-21T14:37:54.4835971Z collect2: error: ld returned 1 exit status 2024-06-21T14:37:54.4836449Z 2024-06-21T14:37:54.4836584Z 2024-06-21T14:37:54.4836744Z error: aborting due to 1 previous error 2024-06-21T14:37:54.4836983Z 2024-06-21T14:37:54.4836990Z 2024-06-21T14:37:54.4837083Z === NEEDLE === 2024-06-21T14:37:54.4837518Z failed to find or create the directory specified by `--temps-dir` 2024-06-21T14:37:54.4838250Z thread 'main' panicked at /checkout/tests/run-make/inaccessible-temp-dir/rmake.rs:35:14: 2024-06-21T14:37:54.4838801Z needle was not found in haystack 2024-06-21T14:37:54.4839270Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace 2024-06-21T14:37:54.4840125Z thread 'main' panicked at /checkout/tests/run-make/inaccessible-temp-dir/rmake.rs:27:5: 2024-06-21T14:37:54.4840759Z called `Result::unwrap()` on an `Err` value: Any { .. } 2024-06-21T14:37:54.4841194Z ------------------------------------------ ``` </details> By setting `--set target.riscv64gc-unknown-linux-gnu.linker=riscv64-linux-gnu-gcc` the correct linker is invoked. ## Testing > [!NOTE] > `riscv64gc-unknown-linux-gnu` is a [**Tier 2 with Host Tools** platform](https://doc.rust-lang.org/beta/rustc/platform-support.html), all tests may not necessarily pass! This change should only make fix existing broken tests (like `inaccessible-temp-dir`) while introducing no new breakage. You can test out the job locally: ```sh mv src/ci/docker/host-x86_64/disabled/riscv64gc-gnu src/ci/docker/host-x86_64/riscv64gc-gnu DEPLOY=1 ./src/ci/docker/run.sh riscv64gc-gnu ```

…ieril Tweak a confusing comment in `create_match_candidates` This comment was accurate at the time it was written, but various later changes reshuffled things in ways that caused the existing comment to become confusing. I've therefore tried to clarify that *these* candidates are 1:1 with match arms, while also warning that that isn't the case in general.

…, r=joboet core: VaArgSafe is an unsafe trait `T: VaArgSafe` is relied on for soundness. Safe impls promise nothing. Therefore this must be an unsafe trait. Slightly pedantic, as only core can impl this, but we *could* choose to unseal the trait. That would allow soundly (but unsafely) implementing this for e.g. a `#[repr(C)] struct` that should be passable by varargs. Relates to rust-lang#44930

Tweak `FlatPat::new` to avoid a temporarily-invalid state It was somewhat confusing that the old constructor would create a `FlatPat` in a (possibly) non-simplified state, and then simplify its contents in-place. So instead we now create its fields as local variables, perform simplification, and then create the struct afterwards. This doesn't affect correctness, but is less confusing. --- I've also included some semi-related comments that I made while trying to navigate this code.

Add missing slash in `const_eval_select` doc comment In the middle of the doc comment, one line has only two slashes instead of three and isn't included in the [rendered documentation](https://doc.rust-lang.org/std/intrinsics/fn.const_eval_select.html#stability-concerns). This PR adds the missing slash.

…ctoring, r=petrochenkov Delegation: ast lowering refactor refactoring changes for rust-lang#126699 r? ```@petrochenkov```

matthiaskrgr · 2024-06-25T19:33:58Z

@bors r+ rollup=never p=8

bors · 2024-06-25T19:34:01Z

📌 Commit 4ebd69c has been approved by matthiaskrgr

It is now in the queue for this repository.

matthiaskrgr · 2024-06-25T21:12:40Z

@bors p=101

bors · 2024-06-25T21:13:51Z

⌛ Testing commit 4ebd69c with merge fda509e...

bors · 2024-06-25T23:28:52Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing fda509e to master...

rust-timer · 2024-06-25T23:31:09Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#126302	Detect unused structs which derived Default	`f37fcced1cbba9f7a480ad0291ce332857f580a4` (link)
#126885	Remove internal `PathBuf::as_mut_vec`	`d928d17bcc63a749d7b626e94ee6f188555d455a` (link)
#126916	Specify target specific linker for `riscv64gc-gnu` job	`f82d77727a00edc1a69acfa28644f79c43512951` (link)
#126926	Tweak a confusing comment in `create_match_candidates`	`ca9f23f1101b8138752a53de5fd2c19e1d3516c2` (link)
#126927	core: VaArgSafe is an unsafe trait	`6fc046e0a419a4063bbce9cc953cf02e95775f25` (link)
#126932	Tweak `FlatPat::new` to avoid a temporarily-invalid state	`d2266716514598ed5e3dc9afd225221c1348c026` (link)
#126946	Add missing slash in `const_eval_select` doc comment	`07d6e1a20db394d58d791f1de784790c2b188d72` (link)
#126947	Delegation: ast lowering refactor	`9de87f6456ec2f3c652c4d0b1daeae6f6fea0842` (link)

previous master: c290e9de32

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-06-26T00:44:30Z

Finished benchmarking commit (fda509e): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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
Regressions ❌ (secondary)	3.3%	[1.7%, 5.8%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.0%	[-5.7%, -0.3%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -4.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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.2%	[-4.2%, -4.1%]	2
All ❌✅ (primary)	-	-	0

Cycles

Results (primary 1.7%, secondary 2.4%)

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)	1.7%	[1.7%, 1.7%]	1
Regressions ❌ (secondary)	4.5%	[4.3%, 4.8%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.8%	[-3.8%, -3.8%]	1
All ❌✅ (primary)	1.7%	[1.7%, 1.7%]	1

Binary size

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

Bootstrap: 694.374s -> 693.553s (-0.12%)
Artifact size: 324.66 MiB -> 326.78 MiB (0.65%)

Kobzol · 2024-06-26T06:34:08Z

@rust-timer build f37fcce

rust-timer · 2024-06-26T07:49:18Z

Finished benchmarking commit (f37fcce): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

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
Regressions ❌ (secondary)	3.3%	[1.7%, 5.8%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.9%	[-5.5%, -0.3%]	2
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary -3.9%)

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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.9%	[-3.9%, -3.9%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results (secondary 0.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)	-	-	0
Regressions ❌ (secondary)	3.7%	[2.2%, 4.6%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.3%	[-5.4%, -3.5%]	3
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 694.374s -> 693.924s (-0.06%)
Artifact size: 324.66 MiB -> 326.74 MiB (0.64%)

lqd · 2024-06-26T08:19:30Z

The artifact size regression looks incredibly unexpected... There's a cyclic +2MB -2MB noise spike going on in many recent PRs. Something weird is going on.

Having graphs for artifact sizes could be cool -- at the very least so we can also see when this noise started 😓

The most recent one seems to be #125740 (comment) but I remember scottmcm mentioning this swing in an older PR than this.

Kobzol · 2024-06-26T09:55:37Z

Created rust-lang/rustc-perf#1932 to track this.

pnkfelix · 2024-07-02T19:24:52Z

visiting for weekly rustc-perf triage

solely regressions to secondary benchmark: derive
marking as triaged

@rustbot label: +perf-regression-triaged

Hoverbear and others added 19 commits June 24, 2024 12:58

Specify target specific linker for riscv64gc-gnu job

553a690

Tweak a confusing comment in create_match_candidates

8016940

Add missing slash in const_eval_select doc comment

c7b579a

rust-lang#126333 remove PathBuf::as_mut_vec reference at top of `Pa…

2155c6c

…thBuf::_push`

inner truncate methods for UEFI platforms

b08cd69

remove references to PathBuf::as_mut_vec in PathBuf::_set_extension

7e187e8

PathBuf::as_mut_vec removed and verified for UEFI and Windows platf…

aa46a33

…orms rust-lang#126333

Delegation: ast lowering refactor

d30d85f

Detect unused structs which derived Default

6997b68

Rollup merge of rust-lang#126885 - Borgerr:rm_internal_pathbuf_asmutv…

9d7e146

…ec, r=workingjubilee Remove internal `PathBuf::as_mut_vec` closes rust-lang#126333

Rollup merge of rust-lang#126947 - Bryanskiy:delegation-lowering-refa…

4ebd69c

…ctoring, r=petrochenkov Delegation: ast lowering refactor refactoring changes for rust-lang#126699 r? ```@petrochenkov```

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

compiler-errors mentioned this pull request Jun 25, 2024

Update cargo #126955

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 25, 2024

bors merged commit fda509e into rust-lang:master Jun 25, 2024
7 checks passed

rustbot added this to the 1.81.0 milestone Jun 25, 2024

bors mentioned this pull request Jun 25, 2024

Enable riscv64gc-gnu testing #126641

Open

This was referenced Jun 26, 2024

Delegation: support coercion for target expression #126699

Merged

Give VaList its own home #126921

Merged

rustbot added the perf-regression Performance regression. label Jun 26, 2024

This comment has been minimized.

Sign in to view

Kobzol mentioned this pull request Jun 26, 2024

Detect unused structs which derived Default #126302

Merged

This was referenced Jun 26, 2024

Improve symbol normalization in binary_stats rust-lang/rustc-perf#1931

Merged

Add historical charts for compiler artifact sizes rust-lang/rustc-perf#1932

Open

rustbot added the perf-regression-triaged The performance regression has been triaged. label Jul 2, 2024

matthiaskrgr deleted the rollup-x3kamn8 branch September 1, 2024 17:36

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #126965

Rollup of 8 pull requests #126965

matthiaskrgr commented Jun 25, 2024

matthiaskrgr commented Jun 25, 2024

bors commented Jun 25, 2024

matthiaskrgr commented Jun 25, 2024

bors commented Jun 25, 2024

bors commented Jun 25, 2024

rust-timer commented Jun 25, 2024

rust-timer commented Jun 26, 2024

Kobzol commented Jun 26, 2024

This comment has been minimized.

rust-timer commented Jun 26, 2024

lqd commented Jun 26, 2024 •

edited

Loading

Kobzol commented Jun 26, 2024

pnkfelix commented Jul 2, 2024

Rollup of 8 pull requests #126965

Rollup of 8 pull requests #126965

Conversation

matthiaskrgr commented Jun 25, 2024

matthiaskrgr commented Jun 25, 2024

bors commented Jun 25, 2024

matthiaskrgr commented Jun 25, 2024

bors commented Jun 25, 2024

bors commented Jun 25, 2024

rust-timer commented Jun 25, 2024

rust-timer commented Jun 26, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Kobzol commented Jun 26, 2024

This comment has been minimized.

rust-timer commented Jun 26, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

lqd commented Jun 26, 2024 • edited Loading

Kobzol commented Jun 26, 2024

pnkfelix commented Jul 2, 2024

lqd commented Jun 26, 2024 •

edited

Loading