Rollup of 9 pull requests #122331

jhpratt · 2024-03-11T07:47:23Z

Successful merges:

Add slice::try_range #121148 (Add slice::try_range)
Win10: Use GetSystemTimePreciseAsFileTime directly #121633 (Win10: Use GetSystemTimePreciseAsFileTime directly)
Expose the Freeze trait again (unstably) and forbid implementing it manually #121840 (Expose the Freeze trait again (unstably) and forbid implementing it manually)
skip sanity check for non-host targets in check builds #121907 (skip sanity check for non-host targets in check builds)
std::threads: revisit stack address calculation on netbsd. #122002 (std::threads: revisit stack address calculation on netbsd.)
Add target.*.runner configuration for targets #122108 (Add target.*.runner configuration for targets)
RawVec::into_box: avoid unnecessary intermediate reference #122298 (RawVec::into_box: avoid unnecessary intermediate reference)
Allow multiple impl Into<{D,Subd}iagMessage> parameters in a function. #122315 (Allow multiple impl Into<{D,Subd}iagMessage> parameters in a function.)
Optimize process_heap_alloc #122326 (Optimize process_heap_alloc)

r? @ghost
@rustbot modify labels: rollup

This is exactly the same as GetSystemTimeAsFileTime except that it promises maximum precision.

like older linux glibc versions, we need to get the guard size and increasing the stack's bottom address accordingly.

This commit adds a `runner` field configuration to `config.toml` for specifying a wrapper executable when executing binaries for a target. This is pulled out of rust-lang#122036 where a WebAssembly runtime is used, for example, to execute tests for `wasm32-wasip1`. The name "runner" here is chosen to match Cargo's `CARGO_*_RUNNER` configuration, and to make things a bit more consistent this additionally renames compiletest's `--runtool` argument to `--runner`.

For `check` builds, since we only need to perform a sanity check on the host target, this patch skips target sanity checks on non-host targets. Signed-off-by: onur-ozkan <[email protected]>

The internal diagnostic lint currently only allows one, because that was all that occurred in practice. But rust-lang/rust-clippy/pull/12453 wants to introduce functions with more than one, and this limitation is getting in the way.

Add slice::try_range This adds a fallible version of the unstable `slice::range` (tracking: rust-lang#76393) which is highly requested in the tracking issue. Hoping this can slide by without an ACP (since the feature is already being tracked), but let me know otherwise.

Win10: Use `GetSystemTimePreciseAsFileTime` directly On Windows 10 we can use `GetSystemTimePreciseAsFileTime` directly instead of lazy loading it (with a fallback).

Expose the Freeze trait again (unstably) and forbid implementing it manually non-emoji version of rust-lang#121501 cc rust-lang#60715 This trait is useful for generic constants (associated consts of generic traits). See the test (`tests/ui/associated-consts/freeze.rs`) added in this PR for a usage example. The builtin `Freeze` trait is the only way to do it, users cannot work around this issue. It's also a useful trait for building some very specific abstrations, as shown by the usage by the `zerocopy` crate: google/zerocopy#941 cc ```@RalfJung``` T-lang signed off on reexposing this unstably: rust-lang#121501 (comment)

…eck, r=albertlarsan68 skip sanity check for non-host targets in `check` builds For `check` builds, since we only need to perform a sanity check on the host target, this patch skips target sanity checks on non-host targets. For more context, see rust-lang#121519 (comment) cc ``@saethlin``

…r=workingjubilee,riastradh std::threads: revisit stack address calculation on netbsd. like older linux glibc versions, we need to get the guard size and increasing the stack's bottom address accordingly.

…, r=WaffleLapkin Add `target.*.runner` configuration for targets This commit adds a `runner` field configuration to `config.toml` for specifying a wrapper executable when executing binaries for a target. This is pulled out of rust-lang#122036 where a WebAssembly runtime is used, for example, to execute tests for `wasm32-wasip1`. The name "runner" here is chosen to match Cargo's `CARGO_*_RUNNER` configuration, and to make things a bit more consistent this additionally renames compiletest's `--runtool` argument to `--runner`.

RawVec::into_box: avoid unnecessary intermediate reference Fixes the problem described [here](rust-lang/miri#3341 (comment)).

…sage, r=Nilstrieb Allow multiple `impl Into<{D,Subd}iagMessage>` parameters in a function. The internal diagnostic lint currently only allows one, because that was all that occurred in practice. But rust-lang/rust-clippy/pull/12453 wants to introduce functions with more than one, and this limitation is getting in the way. r? `@Nilstrieb`

Optimize `process_heap_alloc` This optimizes `process_heap_alloc` introduced in rust-lang#120205. From: ``` .text:0000000180027ED0 ; std::sys::pal::windows::alloc::process_heap_alloc::h703a613b3e25ff93 .text:0000000180027ED0 public _ZN3std3sys3pal7windows5alloc18process_heap_alloc17h703a613b3e25ff93E .text:0000000180027ED0 _ZN3std3sys3pal7windows5alloc18process_heap_alloc17h703a613b3e25ff93E proc near .text:0000000180027ED0 ; CODE XREF: std::sys::pal::common::alloc::realloc_fallback::hc4c96b4c24d03e77+23↑p .text:0000000180027ED0 ; std::sys::pal::common::alloc::realloc_fallback::hc4c96b4c24d03e77+55↑p ... .text:0000000180027ED0 push rsi .text:0000000180027ED1 push rdi .text:0000000180027ED2 sub rsp, 28h .text:0000000180027ED6 mov rsi, rdx .text:0000000180027ED9 mov edi, ecx .text:0000000180027EDB mov rcx, cs:_ZN3std3sys3pal7windows5alloc4HEAP17hb53ca4010cc29b62E ; std::sys::pal::windows::alloc::HEAP::hb53ca4010cc29b62 .text:0000000180027EE2 test rcx, rcx .text:0000000180027EE5 jnz short loc_180027EFC .text:0000000180027EE7 call cs:__imp_GetProcessHeap .text:0000000180027EED test rax, rax .text:0000000180027EF0 jz short loc_180027F0E .text:0000000180027EF2 mov rcx, rax .text:0000000180027EF5 mov cs:_ZN3std3sys3pal7windows5alloc4HEAP17hb53ca4010cc29b62E, rax ; std::sys::pal::windows::alloc::HEAP::hb53ca4010cc29b62 .text:0000000180027EFC .text:0000000180027EFC loc_180027EFC: ; CODE XREF: std::sys::pal::windows::alloc::process_heap_alloc::h703a613b3e25ff93+15↑j .text:0000000180027EFC mov edx, edi .text:0000000180027EFE mov r8, rsi .text:0000000180027F01 add rsp, 28h .text:0000000180027F05 pop rdi .text:0000000180027F06 pop rsi .text:0000000180027F07 jmp cs:__imp_HeapAlloc .text:0000000180027F0E ; --------------------------------------------------------------------------- .text:0000000180027F0E .text:0000000180027F0E loc_180027F0E: ; CODE XREF: std::sys::pal::windows::alloc::process_heap_alloc::h703a613b3e25ff93+20↑j .text:0000000180027F0E xor eax, eax .text:0000000180027F10 add rsp, 28h .text:0000000180027F14 pop rdi .text:0000000180027F15 pop rsi .text:0000000180027F16 retn .text:0000000180027F16 _ZN3std3sys3pal7windows5alloc18process_heap_alloc17h703a613b3e25ff93E endp ``` to ``` .text:0000000180027EE0 ; std::sys::pal::windows::alloc::process_heap_alloc::h70f9d61a631e5c16 .text:0000000180027EE0 public _ZN3std3sys3pal7windows5alloc18process_heap_alloc17h70f9d61a631e5c16E .text:0000000180027EE0 _ZN3std3sys3pal7windows5alloc18process_heap_alloc17h70f9d61a631e5c16E proc near .text:0000000180027EE0 ; CODE XREF: std::sys::pal::common::alloc::realloc_fallback::hc4c96b4c24d03e77+23↑p .text:0000000180027EE0 ; std::sys::pal::common::alloc::realloc_fallback::hc4c96b4c24d03e77+54↑p ... .text:0000000180027EE0 mov rcx, cs:_ZN3std3sys3pal7windows5alloc4HEAP17hb53ca4010cc29b62E ; std::sys::pal::windows::alloc::HEAP::hb53ca4010cc29b62 .text:0000000180027EE7 test rcx, rcx .text:0000000180027EEA jz short loc_180027EF3 .text:0000000180027EEC jmp cs:__imp_HeapAlloc .text:0000000180027EF3 ; --------------------------------------------------------------------------- .text:0000000180027EF3 .text:0000000180027EF3 loc_180027EF3: ; CODE XREF: std::sys::pal::windows::alloc::process_heap_alloc::h70f9d61a631e5c16+A↑j .text:0000000180027EF3 mov ecx, edx .text:0000000180027EF5 mov rdx, r8 .text:0000000180027EF8 jmp std__sys__pal__windows__alloc__process_heap_init_and_alloc .text:0000000180027EF8 _ZN3std3sys3pal7windows5alloc18process_heap_alloc17h70f9d61a631e5c16E endp ``` r? `@ChrisDenton`

jhpratt · 2024-03-11T07:47:32Z

@bors r+ rollup=never p=9

bors · 2024-03-11T07:47:34Z

📌 Commit 5a3d6c9 has been approved by jhpratt

It is now in the queue for this repository.

bors · 2024-03-11T10:22:13Z

⌛ Testing commit 5a3d6c9 with merge e919669...

bors · 2024-03-11T12:26:09Z

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing e919669 to master...

rust-timer · 2024-03-11T12:28:40Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#121148	Add slice::try_range	`d4a10abf5a09e83a8f15a51352573df7a04f7cb7` (link)
#121633	Win10: Use `GetSystemTimePreciseAsFileTime` directly	`6a3c1b9a5dc103045fa7d0c8f5ccb55eb3cc8692` (link)
#121840	Expose the Freeze trait again (unstably) and forbid impleme…	`e94c1ca3d9393f73449a354f3557aaeb0e07fcc1` (link)
#121907	skip sanity check for non-host targets in `check` builds	`964109d832fb756b644bd2a055834d78d8a16793` (link)
#122002	std::threads: revisit stack address calculation on netbsd.	`635d1ed6e3de90854798dd751f71bcacad5bc3d9` (link)
#122108	Add `target.*.runner` configuration for targets	`664d40497e1b7d7d4e6ffe4468e9021794cc0a75` (link)
#122298	RawVec::into_box: avoid unnecessary intermediate reference	`f5e5be5c6c0980ff031e78ae3a890a4afc1caaee` (link)
#122315	Allow multiple `impl Into<{D,Subd}iagMessage>` parameters i…	`c6900e8416abd5969dcf513ebe99946e722b82ae` (link)
#122326	Optimize `process_heap_alloc`	`bdb302d4059dfe2aea46748a9da15563241f1b22` (link)

previous master: 6639672554

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-03-11T14:00:46Z

Finished benchmarking commit (e919669): comparison URL.

Overall result: ❌✅ regressions and improvements - 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.8%	[0.8%, 0.8%]	1
Regressions ❌ (secondary)	0.3%	[0.2%, 0.3%]	2
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[-0.5%, 0.8%]	2

Max RSS (memory usage)

Results

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.6%	[2.2%, 3.0%]	2
Regressions ❌ (secondary)	2.6%	[1.6%, 3.4%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.6%	[2.2%, 3.0%]	2

Cycles

Results

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)	2.4%	[0.7%, 6.8%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

Results

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.0%	[-0.1%, -0.0%]	11
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.0%	[-0.1%, -0.0%]	11

Bootstrap: 645.914s -> 647.279s (0.21%)
Artifact size: 309.95 MiB -> 310.00 MiB (0.01%)

clarfonthey and others added 23 commits February 15, 2024 10:18

Add slice::try_range

290cbdf

Win10: Use GetSystemTimePreciseAsFileTime directly

7e6dccc

Add shim for GetSystemTimePreciseAsFileTime

eb40adb

This is exactly the same as GetSystemTimeAsFileTime except that it promises maximum precision.

Expose Freeze trait again

f030d49

Forbid implementing Freeze even if the trait is stabilized

7849230

std::threads: revisit stack address calculation on netbsd.

7ff3bad

like older linux glibc versions, we need to get the guard size and increasing the stack's bottom address accordingly.

Add a change entry

9bdb8a6

further changes from feedback

ffdd97f

skip sanity check for non-host targets in check builds

e5e1fa6

For `check` builds, since we only need to perform a sanity check on the host target, this patch skips target sanity checks on non-host targets. Signed-off-by: onur-ozkan <[email protected]>

RawVec::into_box: avoid unnecessary intermediate reference

81ebaf2

test into_boxed_slice with custom allocator in Miri

a7443f5

Optimize process_heap_alloc

50760aa

Rollup merge of rust-lang#121633 - ChrisDenton:precise, r=Nilstrieb

1a989e0

Win10: Use `GetSystemTimePreciseAsFileTime` directly On Windows 10 we can use `GetSystemTimePreciseAsFileTime` directly instead of lazy loading it (with a fallback).

Rollup merge of rust-lang#122002 - devnexen:thread_stack_netbsd_fix, …

b3ac6fa

…r=workingjubilee,riastradh std::threads: revisit stack address calculation on netbsd. like older linux glibc versions, we need to get the guard size and increasing the stack's bottom address accordingly.

Rollup merge of rust-lang#122298 - RalfJung:raw-vec-into-box, r=cuviper

eb1ebbf

RawVec::into_box: avoid unnecessary intermediate reference Fixes the problem described [here](rust-lang/miri#3341 (comment)).

rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 11, 2024

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 Mar 11, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 11, 2024

bors merged commit e919669 into rust-lang:master Mar 11, 2024
12 checks passed

rustbot added this to the 1.78.0 milestone Mar 11, 2024

bors mentioned this pull request Mar 11, 2024

[bootstrap] Move the split-debuginfo setting to the per-target section #121754

Merged

jhpratt deleted the rollup-cbl8xsy branch March 12, 2024 01:43

matthiaskrgr mentioned this pull request Sep 15, 2024

ICE: asked to assemble auto trait candidates of unexpected type: FreshTy(0) #130411

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #122331

Rollup of 9 pull requests #122331

jhpratt commented Mar 11, 2024

jhpratt commented Mar 11, 2024

bors commented Mar 11, 2024

bors commented Mar 11, 2024

bors commented Mar 11, 2024

rust-timer commented Mar 11, 2024

rust-timer commented Mar 11, 2024

Rollup of 9 pull requests #122331

Rollup of 9 pull requests #122331

Conversation

jhpratt commented Mar 11, 2024

jhpratt commented Mar 11, 2024

bors commented Mar 11, 2024

bors commented Mar 11, 2024

bors commented Mar 11, 2024

rust-timer commented Mar 11, 2024

rust-timer commented Mar 11, 2024

Overall result: ❌✅ regressions and improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size