diff options
| author | bors <bors@rust-lang.org> | 2022-06-08 00:26:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-06-08 00:26:37 +0000 |
| commit | 47aee31b2a89cb7de97d779869a30b046632b6af (patch) | |
| tree | 465b27c8fd03e46261efc3f0cda426e23b2f7810 /compiler/rustc_const_eval/src/interpret | |
| parent | b17e9d76f2ad15022e0e69bc33745c4ef9025a8f (diff) | |
| parent | c2d84852e5a5e6869acbeaab8a4794e792ad9334 (diff) | |
| download | rust-47aee31b2a89cb7de97d779869a30b046632b6af.tar.gz rust-47aee31b2a89cb7de97d779869a30b046632b6af.zip | |
Auto merge of #97849 - matthiaskrgr:rollup-1yodhvw, r=matthiaskrgr
Rollup of 5 pull requests
Successful merges:
- #97829 (Add regresion test for #95307)
- #97831 (Remove `AlwaysLiveLocals` wrapper struct)
- #97832 (Change `Direction::{is_forward,is_backward}` functions into constants)
- #97840 (RustWrapper: adapt to APInt API changes in LLVM 15)
- #97845 (Use more targeted suggestion when confusing i8 with std::i8)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/eval_context.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/eval_context.rs b/compiler/rustc_const_eval/src/interpret/eval_context.rs index 0c954ac6e5f..4c23f84bd00 100644 --- a/compiler/rustc_const_eval/src/interpret/eval_context.rs +++ b/compiler/rustc_const_eval/src/interpret/eval_context.rs @@ -15,7 +15,7 @@ use rustc_middle::ty::layout::{ use rustc_middle::ty::{ self, query::TyCtxtAt, subst::SubstsRef, ParamEnv, Ty, TyCtxt, TypeFoldable, }; -use rustc_mir_dataflow::storage::AlwaysLiveLocals; +use rustc_mir_dataflow::storage::always_live_locals; use rustc_query_system::ich::StableHashingContext; use rustc_session::Limit; use rustc_span::{Pos, Span}; @@ -715,7 +715,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { // Now mark those locals as dead that we do not want to initialize // Mark locals that use `Storage*` annotations as dead on function entry. - let always_live = AlwaysLiveLocals::new(self.body()); + let always_live = always_live_locals(self.body()); for local in locals.indices() { if !always_live.contains(local) { locals[local].value = LocalValue::Dead; |
