diff options
| author | bors <bors@rust-lang.org> | 2022-04-13 07:50:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-13 07:50:56 +0000 |
| commit | e3c43e64eceb00e13b1932229aa9b2d774e6af96 (patch) | |
| tree | 201b9089a76e563c8cebee025338892fdcf6c82d /compiler/rustc_trait_selection | |
| parent | b768f248e99688a2d7649731a99b2f2ad962abf5 (diff) | |
| parent | 3be987e076ad6b90a3679036ff71f639e9553ffa (diff) | |
| download | rust-e3c43e64eceb00e13b1932229aa9b2d774e6af96.tar.gz rust-e3c43e64eceb00e13b1932229aa9b2d774e6af96.zip | |
Auto merge of #94255 - b-naber:use-mir-constant-in-thir, r=oli-obk
Use mir constant in thir instead of ty::Const This is blocked on https://github.com/rust-lang/rust/pull/94059 (does include its changes, the first two commits in this PR correspond to those changes) and https://github.com/rust-lang/rust/pull/93800 being reinstated (which had to be reverted). Mainly opening since `@lcnr` offered to give some feedback and maybe also for a perf-run (if necessary). This currently contains a lot of duplication since some of the logic of `ty::Const` had to be copied to `mir::ConstantKind`, but with the introduction of valtrees a lot of that functionality will disappear from `ty::Const`. Only the last commit contains changes that need to be reviewed here. Did leave some `FIXME` comments regarding future implementation decisions and some things that might be incorrectly implemented. r? `@oli-obk`
Diffstat (limited to 'compiler/rustc_trait_selection')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/const_evaluatable.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs b/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs index 302b8b79156..5daa9796d12 100644 --- a/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs +++ b/compiler/rustc_trait_selection/src/traits/const_evaluatable.rs @@ -634,6 +634,7 @@ pub(super) fn thir_abstract_const<'tcx>( } } +#[instrument(skip(tcx), level = "debug")] pub(super) fn try_unify_abstract_consts<'tcx>( tcx: TyCtxt<'tcx>, (a, b): (ty::Unevaluated<'tcx, ()>, ty::Unevaluated<'tcx, ()>), |