Rollup of 6 pull requests by Dylan-DPC · Pull Request #110978 · rust-lang/rust

Dylan-DPC · 2023-04-29T05:57:57Z

Successful merges:

Clear response values for overflow in new solver #110614 (Clear response values for overflow in new solver)
Bump libffi-sys to 2.3.0 #110894 (Bump libffi-sys to 2.3.0)
include source error for LoadLibraryExW #110932 (include source error for LoadLibraryExW)
Make sure that some stdlib method signatures aren't accidental refinements #110958 (Make sure that some stdlib method signatures aren't accidental refinements)
Make drop_flags an IndexVec. #110962 (Make drop_flags an IndexVec.)
Don't duplicate anonymous lifetimes for async fn in traits #110965 (Don't duplicate anonymous lifetimes for async fn in traits)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…w-response, r=lcnr Clear response values for overflow in new solver When we have an overflow, return a trivial query response. This fixes an ICE with the code described in rust-lang#110544: ```rust trait Trait {} struct W<T>(T); impl<T, U> Trait for W<(W<T>, W<U>)> where W<T>: Trait, W<U>: Trait, {} fn impls<T: Trait>() {} fn main() { impls::<W<_>>() } ``` Where, while proving `W<?0>: Trait`, we overflow but still apply the query response of `?0 = (W<?1>, W<?2>)`. Then while re-processing the query to validate that our evaluation result was stable, we get a different query response that looks like `?1 = (W<?3>, W<?4>), ?2 = (W<?5>, W<?6>)`, and so we trigger the ICE. Also, by returning a trivial query response we also avoid the infinite-loop/OOM behavior of the old solver. r? ``@lcnr``

…rk-Simulacrum Bump libffi-sys to 2.3.0 Bump libffi-sys to 2.3.0 that includes LoongArch support. Thanks Related: rust-lang/miri#2858

include source error for LoadLibraryExW In rust-lang#107595, we added retry behavior for LoadLibraryExW on Windows. If it fails we do not print the underlying error that Windows returned. This made rust-lang#110889 a little harder to debug. In this PR I am adding the source error in the message if it is available.

… r=cuviper Make sure that some stdlib method signatures aren't accidental refinements In the process of implementing https://rust-lang.github.io/rfcs/3245-refined-impls.html, I found a bunch of stdlib implementations that accidentally "refined" their method signatures by dropping (unnecessary) bounds. This isn't currently a problem, but may become one if/when method signature refining is stabilized in the future. Shouldn't hurt to make these signatures a bit more accurate anyways. NOTE (just to be clear lol): This does not affect behavior at all, since we don't actually take advantage of refined implementations yet!

…-errors Make drop_flags an IndexVec. Fixesrust-lang#91943

… r=cjgillot Don't duplicate anonymous lifetimes for async fn in traits `record_lifetime_params_for_async` needs to be called outside of the scope of the function, or else it'll end up collecting anonymous lifetimes twice (those on the function and those within the `AnonymousCreateParameter` rib). This matches how `record_lifetime_params_for_async` is being used for functions with bodies below. This fixes (partially) rust-lang#110963 when the lifetimes are late-bound, but does not do so when the lifetimes are early-bound (as seen from the known-bug that I added).

Dylan-DPC · 2023-04-29T05:58:31Z

@bors r+ rollup=never p=5

bors · 2023-04-29T05:58:33Z

📌 Commit 81910a1 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2023-04-29T06:17:40Z

⌛ Testing commit 81910a1 with merge af2c7e0...

bors · 2023-04-29T08:54:57Z

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

rust-timer · 2023-04-29T08:56:41Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#110965	6b89a7fea2bc1f52a85662752ec0252e09bbd93a
#110962	aa51bcb344cab8d55822fca30c259dd4a12eae3e
#110958	1daec5b35df1234d58660a402c3c6dc6aefb7c8c
#110932	cea335db121a63999f4ae0daf303a64e63ece963
#110894	0ea810d70c56e51eb6ca394fc6778c5c36dcfe76
#110614	edfe440d205b68769b066c44a7af7d94b1b47997

previous master: 572c0d553f

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-04-29T10:12:48Z

Finished benchmarking commit (af2c7e0): 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)	-	-	0
Regressions ❌ (secondary)	0.3%	[0.3%, 0.3%]	2
Improvements ✅ (primary)	-0.3%	[-0.3%, -0.3%]	2
Improvements ✅ (secondary)	-0.4%	[-0.4%, -0.4%]	1
All ❌✅ (primary)	-0.3%	[-0.3%, -0.3%]	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)	3.2%	[3.2%, 3.2%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.7%, -0.7%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[-0.7%, 3.2%]	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)	-	-	0
Improvements ✅ (primary)	-3.9%	[-3.9%, -3.9%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.9%	[-3.9%, -3.9%]	1

pnkfelix · 2023-05-03T04:30:51Z

regressions are solely to secondary externs benchmark.
its so minor. marking as triaged.

@rustbot label: perf-regression-triaged

compiler-errorsand others added 13 commits April 26, 2023 21:54

Clear response values for overflow in new solver
5fa8209

Split out make_ambiguous_response_no_constraints
ee89421

Bump libffi-sys to 2.3.0
c7b7248

include source error for LoadLibraryExW
24adb1f

Make sure that signatures aren't accidental refinements
33871c9

Make drop_flags an IndexVec.
7f26191

Don't duplicate anonymous lifetimes for async fn in traits
4e05cfb

Rollup merge ofrust-lang#110894- loongarch-rs:bump-libffi-sys, r=Ma…
55df5c8
…rk-Simulacrum Bump libffi-sys to 2.3.0 Bump libffi-sys to 2.3.0 that includes LoongArch support. Thanks Related: rust-lang/miri#2858

Rollup merge ofrust-lang#110962- cjgillot:no-hash-drops, r=compiler…
7721c73
…-errors Make drop_flags an IndexVec. Fixesrust-lang#91943

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 Apr 29, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 29, 2023

bors merged commit af2c7e0 into rust-lang:masterApr 29, 2023

rustbot added this to the 1.71.0 milestone Apr 29, 2023

rustbot added the perf-regression Performance regression. label Apr 29, 2023

rustbot added the perf-regression-triaged The performance regression has been triaged. label May 3, 2023

Navigation Menu

Uh oh!

Uh oh!

Rollup of 6 pull requests - #110978

Rollup of 6 pull requests#110978
bors merged 13 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-xclzwax

Dylan-DPC commented Apr 29, 2023

Uh oh!

Dylan-DPC commented Apr 29, 2023

Uh oh!

bors commented Apr 29, 2023

Uh oh!

bors commented Apr 29, 2023

Uh oh!

bors commented Apr 29, 2023

Uh oh!

rust-timer commented Apr 29, 2023

Uh oh!

rust-timer commented Apr 29, 2023

Uh oh!

pnkfelix commented May 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Uh oh!

Conversation

Dylan-DPC commented Apr 29, 2023

Uh oh!

Dylan-DPC commented Apr 29, 2023

Uh oh!

bors commented Apr 29, 2023

Uh oh!

bors commented Apr 29, 2023

Uh oh!

bors commented Apr 29, 2023

Uh oh!

rust-timer commented Apr 29, 2023

Uh oh!

rust-timer commented Apr 29, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

pnkfelix commented May 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants