diff options
| author | Laurențiu Nicola <lnicola@users.noreply.github.com> | 2024-11-28 06:54:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-28 06:54:16 +0000 |
| commit | 8cf30c235619f60c0a0f0a0779bd17e7e70bf0fb (patch) | |
| tree | 564950531f457ebbe2a114e486cb2c8c72bf9ed0 /compiler/rustc_codegen_llvm/src/debuginfo/utils.rs | |
| parent | 4e3354ef925d9711c125470097643236c3a983d0 (diff) | |
| parent | 1a435ed7edc19812c29006701b0106a0d0802542 (diff) | |
| download | rust-8cf30c235619f60c0a0f0a0779bd17e7e70bf0fb.tar.gz rust-8cf30c235619f60c0a0f0a0779bd17e7e70bf0fb.zip | |
Merge pull request #18566 from lnicola/sync-from-rust
minor: Sync from downstream
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/debuginfo/utils.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/debuginfo/utils.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs b/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs index 960487ada16..6e841293477 100644 --- a/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs +++ b/compiler/rustc_codegen_llvm/src/debuginfo/utils.rs @@ -1,7 +1,7 @@ // Utility Functions. use rustc_hir::def_id::DefId; -use rustc_middle::ty::layout::{HasParamEnv, LayoutOf}; +use rustc_middle::ty::layout::{HasTypingEnv, LayoutOf}; use rustc_middle::ty::{self, Ty}; use tracing::trace; @@ -62,7 +62,7 @@ pub(crate) fn wide_pointer_kind<'ll, 'tcx>( cx: &CodegenCx<'ll, 'tcx>, pointee_ty: Ty<'tcx>, ) -> Option<WidePtrKind> { - let pointee_tail_ty = cx.tcx.struct_tail_for_codegen(pointee_ty, cx.param_env()); + let pointee_tail_ty = cx.tcx.struct_tail_for_codegen(pointee_ty, cx.typing_env()); let layout = cx.layout_of(pointee_tail_ty); trace!( "wide_pointer_kind: {:?} has layout {:?} (is_unsized? {})", |