diff options
author | bors <bors@rust-lang.org> | 2023-04-16 21:37:51 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2023-04-16 21:37:51 +0000 |
commit | 84c898d65adf2f39a5a98507f1fe0ce10a2b8dbc (patch) | |
tree | 45864520870b60ee1bb662685becc5f0b4804744 /compiler/rustc_const_eval/src/interpret/operand.rs | |
parent | f18236dcd3d8191c91aca0c4ef43e1e27b6bc0dc (diff) | |
parent | c2c413f56eca868a5b5335ba21efa08368735d01 (diff) | |
download | rust-stable.tar.gz |
[stable] Prepare Rust 1.69.0
Last minute backports:
* #109643
* #110135
* #109938
* #109937
* #109266
This PR also bumps the channel to stable, and backports the release notes from master.
r? `@ghost`
cc `@rust-lang/release`
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret/operand.rs')
-rw-r--r-- | compiler/rustc_const_eval/src/interpret/operand.rs | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/operand.rs b/compiler/rustc_const_eval/src/interpret/operand.rs index 8d5192bca67..5310ef0bb3e 100644 --- a/compiler/rustc_const_eval/src/interpret/operand.rs +++ b/compiler/rustc_const_eval/src/interpret/operand.rs @@ -612,14 +612,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { span: Option<Span>, layout: Option<TyAndLayout<'tcx>>, ) -> InterpResult<'tcx, OpTy<'tcx, M::Provenance>> { - // FIXME(const_prop): normalization needed b/c const prop lint in - // `mir_drops_elaborated_and_const_checked`, which happens before - // optimized MIR. Only after optimizing the MIR can we guarantee - // that the `RevealAll` pass has happened and that the body's consts - // are normalized, so any call to resolve before that needs to be - // manually normalized. - let val = self.tcx.normalize_erasing_regions(self.param_env, *val); - match val { + match *val { mir::ConstantKind::Ty(ct) => { let ty = ct.ty(); let valtree = self.eval_ty_constant(ct, span)?; |