diff options
| author | The Miri Cronjob Bot <miri@cron.bot> | 2024-11-19 05:03:17 +0000 |
|---|---|---|
| committer | The Miri Cronjob Bot <miri@cron.bot> | 2024-11-19 05:03:17 +0000 |
| commit | cfc5961ca3ea57019e2cfb3283c06cc149b01cc1 (patch) | |
| tree | a9d81915ab2ef170a34cd988557f06e1cb9c2e47 /compiler/rustc_codegen_llvm/src/debuginfo/utils.rs | |
| parent | 5e690995694e3e0c769ccd43d654be2a59568469 (diff) | |
| parent | f5b023bd9cf43803a6d39b101c54a98cb7e7da7c (diff) | |
| download | rust-cfc5961ca3ea57019e2cfb3283c06cc149b01cc1.tar.gz rust-cfc5961ca3ea57019e2cfb3283c06cc149b01cc1.zip | |
Merge from rustc
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? {})", |