Continue to get rid of `ty::Const::{try_}eval*` #130950

compiler-errors · 2024-09-27T20:22:24Z

This PR mostly does:

Removes all of the try_eval_* and eval_* helpers from ty::Const, and replace their usages with try_to_*.
Remove ty::Const::eval.
Rename ty::Const::normalize to ty::Const::normalize_internal. This function is still used in the normalization code itself.
Fix some weirdness around the TransmuteFrom goal.

I'm happy to split it out further; for example, I could probably land the first part which removes the helpers, or the changes to codegen which are more obvious than the changes to tools.

r? BoxyUwU

Part of #130704

rustbot · 2024-09-27T20:22:35Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

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

cc @lcnr, @compiler-errors

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in compiler/rustc_sanitizers

cc @rust-lang/project-exploit-mitigations, @rcvalle

The Miri subtree was changed

cc @rust-lang/miri

compiler-errors · 2024-09-27T21:03:26Z

ah debuginfo

compiler/rustc_const_eval/src/const_eval/mod.rs

compiler-errors · 2024-09-27T21:56:34Z

compiler/rustc_hir_analysis/src/check/intrinsicck.rs

-                        if let Some(len) =
-                            len.try_eval_target_usize(self.tcx, self.tcx.param_env(adt.did()))
-                        {
+                        if let Some(len) = len.try_to_target_usize(self.tcx) {


This possibly may need to be normalized w/ lazy norm?

compiler/rustc_middle/src/mir/consts.rs

compiler/rustc_middle/src/ty/consts.rs

compiler-errors · 2024-09-27T21:59:28Z

compiler/rustc_next_trait_solver/src/solve/mod.rs

@@ -290,6 +290,36 @@ where
            Ok(ty)
        }
    }
+
+    /// Normalize a type for when it is structurally matched on.


We need this so we can structurally normalize a const in consider_builtin_transmute_candidate. That structurally matches on an Assume struct which contains a bunch of bools for configuration.

compiler-errors · 2024-09-27T22:00:28Z

compiler/rustc_trait_selection/src/error_reporting/traits/fulfillment_errors.rs

@@ -2220,117 +2220,136 @@ impl<'a, 'tcx> TypeErrCtxt<'a, 'tcx> {
        span: Span,
    ) -> GetSafeTransmuteErrorAndReason {
        use rustc_transmute::Answer;
+        self.probe(|_| {


Best reviewed without whitespace. We added a probe so we can normalize below without side-effects.

compiler-errors · 2024-09-27T22:00:58Z

compiler/rustc_transmute/src/lib.rs

@@ -134,13 +133,8 @@ mod rustc {
            use rustc_middle::ty::ScalarInt;
            use rustc_span::symbol::sym;

-            let Ok((ty, cv)) = c.eval(tcx, param_env, DUMMY_SP) else {
-                return Some(Self {


This was sketchy. If a const was failing to eval, we just returned "whatever". 🤔

src/librustdoc/clean/mod.rs

src/tools/clippy/clippy_lints/src/indexing_slicing.rs

tests/ui/transmutability/dont-assume-err-is-yes-issue-126377.rs

compiler-errors · 2024-09-28T04:03:50Z

@rustbot author

some doctest is failing fml

compiler/rustc_middle/src/ty/consts.rs

compiler/rustc_middle/src/mir/consts.rs

compiler/rustc_middle/src/ty/consts.rs

bors · 2024-09-30T06:33:58Z

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

compiler-errors · 2024-10-16T00:56:14Z

@rustbot ready

bors · 2024-10-18T23:28:17Z

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

BoxyUwU · 2024-10-19T11:19:47Z

I resolved the large threads since they were making it hard to review the actual code changes themselves and it also seemed like @RalfJung had a better understanding of what's going on now? Apologies if this was over-eager ^^

BoxyUwU

Thank you :3 Looks good to me, sorry for taking so long to review. Once you resolve the nit, rebase, and maybe squash some of these commits? r=me

compiler/rustc_next_trait_solver/src/solve/mod.rs

BoxyUwU · 2024-10-20T13:24:31Z

@bors r+ rollup=never

bors · 2024-10-20T13:24:34Z

📌 Commit 5cf8107 has been approved by BoxyUwU

It is now in the queue for this repository.

bors · 2024-10-21T03:46:32Z

⌛ Testing commit 5cf8107 with merge f2ba411...

bors · 2024-10-21T06:12:27Z

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing f2ba411 to master...

rust-timer · 2024-10-21T07:40:06Z

Finished benchmarking commit (f2ba411): 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 (secondary -1.2%)

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)	4.2%	[4.2%, 4.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.9%	[-4.5%, -3.2%]	2
All ❌✅ (primary)	-	-	0

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: 781.459s -> 781.789s (0.04%)
Artifact size: 333.77 MiB -> 333.65 MiB (-0.03%)

rustbot assigned BoxyUwU Sep 27, 2024

compiler-errors changed the title ~~Yeet eval~~ Continue to get rid of try::Const::{try_}eval* Sep 27, 2024

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the yeet-eval branch from 627a151 to 98b5f4f Compare September 27, 2024 21:20

This comment has been minimized.

Sign in to view

compiler-errors commented Sep 27, 2024

View reviewed changes

oli-obk changed the title ~~Continue to get rid of try::Const::{try_}eval*~~ Continue to get rid of ty::Const::{try_}eval* Sep 27, 2024

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 28, 2024

RalfJung reviewed Sep 28, 2024

View reviewed changes

compiler/rustc_middle/src/ty/consts.rs Show resolved Hide resolved

compiler/rustc_middle/src/mir/consts.rs Show resolved Hide resolved

RalfJung reviewed Sep 28, 2024

View reviewed changes

compiler/rustc_middle/src/ty/consts.rs Show resolved Hide resolved

compiler-errors mentioned this pull request Oct 3, 2024

TransmuteFrom: Gracefully handle unnormalized types and normalization errors #131112

Merged

compiler-errors force-pushed the yeet-eval branch from 98b5f4f to 66760f4 Compare October 5, 2024 16:05

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 16, 2024

BoxyUwU reviewed Oct 19, 2024

View reviewed changes

compiler/rustc_next_trait_solver/src/solve/mod.rs Outdated Show resolved Hide resolved

compiler-errors added 2 commits October 19, 2024 18:07

Get rid of const eval_* and try_eval_* helpers

e83e4e8

Rename normalize to normalize_internal, remove unnecessary usages

38bbcc0

compiler-errors added 2 commits October 19, 2024 18:07

Fix transmute goal

9453d2c

Fix tests

5cf8107

compiler-errors force-pushed the yeet-eval branch from 66760f4 to 5cf8107 Compare October 19, 2024 18:07

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

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 21, 2024

bors merged commit f2ba411 into rust-lang:master Oct 21, 2024
7 checks passed

rustbot added this to the 1.84.0 milestone Oct 21, 2024

bors mentioned this pull request Oct 21, 2024

Use ConstArgKind::Path for all single-segment paths, not just params under min_generic_const_args #131081

Merged

compiler-errors deleted the yeet-eval branch October 21, 2024 15:52

Continue to get rid of ty::Const::{try_}eval* #130950

Continue to get rid of ty::Const::{try_}eval* #130950

Uh oh!

Conversation

compiler-errors commented Sep 27, 2024 • edited by RalfJung Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 27, 2024

Uh oh!

This comment has been minimized.

compiler-errors commented Sep 27, 2024

Uh oh!

This comment has been minimized.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

compiler-errors commented Sep 28, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Sep 30, 2024

Uh oh!

compiler-errors commented Oct 16, 2024

Uh oh!

bors commented Oct 18, 2024

Uh oh!

BoxyUwU commented Oct 19, 2024

Uh oh!

BoxyUwU left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

BoxyUwU commented Oct 20, 2024

Uh oh!

bors commented Oct 20, 2024

Uh oh!

bors commented Oct 21, 2024

Uh oh!

bors commented Oct 21, 2024

Uh oh!

Uh oh!

rust-timer commented Oct 21, 2024

Overall result: no relevant changes - no action needed

Uh oh!

Uh oh!

Continue to get rid of `ty::Const::{try_}eval*` #130950

Continue to get rid of `ty::Const::{try_}eval*` #130950

compiler-errors commented Sep 27, 2024 •

edited by RalfJung

Loading