TypingMode: merge intercrate, reveal, and defining_opaque_types #131856

lcnr · 2024-10-17T22:29:32Z

This adds TypingMode and uses it in most places. We do not yet remove Reveal from param_envs. This and other future work as tracked in #132279 and via FIXMEs.

Fetching the TypingMode of the InferCtxt asserts that the TypingMode agrees with ParamEnv::reveal to make sure we don't introduce any subtle bugs here. This will be unnecessary once ParamEnv::reveal no longer exists.

As the TypingMode is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local infcx cache during coherence by clearing the cache when forking it with a different TypingMode.

`TypingMode::from_param_env`

I am using this even in cases where I know that the param_env will always be Reveal::UserFacing. This is to make it easier to correctly refactor this code in the future, any time we use Reveal::UserFacing in a body while not defining its opaque types is incorrect and should use a TypingMode which only reveals opaques defined by that body instead, cc #124598

r? @compiler-errors

bors · 2024-10-21T09:32:56Z

☔ The latest upstream changes (presumably #131988) made this pull request unmergeable. Please resolve the merge conflicts.

lcnr · 2024-10-23T15:26:52Z

@bors try @rust-timer queue

bors · 2024-10-23T15:28:04Z

⌛ Trying commit 02dce21 with merge 42e1bc8...

TypingMode 🤔 unsure how and whether to actually get this ready for merge, opening for input + perf for now r? `@compiler-errors`

bors · 2024-10-23T17:13:47Z

💔 Test failed - checks-actions

bors · 2024-10-24T02:11:59Z

☔ The latest upstream changes (presumably #132079) made this pull request unmergeable. Please resolve the merge conflicts.

lcnr · 2024-10-24T08:47:57Z

@bors try @rust-timer queue

bors · 2024-10-24T08:49:09Z

⌛ Trying commit 450b9f4 with merge e3a4375...

TypingMode 🤔 unsure how and whether to actually get this ready for merge, opening for input + perf for now r? `@compiler-errors`

lcnr · 2024-10-24T10:51:14Z

@bors try @rust-timer queue

bors · 2024-10-24T10:52:26Z

⌛ Trying commit e393d40 with merge 74936bd...

TypingMode 🤔 unsure how and whether to actually get this ready for merge, opening for input + perf for now #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? `@compiler-errors`

bors · 2024-10-24T12:48:48Z

☀️ Try build successful - checks-actions
Build commit: 74936bd (74936bd5868dbcd2d3ef00ceb7b83001a9c0751e)

TypingMode: merge intercrate, reveal, and defining_opaque_types This adds `TypingMode` and uses it in most places. We do not yet remove `Reveal` from `param_env`s. This and other future work as tracked in rust-lang#132279 and via `FIXME`s. Fetching the `TypingMode` of the `InferCtxt` asserts that the `TypingMode` agrees with `ParamEnv::reveal` to make sure we don't introduce any subtle bugs here. This will be unnecessary once `ParamEnv::reveal` no longer exists. As the `TypingMode` is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local `infcx` cache during coherence by clearing the cache when forking it with a different `TypingMode`. #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? `@compiler-errors`

bors · 2024-10-29T09:17:15Z

⌛ Trying commit 0ad76be with merge 5c3ff89...

bors · 2024-10-29T11:11:09Z

☀️ Try build successful - checks-actions
Build commit: 5c3ff89 (5c3ff89c8bbe9f88b0fe9d123104994fb48fcfec)

rust-timer · 2024-10-29T12:37:18Z

Finished benchmarking commit (5c3ff89): comparison URL.

Overall result: ❌ regressions - no 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.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	0.1%	[0.1%, 0.1%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[0.1%, 0.1%]	1

Max RSS (memory usage)

Results (primary -1.2%, secondary 0.1%)

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.9%	[0.9%, 0.9%]	1
Regressions ❌ (secondary)	4.0%	[4.0%, 4.0%]	1
Improvements ✅ (primary)	-3.3%	[-3.3%, -3.3%]	1
Improvements ✅ (secondary)	-1.8%	[-1.8%, -1.8%]	2
All ❌✅ (primary)	-1.2%	[-3.3%, 0.9%]	2

Cycles

Results (secondary 2.6%)

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.6%	[2.2%, 3.4%]	5
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 783.339s -> 782.831s (-0.06%)
Artifact size: 333.70 MiB -> 333.73 MiB (0.01%)

compiler-errors · 2024-10-30T01:18:33Z

src/tools/clippy/clippy_utils/src/ty.rs

@@ -362,7 +362,7 @@ fn is_normalizable_helper<'tcx>(
    }
    // prevent recursive loops, false-negative is better than endless loop leading to stack overflow
    cache.insert(ty, false);
-    let infcx = cx.tcx.infer_ctxt().build();
+    let infcx = cx.tcx.infer_ctxt().build(TypingMode::from_param_env(param_env));


this has a late context :<

compiler-errors · 2024-10-30T01:24:27Z

@bors r+ rollup

bors · 2024-10-30T01:24:29Z

📌 Commit 524a22e has been approved by compiler-errors

It is now in the queue for this repository.

TypingMode: merge intercrate, reveal, and defining_opaque_types This adds `TypingMode` and uses it in most places. We do not yet remove `Reveal` from `param_env`s. This and other future work as tracked in rust-lang#132279 and via `FIXME`s. Fetching the `TypingMode` of the `InferCtxt` asserts that the `TypingMode` agrees with `ParamEnv::reveal` to make sure we don't introduce any subtle bugs here. This will be unnecessary once `ParamEnv::reveal` no longer exists. As the `TypingMode` is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local `infcx` cache during coherence by clearing the cache when forking it with a different `TypingMode`. #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? `@compiler-errors`

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#129394 (Don't lint `irrefutable_let_patterns` on leading patterns if `else if` let-chains) - rust-lang#131856 (TypingMode: merge intercrate, reveal, and defining_opaque_types) - rust-lang#132246 (Rename `rustc_abi::Abi` to `BackendRepr`) - rust-lang#132322 (powerpc64-ibm-aix: update maintainters) - rust-lang#132327 (Point to Fuchsia team in platform support docs) - rust-lang#132332 (Use `token_descr` more in error messages) - rust-lang#132338 (Remove `Engine`) - rust-lang#132340 (cg_llvm: Consistently use safe wrapper function `set_section`) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#129394 (Don't lint `irrefutable_let_patterns` on leading patterns if `else if` let-chains) - rust-lang#131856 (TypingMode: merge intercrate, reveal, and defining_opaque_types) - rust-lang#132322 (powerpc64-ibm-aix: update maintainters) - rust-lang#132327 (Point to Fuchsia team in platform support docs) - rust-lang#132332 (Use `token_descr` more in error messages) - rust-lang#132338 (Remove `Engine`) - rust-lang#132340 (cg_llvm: Consistently use safe wrapper function `set_section`) - rust-lang#132342 (cg_llvm: Clean up FFI calls for operand bundles) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#131856 - lcnr:typing-mode, r=compiler-errors TypingMode: merge intercrate, reveal, and defining_opaque_types This adds `TypingMode` and uses it in most places. We do not yet remove `Reveal` from `param_env`s. This and other future work as tracked in rust-lang#132279 and via `FIXME`s. Fetching the `TypingMode` of the `InferCtxt` asserts that the `TypingMode` agrees with `ParamEnv::reveal` to make sure we don't introduce any subtle bugs here. This will be unnecessary once `ParamEnv::reveal` no longer exists. As the `TypingMode` is now a part of the query input, I've merged the coherence and non-coherence caches for the new solver. I've also enabled the local `infcx` cache during coherence by clearing the cache when forking it with a different `TypingMode`. #### `TypingMode::from_param_env` I am using this even in cases where I know that the `param_env` will always be `Reveal::UserFacing`. This is to make it easier to correctly refactor this code in the future, any time we use `Reveal::UserFacing` in a body while not defining its opaque types is incorrect and should use a `TypingMode` which only reveals opaques defined by that body instead, cc rust-lang#124598 r? ``@compiler-errors``

rustbot assigned compiler-errors Oct 17, 2024

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 Oct 17, 2024