Rollup of 7 pull requests #111452

matthiaskrgr · 2023-05-11T05:05:30Z

Successful merges:

Prevent ICE with broken borrow in closure #108705 (Prevent ICE with broken borrow in closure)
Fix mishandled --check-cfg arguments order #111292 (Fix mishandled --check-cfg arguments order)
Isolate coverage FFI type layouts from their underlying LLVM C++ types #111382 (Isolate coverage FFI type layouts from their underlying LLVM C++ types)
vec-shrink-panik: update expectations to work on LLVM 17 #111385 (vec-shrink-panik: update expectations to work on LLVM 17)
Add esp-idf platform-support page #111389 (Add esp-idf platform-support page)
Use visit_assign to detect SSA locals. #111432 (Use visit_assign to detect SSA locals.)
Use proper impl self type for alias impl in rustdoc #111448 (Use proper impl self type for alias impl in rustdoc)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

The regions don't need to be mutable because we pass a copy of them to LLVM instead, and this matches the `*const` in the Rust-side signature.

@Amanieu

For some reason, the called function is `cleanup` on LLVM 17 instead of `filter`. r? @Amanieu

…rrow, r=cjgillot Prevent ICE with broken borrow in closure r? `@Nilstrieb` Fixes rust-lang#108683 This solution isn't ideal, I'm hoping to find a way to continue compilation without ICEing.

…trochenkov Fix mishandled `--check-cfg` arguments order This PR fixes a bug in `--check-cfg` where the order of `--check-cfg=names(a)` and `--check-cfg=values(a,…)` would trip the compiler. Fixes rust-lang#111291 cc `@taiki-e` `@petrochenkov`

Isolate coverage FFI type layouts from their underlying LLVM C++ types I noticed that several of the types used to send coverage information through FFI are not properly isolated from the layout of their corresponding C++ types in the LLVM API. This PR adds more explicitly-defined FFI struct/enum types in `CoverageMappingWrapper.cpp`, so that Rust source files in `rustc_codegen_ssa` and `rustc_codegen_llvm` aren't directly exposed to LLVM C++ types.

vec-shrink-panik: update expectations to work on LLVM 17 For some reason, the called function is `cleanup` on LLVM 17 instead of `filter`. r? `@Amanieu`

…=jyn514 Add esp-idf platform-support page As mentioned in rust-lang#111369 (comment), the initial PR for esp-idf didn't include a platform support document which is required for the merge of rust-lang#111369.

Use visit_assign to detect SSA locals. I screwed up the logic in 3c43b61. Fixes rust-lang#111426

…, r=notriddle Use proper impl self type for alias impl in rustdoc We don't want to use `type_of(type_alias)`, we want to use `type_of(impl)` -- this will give us the self type of the impl *properly substituted* in the case that it's an alias. Fixes rust-lang#111420

matthiaskrgr · 2023-05-11T05:05:59Z

@bors r+ rollup=never p=57

bors · 2023-05-11T05:06:01Z

📌 Commit 07af55e has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-05-11T05:06:02Z

🌲 The tree is currently closed for pull requests below priority 50. This pull request will be tested once the tree is reopened.

bors · 2023-05-11T05:06:11Z

⌛ Testing commit 07af55e with merge 4d941cd...

bors · 2023-05-11T07:57:06Z

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

rust-timer · 2023-05-11T07:59:16Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#111448	e869eea4cc2abb8d62892fe413f5bc170fa663d2
#111432	03c6614968f27e5c904fe6266431b182dd3359e4
#111389	a11be896adc66a53838ff763c37f3b5083857150
#111385	d497a0fcd5b5ad2caf5d243429f400e34504a2ba
#111382	129b364fb3a04ad769c7a0c9259e16d8ecb0303e
#111292	855fcce6fdc816278c4fb92c10b9fb1ff6c7d83d
#108705	9d047cb02331e941a225ca137ba80c680f0782b2

previous master: 9a767b6b9e

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-05-11T09:12:34Z

Finished benchmarking commit (4d941cd): 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)	4.5%	[4.5%, 4.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.3%	[-2.4%, -2.2%]	2
All ❌✅ (primary)	4.5%	[4.5%, 4.5%]	1

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: 659.961s -> 660.266s (0.05%)

clubby789 and others added 15 commits April 30, 2023 19:17

Bail out of MIR construction if check_match fails

2d5ca0e

Fix --check-cfg bug with args order when parsing

f4ca42f

Isolate coverage FFI type layouts from their underlying LLVM C++ types

7cab196

Correctly mark parameter RustMappingRegions as pointer-to-const

9addf06

The regions don't need to be mutable because we pass a copy of them to LLVM instead, and this matches the `*const` in the Rust-side signature.

Add esp-idf platform support page

53e49f4

vec-shrink-panik: update expectations to work on LLVM 17

fbe4795

For some reason, the called function is `cleanup` on LLVM 17 instead of `filter`. r? @Amanieu

Use visit_assign to detect SSA locals.

6ad0497

Use proper impl self type for alias impl in rustdoc

6509c42

Rollup merge of rust-lang#108705 - clubby789:refutable-let-closure-bo…

40d933a

…rrow, r=cjgillot Prevent ICE with broken borrow in closure r? `@Nilstrieb` Fixes rust-lang#108683 This solution isn't ideal, I'm hoping to find a way to continue compilation without ICEing.

Rollup merge of rust-lang#111385 - durin42:vec-panik-17, r=Amanieu

acae72e

vec-shrink-panik: update expectations to work on LLVM 17 For some reason, the called function is `cleanup` on LLVM 17 instead of `filter`. r? `@Amanieu`

Rollup merge of rust-lang#111389 - esp-rs:esp-idf-platform-support, r…

3b7c02b

…=jyn514 Add esp-idf platform-support page As mentioned in rust-lang#111369 (comment), the initial PR for esp-idf didn't include a platform support document which is required for the merge of rust-lang#111369.

Rollup merge of rust-lang#111432 - cjgillot:issue-111426, r=oli-obk

968911d

Use visit_assign to detect SSA locals. I screwed up the logic in 3c43b61. Fixes rust-lang#111426

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 May 11, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label May 11, 2023

bors merged commit 4d941cd into rust-lang:master May 11, 2023

rustbot added this to the 1.71.0 milestone May 11, 2023

This was referenced May 11, 2023

Stabilise exhaustive patterns feature #110105

Closed

Added custom risc32-imac for esp-espidf target #111369

Merged

matthiaskrgr deleted the rollup-uic8dgy branch March 16, 2024 18:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #111452

Rollup of 7 pull requests #111452

matthiaskrgr commented May 11, 2023

matthiaskrgr commented May 11, 2023

bors commented May 11, 2023

bors commented May 11, 2023

bors commented May 11, 2023

bors commented May 11, 2023

rust-timer commented May 11, 2023

rust-timer commented May 11, 2023

Rollup of 7 pull requests #111452

Rollup of 7 pull requests #111452

Conversation

matthiaskrgr commented May 11, 2023

matthiaskrgr commented May 11, 2023

bors commented May 11, 2023

bors commented May 11, 2023

bors commented May 11, 2023

bors commented May 11, 2023

rust-timer commented May 11, 2023

rust-timer commented May 11, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size