diff options
| author | bors <bors@rust-lang.org> | 2024-11-20 15:49:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-20 15:49:54 +0000 |
| commit | a1f299953656f95004c69b24ad8071d6899fa9da (patch) | |
| tree | 263871d5b601952bd944431f0b232cf2a1909090 /compiler/rustc_mir_transform | |
| parent | bfe809d93c67de03e3a84b80549927fd828ec5d0 (diff) | |
| parent | b1413e05839751cc44c92577383c173d7892e429 (diff) | |
| download | rust-a1f299953656f95004c69b24ad8071d6899fa9da.tar.gz rust-a1f299953656f95004c69b24ad8071d6899fa9da.zip | |
Auto merge of #133251 - matthiaskrgr:rollup-gjeis3q, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #131904 (Stabilize const_pin_2) - #133239 (Fix LLVM target triple for `x86_64-win7-windows-msvc`) - #133241 (interpret: make typing_env field private) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform')
| -rw-r--r-- | compiler/rustc_mir_transform/src/gvn.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_mir_transform/src/gvn.rs b/compiler/rustc_mir_transform/src/gvn.rs index b3d9af37204..976f4a8e919 100644 --- a/compiler/rustc_mir_transform/src/gvn.rs +++ b/compiler/rustc_mir_transform/src/gvn.rs @@ -100,7 +100,7 @@ use rustc_middle::bug; use rustc_middle::mir::interpret::GlobalAlloc; use rustc_middle::mir::visit::*; use rustc_middle::mir::*; -use rustc_middle::ty::layout::LayoutOf; +use rustc_middle::ty::layout::{HasTypingEnv, LayoutOf}; use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_span::DUMMY_SP; use rustc_span::def_id::DefId; @@ -294,7 +294,7 @@ impl<'body, 'tcx> VnState<'body, 'tcx> { } fn typing_env(&self) -> ty::TypingEnv<'tcx> { - self.ecx.typing_env + self.ecx.typing_env() } #[instrument(level = "trace", skip(self), ret)] |