Rollup of 8 pull requests #117135

matthiaskrgr · 2023-10-24T17:29:57Z

Successful merges:

Introduce -C instrument-coverage=branch to gate branch coverage #116094 (Introduce -C instrument-coverage=branch to gate branch coverage)
Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs #116396 (Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs)
Derive Ord, PartialOrd and Hash for SocketAddr* #116714 (Derive Ord, PartialOrd and Hash for SocketAddr*)
Avoid unnecessary renumbering during borrowck #116792 (Avoid unnecessary renumbering during borrowck)
Suggest unwrap/expect for let binding type mismatch #116841 (Suggest unwrap/expect for let binding type mismatch)
Add target features for LoongArch #116943 (Add target features for LoongArch)
Add method to convert internal to stable constructs #117010 (Add method to convert internal to stable constructs)
Remove #[allow(incomplete_features)] from RPITIT/AFIT tests #117127 (Remove #[allow(incomplete_features)] from RPITIT/AFIT tests)

r? @ghost
@rustbot modify labels: rollup

...instead of hand rolling impls, since 1. It's nicer 2. It fixes a buggy `Ord` impl of `SocketAddrV6`, which ignored half of the fields

Note: We do not expect to provide internalizing methods for all StableMIR constructs. They exist only to help migrating efforts to allow users to mix StableMIR and internal constructs.

This flag has to be used in combination with `-Zunstable-options`, and is added in advance of adding branch coverage instrumentation.

…esleywiser Introduce `-C instrument-coverage=branch` to gate branch coverage This was extracted from rust-lang#115061 and can land independently from other coverage related work. The flag is unused for now, but is added in advance of adding branch coverage support. It is an unstable, nightly only flag that needs to be used in combination with `-Zunstable-options`, like so: `-Zunstable-options -C instrument-coverage=branch`. The goal is to develop branch coverage as an unstable opt-in feature first, before it matures and can be turned on by default.

…tics-7, r=oli-obk Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` r? ``@compiler-errors``

…shtriplett Derive `Ord`, `PartialOrd` and `Hash` for `SocketAddr*` Fixes rust-lang#116711 The main pain of this PR is to fix the buggy impl of `Ord` for `SocketAddrV6`, which ignored half of the fields (while `PartialEq` is derived): https://github.com/rust-lang/rust/blob/4603f0b8afb495ae56cd4c8f70d5d478d906ac54/library/core/src/net/socket_addr.rs#L99-L106 https://github.com/rust-lang/rust/blob/4603f0b8afb495ae56cd4c8f70d5d478d906ac54/library/core/src/net/socket_addr.rs#L676 For me it looks like a simple copy-paste error made in rust-lang#72239 (copy from v4 impl) (cc `@hch12907),` as I don't see this behavior being mentioned anywhere on the PR and it also does not respect `cmp` trait "rules". I also do not see any reasons for those impls to _not_ be derived. It's a shame we did not notice this for 28 versions/3 years. I guess this is a bug fix, but I'm not sure what the process here should be. r? libs

Avoid unnecessary renumbering during borrowck Currently, after renumbering there are always unused `RegionVid`s if the return type contains any regions, this is due to `visit_ty` being called twice on the same `Ty`: once with `TyContext::ReturnTy` and once with `TyContext::LocalDecl { local: _0 }`. This PR skips renumbering the first time around.

…xpect, r=b-naber Suggest unwrap/expect for let binding type mismatch Found it when investigating rust-lang#116738 I'm not sure whether it's a good style to suggest `unwrap`, seems it's may helpful for newcomers. rust-lang#116738 needs another fix to improve it.

Add target features for LoongArch

Add method to convert internal to stable constructs This is an alternative implementation to rust-lang#116999. I believe we can still improve the logic a bit here, but I wanted to see which direction we should go first. In this implementation, the API is simpler and we keep Tables somewhat private. The definition is still public though, since we have to expose the Stable trait. However, there's a cost of keeping another thread-local and using `Rc`, but I'm hoping it will be a small cost. r? ``@oli-obk`` r? ``@spastorino``

Remove `#[allow(incomplete_features)]` from RPITIT/AFIT tests They've been unnecessary for a while.

matthiaskrgr · 2023-10-24T17:30:22Z

@bors r+ rollup=never p=8

bors · 2023-10-24T17:30:24Z

📌 Commit 060bdfd has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-24T19:32:23Z

⌛ Testing commit 060bdfd with merge 151256b...

bors · 2023-10-24T21:28:01Z

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

rust-timer · 2023-10-24T21:30:17Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116094	Introduce `-C instrument-coverage=branch` to gate branch co…	`d89a50802f03741526c88f58a83425388667719d` (link)
#116396	Migrate diagnostics in `rustc_hir_analysis/src/coherence/or…	`d4b11f37ad499bff3b34101229c4276bae291fe3` (link)
#116714	Derive `Ord`, `PartialOrd` and `Hash` for `SocketAddr*`	`fdcf0fa6163c05b1e8535a2ea8986da257b8a458` (link)
#116792	Avoid unnecessary renumbering during borrowck	`7ef298a10f39e381ed41c0a340164f6acd73a931` (link)
#116841	Suggest unwrap/expect for let binding type mismatch	`4719ae2e38d08cadf9857fca341d7e79593c94d3` (link)
#116943	Add target features for LoongArch	`3d1554719a95105c5178f62750a69644bd5a309c` (link)
#117010	Add method to convert internal to stable constructs	`2ca632c11047bfa023edb226244e1fe95fc6d796` (link)
#117127	Remove `#[allow(incomplete_features)]` from RPITIT/AFIT tes…	`4723ca3e76dd9eaf72e548015a2b6e03c64a651f` (link)

previous master: 98b4a64a16

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 · 2023-10-24T22:58:06Z

Finished benchmarking commit (151256b): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

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)	-	-	0
Regressions ❌ (secondary)	0.8%	[0.8%, 0.8%]	2
Improvements ✅ (primary)	-2.5%	[-3.7%, -1.3%]	2
Improvements ✅ (secondary)	-1.2%	[-1.5%, -1.0%]	3
All ❌✅ (primary)	-2.5%	[-3.7%, -1.3%]	2

Cycles

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

Binary size

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

Bootstrap: missing data
Artifact size: 304.34 MiB -> 304.37 MiB (0.01%)

WaffleLapkin and others added 22 commits October 14, 2023 00:48

Derive Ord, PartialOrd and Hash for SocketAddr*

963131e

...instead of hand rolling impls, since 1. It's nicer 2. It fixes a buggy `Ord` impl of `SocketAddrV6`, which ignored half of the fields

Add tests for SocketAddrV6 ordering with scope_id and flowinfo

5c13c69

Avoid unnecessary renumbering

2bba98b

Add method to convert internal to stable constructs

66a554b

Add internal() method counterpart to stable()

f613b26

Note: We do not expect to provide internalizing methods for all StableMIR constructs. They exist only to help migrating efforts to allow users to mix StableMIR and internal constructs.

Remove unsafe and Rc

421631a

compiler: Add target features for LoongArch

cb61816

tests: Add features-gate for LoongArch

6cf9423

tests/ui/abi/compatibility: Set min-llvm-version to 17 for LoongArch64

300d04d

Add test and remove double ref

ae86f59

Introduce -C instrument-coverage=branch to gate branch coverage

2b36547

This flag has to be used in combination with `-Zunstable-options`, and is added in advance of adding branch coverage instrumentation.

Migrate diagnostics in rustc_hir_analysis/src/coherence/orphan.rs

68f5536

Remove incomplete features from RPITIT/AFIT tests

90e3aae

suggest unwrap/expect for let binding type mismatch

f3d20be

Rollup merge of rust-lang#116396 - obeis:hir-analysis-migrate-diagnos…

f3e18e4

…tics-7, r=oli-obk Migrate diagnostics in `rustc_hir_analysis/src/coherence/orphan.rs` r? ``@compiler-errors``

Rollup merge of rust-lang#116943 - heiher:target-features, r=wesleywiser

84f0bef

Add target features for LoongArch

Rollup merge of rust-lang#117127 - compiler-errors:incomplete, r=lqd

060bdfd

Remove `#[allow(incomplete_features)]` from RPITIT/AFIT tests They've been unnecessary for a while.

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 24, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 24, 2023

bors merged commit 151256b into rust-lang:master Oct 24, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 24, 2023

This was referenced Oct 24, 2023

Remove support for alias -Z instrument-coverage #117111

Merged

Remove fold code and add Const::internal() to StableMIR #117113

Merged

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr deleted the rollup-zdh18i6 branch March 16, 2024 18:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests #117135

Rollup of 8 pull requests #117135

matthiaskrgr commented Oct 24, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

rust-timer commented Oct 24, 2023

rust-timer commented Oct 24, 2023

Rollup of 8 pull requests #117135

Rollup of 8 pull requests #117135

Conversation

matthiaskrgr commented Oct 24, 2023

matthiaskrgr commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

bors commented Oct 24, 2023

rust-timer commented Oct 24, 2023

rust-timer commented Oct 24, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size