[debuginfo] Fix and unify handling of fat pointers in debuginfo.
This commit is contained in:
parent
ef119d704d
commit
d253e6e473
4 changed files with 271 additions and 178 deletions
|
@ -4,7 +4,9 @@ use super::namespace::item_namespace;
|
|||
use super::CrateDebugContext;
|
||||
|
||||
use rustc_hir::def_id::DefId;
|
||||
use rustc_middle::ty::DefIdTree;
|
||||
use rustc_middle::ty::layout::LayoutOf;
|
||||
use rustc_middle::ty::{self, DefIdTree, Ty};
|
||||
use rustc_target::abi::VariantIdx;
|
||||
|
||||
use crate::common::CodegenCx;
|
||||
use crate::llvm;
|
||||
|
@ -46,3 +48,58 @@ pub fn DIB<'a, 'll>(cx: &'a CodegenCx<'ll, '_>) -> &'a DIBuilder<'ll> {
|
|||
pub fn get_namespace_for_item<'ll>(cx: &CodegenCx<'ll, '_>, def_id: DefId) -> &'ll DIScope {
|
||||
item_namespace(cx, cx.tcx.parent(def_id).expect("get_namespace_for_item: missing parent?"))
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq, Eq)]
|
||||
pub(crate) enum FatPtrKind {
|
||||
Slice,
|
||||
Dyn,
|
||||
}
|
||||
|
||||
/// Determines if `pointee_ty` is slice-like or trait-object-like, i.e.
|
||||
/// if the second field of the fat pointer is a length or a vtable-pointer.
|
||||
/// If `pointee_ty` does not require a fat pointer (because it is Sized) then
|
||||
/// the function returns `None`.
|
||||
pub(crate) fn fat_pointer_kind<'ll, 'tcx>(
|
||||
cx: &CodegenCx<'ll, 'tcx>,
|
||||
pointee_ty: Ty<'tcx>,
|
||||
) -> Option<FatPtrKind> {
|
||||
let layout = cx.layout_of(pointee_ty);
|
||||
|
||||
if !layout.is_unsized() {
|
||||
return None;
|
||||
}
|
||||
|
||||
match *pointee_ty.kind() {
|
||||
ty::Str | ty::Slice(_) => Some(FatPtrKind::Slice),
|
||||
ty::Dynamic(..) => Some(FatPtrKind::Dyn),
|
||||
ty::Adt(adt_def, _) => {
|
||||
assert!(adt_def.is_struct());
|
||||
assert!(adt_def.variants.len() == 1);
|
||||
let variant = &adt_def.variants[VariantIdx::from_usize(0)];
|
||||
assert!(!variant.fields.is_empty());
|
||||
let last_field_index = variant.fields.len() - 1;
|
||||
|
||||
debug_assert!(
|
||||
(0..last_field_index)
|
||||
.all(|field_index| { !layout.field(cx, field_index).is_unsized() })
|
||||
);
|
||||
|
||||
let unsized_field = layout.field(cx, last_field_index);
|
||||
assert!(unsized_field.is_unsized());
|
||||
fat_pointer_kind(cx, unsized_field.ty)
|
||||
}
|
||||
ty::Foreign(_) => {
|
||||
// Assert that pointers to foreign types really are thin:
|
||||
debug_assert_eq!(
|
||||
cx.size_of(cx.tcx.mk_imm_ptr(pointee_ty)),
|
||||
cx.size_of(cx.tcx.mk_imm_ptr(cx.tcx.types.u8))
|
||||
);
|
||||
None
|
||||
}
|
||||
_ => {
|
||||
// For all other pointee types we should already have returned None
|
||||
// at the beginning of the function.
|
||||
panic!("fat_pointer_kind() - Encountered unexpected `pointee_ty`: {:?}", pointee_ty)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue