Rollup of 7 pull requests by Dylan-DPC · Pull Request #112702 · rust-lang/rust

Dylan-DPC · 2023-06-16T09:16:18Z

Successful merges:

fix: inline predicate_may_hold_fatal and remove expect call in it #112163 (fix: inline predicate_may_hold_fatal and remove expect call in it)
Instantiate closure synthetic substs in root universe #112399 (Instantiate closure synthetic substs in root universe)
Opportunistically resolve regions in new solver #112443 (Opportunistically resolve regions in new solver)
reorder attributes to make miri-test-libstd work again #112535 (reorder attributes to make miri-test-libstd work again)
Fix building libstd documentation on FreeBSD. #112579 (Fix building libstd documentation on FreeBSD.)
Fix dead_code_cgu computation #112639 (Fix dead_code_cgu computation)
Handle interpolated literal errors #112642 (Handle interpolated literal errors)

r? @ghost
@rustbot modify labels: rollup

It fixes the following error: error[E0412]: cannot find type `sockcred2` in module `libc` --> library/std/src/os/unix/net/ancillary.rs:211:29 | 211 | pub struct SocketCred(libc::sockcred2); | ^^^^^^^^^ not found in `libc`

The other major steps in `partition` have their own function, so it's nice for this one to be likewise.

The comment says "Find the smallest CGU that has exported symbols and put the dead function stubs in that CGU". But the code sorts the CGUs by size (smallest first) and then searches them in reverse order, which means it will find the *largest* CGU that has exported symbols. The erroneous code was introduced in rust-lang#92142. This commit changes it to use a simpler search, avoiding the sort, and fixes the bug in the process.

Always put the `create_size_estimate` calls and `debug_dump` calls within a timed scopes. This makes the four main steps look more similar to each other.

…rrors fix: inline `predicate_may_hold_fatal` and remove expect call in it - Fixesrust-lang#105231 - Discussion: rust-lang#111985 (comment) r? ``@compiler-errors``

…t-universe, r=lcnr Instantiate closure synthetic substs in root universe In the UI test example, we end up generalizing an associated type (something like `<Map<Option<i32>, [closure upvars=?0]> as IntoIterator>::Item` generalizes into `<Map<Option<i32>, [closure upvars=?1]> as IntoIterator>::Item`) then assigning it to itself, emitting an alias-relate goal. This trivially holds via one of the normalizes-to candidates, instead of relating substs, so when closure analysis eventually sets `?0` to the actual upvars, `?1` never gets constrained. This ends up being reported as an ambiguity error during writeback. Instead, we can take advantage of the fact that we *know* the closure substs live in the root universe. This will prevent them being generalized, since they always can be named, and the alias-relate above never gets emitted at all. We can probably do this to a handful of other `next_ty_var` calls in typeck for variables that are clearly associated with the body of the program, but I wanted to limit this for now. Eventually, if we end up representing universes more faithfully like a tree or whatever, we can remove this and turn it back to just a call to `next_ty_var`. Note: This is incredibly order-dependent -- we need to be assigning a type variable that was created *before* the closure substs, and we also need to actually have an unnormalized type at the time of the assignment. This currently seems easiest to trigger during call argument analysis just due to the fact that we instantiate the call's substs, normalize, THEN check args. r? ```@lcnr```

…unistically-resolve-regions, r=lcnr Opportunistically resolve regions in new solver Use `opportunistic_resolve_var` during canonicalization to collapse some regions. We have to start using `CanonicalVarValues::is_identity_modulo_regions`. We also have to modify that function to consider responses like `['static, ^0, '^1, ^2]` to be an "identity" response, since because we opportunistically resolve regions, there's no longer a 1:1 mapping between canonical var values and bound var indices in the response... There's one nasty side-effect -- one test (`tests/ui/dyn-star/param-env-infer.rs`) starts to ICE because the certainty goes from `Yes` to `Maybe(Overflow)`... Not exactly sure why, though? Putting this up for discussion/investigation. r? ```@lcnr```

reorder attributes to make miri-test-libstd work again Fixes fallout from rust-lang#110141

Fix building libstd documentation on FreeBSD. It fixes the following error: ``` error[E0412]: cannot find type `sockcred2` in module `libc` --> library/std/src/os/unix/net/ancillary.rs:211:29 | 211 | pub struct SocketCred(libc::sockcred2); | ^^^^^^^^^ not found in `libc` ```

…esleywiser Fix `dead_code_cgu` computation This PR fixes a bug in `dead_code_cgu` computation, and also does some refactoring. r? ```@wesleywiser```

…nnethercote Handle interpolated literal errors Not sure why it was doing a whole dance to re-match on the token kind when it seems like `Lit::from_token` does the right thing for both macro-arg and regular literals. Nothing seems to have regressed diagnostics-wise from the change, though. Fixesrust-lang#112622 r? ``@nnethercote``

Dylan-DPC · 2023-06-16T09:16:54Z

@bors r+ rollup=never p=5

bors · 2023-06-16T09:16:57Z

📌 Commit c2e1097 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2023-06-16T11:51:46Z

⌛ Testing commit c2e1097 with merge 2304917...

bors · 2023-06-16T15:02:14Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 2304917 to master...

bors · 2023-06-16T15:02:14Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 2304917 to master...

rust-timer · 2023-06-16T15:04:13Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#112642	90532b47570048ed8d89c7c4a450322b1af5223b
#112639	a56d869f0696807b5a896ab98467dda920d5c672
#112579	d16b206543ccc0aad0f8f8d4682292f8ec2f3484
#112535	b8b7f229258dce8c486e47e2518bcaec8c6be5f3
#112443	e05c11b3bf03fb761299839dc8163997531cc65a
#112399	7a265019a7f9058d8dd5ab2a596703857f1e24e3
#112163	cb7fa3d6f742d3337e82bd16dfb262ff9d4b5f4e

previous master: 99b334696f

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-06-16T16:42:31Z

Finished benchmarking commit (2304917): comparison URL.

Overall result: ✅ 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
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.2%	[-3.7%, -1.7%]	7
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

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

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)	2.3%	[2.3%, 2.3%]	1
Regressions ❌ (secondary)	2.1%	[2.1%, 2.1%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.3%	[-3.6%, -3.1%]	6
All ❌✅ (primary)	2.3%	[2.3%, 2.3%]	1

Binary size

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

Bootstrap: 646.331s -> 648.664s (0.36%)

lqd · 2023-06-21T07:40:44Z

Just checking if #112399 is the source of the secondary wins here.

@rust-timer build 7a265019a7f9058d8dd5ab2a596703857f1e24e3

rust-timer · 2023-06-21T08:54:54Z

Finished benchmarking commit (7a265019a7f9058d8dd5ab2a596703857f1e24e3): comparison URL.

Overall result: ✅ improvements - no 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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-3.8%, -3.2%]	6
All ❌✅ (primary)	-	-	0

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

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.5%	[2.3%, 2.7%]	3
Improvements ✅ (primary)	-3.3%	[-4.9%, -1.2%]	8
Improvements ✅ (secondary)	-3.2%	[-3.9%, -1.2%]	7
All ❌✅ (primary)	-3.3%	[-4.9%, -1.2%]	8

Binary size

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

Bootstrap: 646.331s -> 647.006s (0.10%)

Dylan-DPC · 2023-06-16T09:16:18Z

Successful merges:

fix: inline predicate_may_hold_fatal and remove expect call in it #112163 (fix: inline predicate_may_hold_fatal and remove expect call in it)
Instantiate closure synthetic substs in root universe #112399 (Instantiate closure synthetic substs in root universe)
Opportunistically resolve regions in new solver #112443 (Opportunistically resolve regions in new solver)
reorder attributes to make miri-test-libstd work again #112535 (reorder attributes to make miri-test-libstd work again)
Fix building libstd documentation on FreeBSD. #112579 (Fix building libstd documentation on FreeBSD.)
Fix dead_code_cgu computation #112639 (Fix dead_code_cgu computation)
Handle interpolated literal errors #112642 (Handle interpolated literal errors)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup