implement deep normalization via the new solver #113086

lcnr · 2023-06-27T08:33:07Z

together with #112869 this should remove all uses of the old solver with -Ztrait-solver=next.

see rust-lang/rustc-dev-guide#1731 for a description of this PR.

compiler/rustc_hir_analysis/src/check/check.rs

compiler/rustc_trait_selection/src/solve/normalize.rs

rustbot · 2023-06-27T14:53:57Z

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr, @compiler-errors

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

lcnr · 2023-06-27T15:05:29Z

@bors try @rust-timer queue

bors · 2023-06-27T15:05:40Z

⌛ Trying commit e45487d2496207e818a168c19c8dec3adb225d31 with merge 6af9e55186a60a213d3a1dbda6c55404e4ccc68d...

compiler/rustc_trait_selection/src/solve/normalize.rs

oli-obk · 2023-06-27T15:25:39Z

compiler/rustc_trait_selection/src/traits/coherence.rs

+    let Ok(wf_tys) = ocx.assumed_wf_types(param_env, body_def_id)
+    else {


oli-obk · 2023-06-27T15:28:14Z

compiler/rustc_ty_utils/src/implied_bounds.rs

@@ -72,3 +83,28 @@ fn assumed_wf_types(tcx: TyCtxt<'_>, def_id: DefId) -> &ty::List<Ty<'_>> {
        | DefKind::Generator => ty::List::empty(),
    }
 }
+
+fn fn_sig_spans(tcx: TyCtxt<'_>, def_id: LocalDefId) -> impl Iterator<Item = Span> + '_ {


This could be added as a method and then re-used in opaque_types_defined_by, which does the same thing.

Yeah, could be added as a method on hir::Map probably

bors · 2023-06-27T16:50:52Z

☀️ Try build successful - checks-actions
Build commit: 6af9e55186a60a213d3a1dbda6c55404e4ccc68d (6af9e55186a60a213d3a1dbda6c55404e4ccc68d)

rust-timer · 2023-06-27T18:06:18Z

Finished benchmarking commit (6af9e55186a60a213d3a1dbda6c55404e4ccc68d): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +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.8%	[0.3%, 2.1%]	8
Regressions ❌ (secondary)	0.6%	[0.5%, 1.1%]	9
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.6%	[-0.6%, -0.6%]	1
All ❌✅ (primary)	0.8%	[0.3%, 2.1%]	8

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)	2.1%	[2.0%, 2.2%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.1%	[2.0%, 2.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)	2.4%	[2.4%, 2.4%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.4%	[2.4%, 2.4%]	1

Binary size

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

Bootstrap: 661.852s -> 662.454s (0.09%)

rustbot · 2023-06-27T21:07:08Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors · 2023-06-29T01:18:51Z

tests/ui/traits/new-solver/equating-projection-cyclically.rs

 // compile-flags: -Ztrait-solver=next
-// known-bug: unknown
+
+// FIXME(-Ztrait-solver=next): what is this testing and why did we add this test.


This was supposed to be testing <?0 as Trait>::Assoc = ?0 hitting the occurs check.

yeah, broke because of variance for some reason 😅 change it to force the infer var to be invariant

compiler/rustc_trait_selection/src/solve/normalize.rs

compiler-errors · 2023-06-29T04:32:32Z

compiler/rustc_trait_selection/src/traits/project.rs

+        }
+    }
+
+    fn deeply_normalize<T: TypeFoldable<TyCtxt<'tcx>>>(


Naming thought: Should this perhaps just be called fully_normalize? since it basically does what that does.

And I think calls to fully_normalize should get migrated to this one, probably.

added comments for that. didn't rename this yet to not make the confusion worse

compiler/rustc_trait_selection/src/traits/project.rs

compiler/rustc_trait_selection/src/solve/normalize.rs

compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

lcnr · 2023-07-03T07:25:14Z

@bors r=compiler-errors

bors · 2023-07-03T07:25:15Z

📌 Commit be6a344 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-07-03T07:38:29Z

⌛ Testing commit be6a344 with merge 737b461...

bors · 2023-07-03T10:00:59Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 737b461 to master...

rust-timer · 2023-07-03T11:17:37Z

Finished benchmarking commit (737b461): comparison URL.

Overall result: ❌ regressions - 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.4%	[0.4%, 0.4%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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)	3.1%	[2.9%, 3.2%]	2
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.5%	[-1.5%, -1.5%]	1
All ❌✅ (primary)	-	-	0

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

Binary size

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

Bootstrap: 670.62s -> 670.769s (0.02%)

…at-again, r=oli-obk Structurally normalize again for byte string lit pat checking We need to structurally normalize the pointee of a match scrutinee when trying to match byte string patterns -- we used[^1] to call `structurally_resolve_type`, which errors for type vars[^2], but lcnr added `try_structurally_resolve_type`[^3] in the mean time, which is the right thing to use here since it's totally opportunistic. Fixes rust-lang/trait-system-refactor-initiative#38 [^1]: rust-lang#112428 [^2]: rust-lang#112993 [^3]: rust-lang#113086

rustbot assigned compiler-errors Jun 27, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jun 27, 2023

oli-obk reviewed Jun 27, 2023

View reviewed changes

compiler/rustc_hir_analysis/src/check/check.rs Outdated Show resolved Hide resolved

oli-obk reviewed Jun 27, 2023

View reviewed changes

compiler/rustc_trait_selection/src/solve/normalize.rs Show resolved Hide resolved

lcnr force-pushed the rust8 branch from 63f736d to d3a6c83 Compare June 27, 2023 14:53

lcnr marked this pull request as ready for review June 27, 2023 14:53

lcnr force-pushed the rust8 branch from d3a6c83 to e45487d Compare June 27, 2023 14:54

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 27, 2023

oli-obk reviewed Jun 27, 2023

View reviewed changes

compiler/rustc_trait_selection/src/solve/normalize.rs Show resolved Hide resolved

oli-obk reviewed Jun 27, 2023

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Jun 27, 2023

lcnr force-pushed the rust8 branch from e45487d to 28783c7 Compare June 27, 2023 21:07

lcnr force-pushed the rust8 branch 2 times, most recently from f30cb8f to 5d4229a Compare June 27, 2023 21:14

compiler-errors reviewed Jun 29, 2023

View reviewed changes

lcnr mentioned this pull request Jun 29, 2023

track spans for assumed_wf_types #113150

Closed

lcnr added 6 commits July 3, 2023 09:12

add a try_structurally_resolve_type in coerce

d2c7449

use deeply_normalize for assumed_wf_types

5378f07

deeply_normalize pass in fulfill cx for old solver

a2dfed6

review

412c6e0

update tests

30ed152

rebase

be6a344

lcnr force-pushed the rust8 branch from c6625d2 to be6a344 Compare July 3, 2023 07:24

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 Jul 3, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 3, 2023

bors merged commit 737b461 into rust-lang:master Jul 3, 2023

rustbot added this to the 1.72.0 milestone Jul 3, 2023

lcnr deleted the rust8 branch July 3, 2023 10:29

This was referenced Jul 3, 2023

return NoSolution for default assoc items #111994

Closed

Infer type in irrefutable slice patterns with fixed length as array #113199

Merged

rustbot removed the perf-regression Performance regression. label Jul 3, 2023

lcnr mentioned this pull request Jul 4, 2023

Tracking Issue for -Znext-solver #107374

Open

11 tasks

compiler-errors mentioned this pull request Jul 6, 2023

Structurally normalize again for byte string lit pat checking #113399

Merged

lcnr mentioned this pull request Jul 11, 2023

add section for normalization with the new solver rust-lang/rustc-dev-guide#1731

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

implement deep normalization via the new solver #113086

implement deep normalization via the new solver #113086

lcnr commented Jun 27, 2023 •

edited

Loading

rustbot commented Jun 27, 2023

lcnr commented Jun 27, 2023

This comment has been minimized.

bors commented Jun 27, 2023

oli-obk Jun 27, 2023

oli-obk Jun 27, 2023

compiler-errors Jun 29, 2023

bors commented Jun 27, 2023

This comment has been minimized.

rust-timer commented Jun 27, 2023

rustbot commented Jun 27, 2023

compiler-errors Jun 29, 2023

lcnr Jun 30, 2023

compiler-errors Jun 29, 2023

compiler-errors Jun 29, 2023

lcnr Jun 30, 2023

lcnr commented Jul 3, 2023

bors commented Jul 3, 2023

bors commented Jul 3, 2023

bors commented Jul 3, 2023

rust-timer commented Jul 3, 2023

		let Ok(wf_tys) = ocx.assumed_wf_types(param_env, body_def_id)
		else {

implement deep normalization via the new solver #113086

implement deep normalization via the new solver #113086

Conversation

lcnr commented Jun 27, 2023 • edited Loading

rustbot commented Jun 27, 2023

lcnr commented Jun 27, 2023

This comment has been minimized.

bors commented Jun 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jun 27, 2023

This comment has been minimized.

rust-timer commented Jun 27, 2023

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

rustbot commented Jun 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lcnr commented Jul 3, 2023

bors commented Jul 3, 2023

bors commented Jul 3, 2023

bors commented Jul 3, 2023

rust-timer commented Jul 3, 2023

Overall result: ❌ regressions - no action needed

lcnr commented Jun 27, 2023 •

edited

Loading