Rollup of 8 pull requests #123147

matthiaskrgr · 2024-03-27T22:27:26Z

Successful merges:

Clarify atomic bit validity #121943 (Clarify atomic bit validity)
CFI: Fix drop and drop_in_place #123075 (CFI: Fix drop and drop_in_place)
Delegation: fix ICE on wrong Self instantiation #123101 (Delegation: fix ICE on wrong Self instantiation)
Load missing type of impl associated constant from trait definition #123130 (Load missing type of impl associated constant from trait definition)
chore: fix some comments #123133 (chore: fix some comments)
Some wording improvement #123136 (Some wording improvement)
num::NonZero::get can be 1 transmute instead of 2 #123139 (num::NonZero::get can be 1 transmute instead of 2)
Let nils know about changes to target docs #123142 (Let nils know about changes to target docs)

r? @ghost
@rustbot modify labels: rollup

The previous definition used the phrase "representation", which is ambiguous given the current state of memory model nomenclature in Rust. The new wording clarifies that size and bit validity are guaranteed to match the corresponding native integer type.

Co-authored-by: Taiki Endo <te316e89@gmail.com>

…he body id

Signed-off-by: xiaoxiangxianzi <zhaoyizheng@outlook.com>

Fix drop and drop_in_place by transforming self of drop and drop_in_place methods into Drop trait objects.

Clarify atomic bit validity The previous definition used the phrase "representation", which is ambiguous given the current state of memory model nomenclature in Rust. For integer types and for `AtomicPtr<T>`, the new wording clarifies that size and bit validity are guaranteed to match the corresponding native integer type/`*mut T`. For `AtomicBool`, the new wording clarifies that size, alignment, and bit validity are guaranteed to match `bool`. Note that we use the phrase "size and alignment" rather than "layout" since the latter term also implies that the field types are the same. This isn't true - `AtomicXxx` doesn't store an `xxx`, but rather an `UnsafeCell<xxx>`. This distinction is important for some `unsafe` code, which needs to reason about the presence or absence of interior mutability in order to ensure that their code is sound (see e.g. google/zerocopy#251).

…place, r=compiler-errors CFI: Fix drop and drop_in_place Fix drop and drop_in_place by transforming self of drop and drop_in_place methods into a Drop trait objects. This was split off from rust-lang#116404. cc `@compiler-errors` `@workingjubilee`

…trochenkov Delegation: fix ICE on wrong `Self` instantiation fixes rust-lang#119921 fixes rust-lang#119919 There is no way to instantiate `Self` param for caller in delegation item if 1. callee is a trait method && callee contains `Self` param 2. delegation item isn't an associative item In general, we can consider `Self` param as independent type param in these cases: ```rust trait Trait { fn foo(_: Option<&Self>) {...} } reuse Trait::foo; // will be desugared to: fn foo<T: Trait>(x: Option<&T>) { Trait::foo(x) } ``` But this requires early bound parameters support. For now, I suggest banning such cases to avoid ICE's. r? ``@petrochenkov``

…iler-errors Load missing type of impl associated constant from trait definition fixes rust-lang#123092 Also does some cleanups I discovered while analyzing this issue

chore: fix some comments

…sDenton Some wording improvement "Data" is usually considered as plural uncountable, therefore "some" seems to make more sense imo.

…pratt `num::NonZero::get` can be 1 transmute instead of 2 Just something I noticed in passing. No need for a `match` in here to call `unreachable_unchecked`, as `transmute_unchecked` will add the appropriate `llvm.assume` <https://rust.godbolt.org/z/W5hjeETnc>.

…ng, r=compiler-errors Let nils know about changes to target docs i'll probably expand the paths and add a message after rust-lang#121051 but i honestly don't expect that to land very soon lol, so it would be nice to get notified about changes already and watch what's happening there approve this pr if you're cool

matthiaskrgr · 2024-03-27T22:27:51Z

@bors r+ rollup=never p=8

bors · 2024-03-27T22:27:53Z

📌 Commit 145211e has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-03-28T00:30:50Z

⌛ Testing commit 145211e with merge d779a7a...

bors · 2024-03-28T02:46:40Z

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

rust-timer · 2024-03-28T02:48:54Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#121943	Clarify atomic bit validity	`761f19a588636de1902a31492613dcdbc85d9ba0` (link)
#123075	CFI: Fix drop and drop_in_place	`7db49d4676a44f93184306dea65743de37e9c157` (link)
#123101	Delegation: fix ICE on wrong `Self` instantiation	`2238acab791aa6c6baa557c86a849ef2b6037741` (link)
#123130	Load missing type of impl associated constant from trait de…	`b68d740521f8174679b9721dd63465a7dfadd37a` (link)
#123133	chore: fix some comments	`aa1a40d78b3b32da54b027d7e5efdad5462844d7` (link)
#123136	Some wording improvement	`38a9c7bd29ff8b006f9aee73236c9a905fe90694` (link)
#123139	`num::NonZero::get` can be 1 transmute instead of 2	`258d26707e60c446811610741db84f6a88913d3b` (link)
#123142	Let nils know about changes to target docs	`c9beccf25a1a2cb9eb1b6dcd77d0e7703157a28e` (link)

previous master: 9d70954948

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-28T08:12:59Z

Finished benchmarking commit (d779a7a): 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)	1.0%	[0.8%, 1.2%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.4%	[-0.7%, -0.3%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[-0.7%, 1.2%]	5

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)	3.4%	[0.5%, 6.4%]	6
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.2%	[-0.4%, -0.0%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.5%	[-0.4%, 6.4%]	8

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)	1.1%	[1.1%, 1.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-1.3%, -0.4%]	6
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.4%	[-1.3%, 1.1%]	7

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.5%	[0.1%, 3.0%]	9
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.3%	[-1.0%, -0.0%]	10
Improvements ✅ (secondary)	-0.5%	[-0.5%, -0.5%]	3
All ❌✅ (primary)	0.0%	[-1.0%, 3.0%]	19

Bootstrap: 670.576s -> 669.547s (-0.15%)
Artifact size: 315.77 MiB -> 315.72 MiB (-0.02%)

scottmcm · 2024-03-28T16:15:36Z

Perf queue is empty and I'm curious, so let's see if NonNull really mattered
@rust-timer build 258d267

rust-timer · 2024-03-28T17:31:25Z

Finished benchmarking commit (258d267): 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)	1.1%	[1.0%, 1.3%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.7%, -0.3%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.3%	[-0.7%, 1.3%]	4

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)	1.8%	[0.4%, 4.8%]	16
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.4%	[-2.7%, -0.0%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.4%	[-2.7%, 4.8%]	18

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.8%	[0.4%, 1.3%]	2
Regressions ❌ (secondary)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.8%	[0.4%, 1.3%]	2

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.5%	[0.1%, 3.0%]	9
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.3%	[-1.0%, -0.0%]	10
Improvements ✅ (secondary)	-0.5%	[-0.5%, -0.5%]	3
All ❌✅ (primary)	0.0%	[-1.0%, 3.0%]	19

Bootstrap: 670.576s -> 669.806s (-0.11%)
Artifact size: 315.77 MiB -> 315.65 MiB (-0.04%)

joshlf and others added 24 commits March 3, 2024 07:55

Clarify atomic bit validity

59a3a5d

The previous definition used the phrase "representation", which is ambiguous given the current state of memory model nomenclature in Rust. The new wording clarifies that size and bit validity are guaranteed to match the corresponding native integer type.

Clarify bit validity for AtomicBool

db34b08

Document AtomicPtr bit validity

00d21c9

Use "size and alignment" rather than layout

fba87f6

Update library/core/src/sync/atomic.rs

c50804c

Co-authored-by: Taiki Endo <te316e89@gmail.com>

Update library/core/src/sync/atomic.rs

a6e3e02

Co-authored-by: Taiki Endo <te316e89@gmail.com>

Load missing type of impl associated constant from trait definition

804c047

move type inference for missing types on constants into its own method

d0eb9c8

Remove a call-site to primary_body_of as it is only interested in t…

7786ee3

…he body id

Inline primary_body_of into its sole call site

86e750f

Delegation: fix ICE on wrong instantiation

0cd9708

chore: fix some comments

3157114

Signed-off-by: xiaoxiangxianzi <zhaoyizheng@outlook.com>

Some wording improvement

cc4a1f4

num::NonZero::get can be 1 transmute instead of 3

336ff42

CFI: Fix drop and drop_in_place

0b86081

Fix drop and drop_in_place by transforming self of drop and drop_in_place methods into Drop trait objects.

Let nils know about changes to target docs

df4eec8

Rollup merge of rust-lang#123130 - oli-obk:missing_type_taint, r=comp…

15fb2f2

…iler-errors Load missing type of impl associated constant from trait definition fixes rust-lang#123092 Also does some cleanups I discovered while analyzing this issue

Rollup merge of rust-lang#123133 - xiaoxiangxianzi:master, r=fmease

45cec32

chore: fix some comments

Rollup merge of rust-lang#123136 - Vagelis-Prokopiou:fix/docs, r=Chri…

ea7789c

…sDenton Some wording improvement "Data" is usually considered as plural uncountable, therefore "some" seems to make more sense imo.

rustbot added the rollup A PR which is a rollup label Mar 27, 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 27, 2024

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

bors merged commit d779a7a into rust-lang:master Mar 28, 2024
12 checks passed

rustbot added this to the 1.79.0 milestone Mar 28, 2024

rustbot added the perf-regression Performance regression. label Mar 28, 2024

This comment has been minimized.

Sign in to view

matthiaskrgr deleted the rollup-2t5ot36 branch September 1, 2024 17:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #123147

Rollup of 8 pull requests #123147

matthiaskrgr commented Mar 27, 2024

matthiaskrgr commented Mar 27, 2024

bors commented Mar 27, 2024

bors commented Mar 28, 2024

bors commented Mar 28, 2024

rust-timer commented Mar 28, 2024

rust-timer commented Mar 28, 2024

scottmcm commented Mar 28, 2024

This comment has been minimized.

rust-timer commented Mar 28, 2024

Rollup of 8 pull requests #123147

Rollup of 8 pull requests #123147

Conversation

matthiaskrgr commented Mar 27, 2024

matthiaskrgr commented Mar 27, 2024

bors commented Mar 27, 2024

bors commented Mar 28, 2024

bors commented Mar 28, 2024

rust-timer commented Mar 28, 2024

rust-timer commented Mar 28, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

scottmcm commented Mar 28, 2024

This comment has been minimized.

rust-timer commented Mar 28, 2024

Overall result: ❌✅ regressions and improvements - ACTION NEEDED