bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Refactor type_stub from DefId to tuple

Browse source
This commit is contained in:
Matt Weber 2022-11-23 00:02:00 -05:00
parent aa485fc2a1
commit 27b1b01daa
5 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
View file

@ -1058,7 +1058,7 @@ fn build_struct_type_di_node<'ll, 'tcx>(
Stub::Struct, Stub::Struct,
unique_type_id, unique_type_id,
&compute_debuginfo_type_name(cx.tcx, struct_type, false), &compute_debuginfo_type_name(cx.tcx, struct_type, false),
Some(adt_def.did()), Some(file_metadata_from_def_id(cx, Some(adt_def.did()))),
size_and_align_of(struct_type_and_layout), size_and_align_of(struct_type_and_layout),
Some(containing_scope), Some(containing_scope),
visibility_di_flags(cx, adt_def.did(), adt_def.did()), visibility_di_flags(cx, adt_def.did(), adt_def.did()),
@ -1212,7 +1212,7 @@ fn build_closure_env_di_node<'ll, 'tcx>(
Stub::Struct, Stub::Struct,
unique_type_id, unique_type_id,
&type_name, &type_name,
Some(def_id), Some(file_metadata_from_def_id(cx, Some(def_id))),
cx.size_and_align_of(closure_env_type), cx.size_and_align_of(closure_env_type),
Some(containing_scope), Some(containing_scope),
DIFlags::FlagZero, DIFlags::FlagZero,
@ -1244,7 +1244,7 @@ fn build_union_type_di_node<'ll, 'tcx>(
Stub::Union, Stub::Union,
unique_type_id, unique_type_id,
&type_name, &type_name,
Some(union_def_id), Some(file_metadata_from_def_id(cx, Some(union_def_id))),
size_and_align_of(union_ty_and_layout), size_and_align_of(union_ty_and_layout),
Some(containing_scope), Some(containing_scope),
DIFlags::FlagZero, DIFlags::FlagZero,
@ -1622,10 +1622,12 @@ fn tuple_field_name(field_index: usize) -> Cow<'static, str> {
.unwrap_or_else(|| Cow::from(format!("__{field_index}"))) .unwrap_or_else(|| Cow::from(format!("__{field_index}")))
} }
pub(crate) type DefinitionLocation<'ll> = (&'ll DIFile, c_uint);
pub(crate) fn file_metadata_from_def_id<'ll>( pub(crate) fn file_metadata_from_def_id<'ll>(
cx: &CodegenCx<'ll, '_>, cx: &CodegenCx<'ll, '_>,
def_id: Option<DefId>, def_id: Option<DefId>,
) -> (&'ll DIFile, c_uint) { ) -> DefinitionLocation<'ll> {
if let Some(def_id) = def_id if let Some(def_id) = def_id
&& let span = hygiene::walk_chain_collapsed(cx.tcx.def_span(def_id), DUMMY_SP) && let span = hygiene::walk_chain_collapsed(cx.tcx.def_span(def_id), DUMMY_SP)
&& !span.is_dummy() && !span.is_dummy()

20
compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/cpp_like.rs
View file

@ -16,8 +16,8 @@ use crate::debuginfo::metadata::enums::DiscrResult;
use crate::debuginfo::metadata::type_map::{self, Stub, UniqueTypeId}; use crate::debuginfo::metadata::type_map::{self, Stub, UniqueTypeId};
use crate::debuginfo::metadata::{ use crate::debuginfo::metadata::{
DINodeCreationResult, NO_GENERICS, NO_SCOPE_METADATA, SmallVec, UNKNOWN_LINE_NUMBER, DINodeCreationResult, NO_GENERICS, NO_SCOPE_METADATA, SmallVec, UNKNOWN_LINE_NUMBER,
build_field_di_node, file_metadata, size_and_align_of, type_di_node, unknown_file_metadata, build_field_di_node, file_metadata, file_metadata_from_def_id, size_and_align_of, type_di_node,
visibility_di_flags, unknown_file_metadata, visibility_di_flags,
}; };
use crate::debuginfo::utils::DIB; use crate::debuginfo::utils::DIB;
use crate::llvm::debuginfo::{DIFile, DIFlags, DIType}; use crate::llvm::debuginfo::{DIFile, DIFlags, DIType};
@ -199,7 +199,7 @@ pub(super) fn build_enum_type_di_node<'ll, 'tcx>(
type_map::Stub::Union, type_map::Stub::Union,
unique_type_id, unique_type_id,
&enum_type_name, &enum_type_name,
Some(enum_adt_def.did()), Some(file_metadata_from_def_id(cx, Some(enum_adt_def.did()))),
cx.size_and_align_of(enum_type), cx.size_and_align_of(enum_type),
NO_SCOPE_METADATA, NO_SCOPE_METADATA,
visibility_di_flags(cx, enum_adt_def.did(), enum_adt_def.did()), visibility_di_flags(cx, enum_adt_def.did(), enum_adt_def.did()),
@ -278,7 +278,7 @@ pub(super) fn build_coroutine_di_node<'ll, 'tcx>(
type_map::Stub::Union, type_map::Stub::Union,
unique_type_id, unique_type_id,
&coroutine_type_name, &coroutine_type_name,
Some(coroutine_def_id), Some(file_metadata_from_def_id(cx, Some(coroutine_def_id))),
size_and_align_of(coroutine_type_and_layout), size_and_align_of(coroutine_type_and_layout),
NO_SCOPE_METADATA, NO_SCOPE_METADATA,
DIFlags::FlagZero, DIFlags::FlagZero,
@ -338,7 +338,6 @@ fn build_single_variant_union_fields<'ll, 'tcx>(
let variant_struct_type_wrapper_di_node = build_variant_struct_wrapper_type_di_node( let variant_struct_type_wrapper_di_node = build_variant_struct_wrapper_type_di_node(
cx, cx,
enum_adt_def,
enum_type_and_layout, enum_type_and_layout,
enum_type_di_node, enum_type_di_node,
variant_index, variant_index,
@ -348,6 +347,7 @@ fn build_single_variant_union_fields<'ll, 'tcx>(
tag_base_type_di_node, tag_base_type_di_node,
tag_base_type, tag_base_type,
DiscrResult::NoDiscriminant, DiscrResult::NoDiscriminant,
None,
); );
smallvec![ smallvec![
@ -471,7 +471,6 @@ fn build_variant_names_type_di_node<'ll, 'tcx>(
fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>( fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>(
cx: &CodegenCx<'ll, 'tcx>, cx: &CodegenCx<'ll, 'tcx>,
enum_adt_def: AdtDef<'tcx>,
enum_or_coroutine_type_and_layout: TyAndLayout<'tcx>, enum_or_coroutine_type_and_layout: TyAndLayout<'tcx>,
enum_or_coroutine_type_di_node: &'ll DIType, enum_or_coroutine_type_di_node: &'ll DIType,
variant_index: VariantIdx, variant_index: VariantIdx,
@ -481,6 +480,7 @@ fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>(
tag_base_type_di_node: &'ll DIType, tag_base_type_di_node: &'ll DIType,
tag_base_type: Ty<'tcx>, tag_base_type: Ty<'tcx>,
discr: DiscrResult, discr: DiscrResult,
source_info: Option<(&'ll DIFile, c_uint)>,
) -> &'ll DIType { ) -> &'ll DIType {
type_map::build_type_with_children( type_map::build_type_with_children(
cx, cx,
@ -493,7 +493,7 @@ fn build_variant_struct_wrapper_type_di_node<'ll, 'tcx>(
variant_index, variant_index,
), ),
&variant_struct_wrapper_type_name(variant_index), &variant_struct_wrapper_type_name(variant_index),
Some(enum_adt_def.variant(variant_index).def_id), source_info,
// NOTE: We use size and align of enum_type, not from variant_layout: // NOTE: We use size and align of enum_type, not from variant_layout:
size_and_align_of(enum_or_coroutine_type_and_layout), size_and_align_of(enum_or_coroutine_type_and_layout),
Some(enum_or_coroutine_type_di_node), Some(enum_or_coroutine_type_di_node),
@ -780,13 +780,8 @@ fn build_union_fields_for_direct_tag_enum_or_coroutine<'ll, 'tcx>(
let field_name = variant_union_field_name(variant_member_info.variant_index); let field_name = variant_union_field_name(variant_member_info.variant_index);
let (size, align) = size_and_align_of(enum_type_and_layout); let (size, align) = size_and_align_of(enum_type_and_layout);
let ty::Adt(enum_adt_def, _) = enum_type_and_layout.ty.kind() else {
unreachable!();
};
let variant_struct_type_wrapper = build_variant_struct_wrapper_type_di_node( let variant_struct_type_wrapper = build_variant_struct_wrapper_type_di_node(
cx, cx,
*enum_adt_def,
enum_type_and_layout, enum_type_and_layout,
enum_type_di_node, enum_type_di_node,
variant_member_info.variant_index, variant_member_info.variant_index,
@ -796,6 +791,7 @@ fn build_union_fields_for_direct_tag_enum_or_coroutine<'ll, 'tcx>(
tag_base_type_di_node, tag_base_type_di_node,
tag_base_type, tag_base_type,
variant_member_info.discr, variant_member_info.discr,
variant_member_info.source_info,
); );
// We use LLVMRustDIBuilderCreateMemberType() member type directly because // We use LLVMRustDIBuilderCreateMemberType() member type directly because

2
compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/mod.rs
View file

@ -208,7 +208,7 @@ fn build_enum_variant_struct_type_di_node<'ll, 'tcx>(
variant_index, variant_index,
), ),
variant_def.name.as_str(), variant_def.name.as_str(),
Some(variant_def.def_id), Some(file_metadata_from_def_id(cx, Some(variant_def.def_id))),
// NOTE: We use size and align of enum_type, not from variant_layout: // NOTE: We use size and align of enum_type, not from variant_layout:
size_and_align_of(enum_type_and_layout), size_and_align_of(enum_type_and_layout),
Some(enum_type_di_node), Some(enum_type_di_node),

4
compiler/rustc_codegen_llvm/src/debuginfo/metadata/enums/native.rs
View file

@ -63,7 +63,7 @@ pub(super) fn build_enum_type_di_node<'ll, 'tcx>(
Stub::Struct, Stub::Struct,
unique_type_id, unique_type_id,
&enum_type_name, &enum_type_name,
Some(enum_adt_def.did()), Some(file_metadata_from_def_id(cx, Some(enum_adt_def.did()))),
size_and_align_of(enum_type_and_layout), size_and_align_of(enum_type_and_layout),
Some(containing_scope), Some(containing_scope),
visibility_flags, visibility_flags,
@ -147,7 +147,7 @@ pub(super) fn build_coroutine_di_node<'ll, 'tcx>(
Stub::Struct, Stub::Struct,
unique_type_id, unique_type_id,
&coroutine_type_name, &coroutine_type_name,
Some(coroutine_def_id), Some(file_metadata_from_def_id(cx, Some(coroutine_def_id))),
size_and_align_of(coroutine_type_and_layout), size_and_align_of(coroutine_type_and_layout),
Some(containing_scope), Some(containing_scope),
DIFlags::FlagZero, DIFlags::FlagZero,

12
compiler/rustc_codegen_llvm/src/debuginfo/metadata/type_map.rs
View file

@ -8,7 +8,9 @@ use rustc_macros::HashStable;
use rustc_middle::bug; use rustc_middle::bug;
use rustc_middle::ty::{ParamEnv, PolyExistentialTraitRef, Ty, TyCtxt}; use rustc_middle::ty::{ParamEnv, PolyExistentialTraitRef, Ty, TyCtxt};
use super::{SmallVec, UNKNOWN_LINE_NUMBER, file_metadata, unknown_file_metadata}; use super::{
DefinitionLocation, SmallVec, UNKNOWN_LINE_NUMBER, file_metadata, unknown_file_metadata,
};
use crate::common::{AsCCharPtr, CodegenCx}; use crate::common::{AsCCharPtr, CodegenCx};
use crate::debuginfo::utils::{DIB, create_DIArray, debug_context}; use crate::debuginfo::utils::{DIB, create_DIArray, debug_context};
use crate::llvm::debuginfo::{DIFlags, DIScope, DIType}; use crate::llvm::debuginfo::{DIFlags, DIScope, DIType};
@ -174,7 +176,7 @@ pub(super) fn stub<'ll, 'tcx>(
kind: Stub<'ll>, kind: Stub<'ll>,
unique_type_id: UniqueTypeId<'tcx>, unique_type_id: UniqueTypeId<'tcx>,
name: &str, name: &str,
def_id: Option<rustc_span::def_id::DefId>, def_location: Option<DefinitionLocation<'ll>>,
(size, align): (Size, Align), (size, align): (Size, Align),
containing_scope: Option<&'ll DIScope>, containing_scope: Option<&'ll DIScope>,
flags: DIFlags, flags: DIFlags,
@ -182,7 +184,11 @@ pub(super) fn stub<'ll, 'tcx>(
let empty_array = create_DIArray(DIB(cx), &[]); let empty_array = create_DIArray(DIB(cx), &[]);
let unique_type_id_str = unique_type_id.generate_unique_id_string(cx.tcx); let unique_type_id_str = unique_type_id.generate_unique_id_string(cx.tcx);
let (file_metadata, line_number) = super::file_metadata_from_def_id(cx, def_id); let (file_metadata, line_number) = if let Some(def_location) = def_location {
(def_location.0, def_location.1)
} else {
(unknown_file_metadata(cx), UNKNOWN_LINE_NUMBER)
};
let metadata = match kind { let metadata = match kind {
Stub::Struct | Stub::VTableTy { .. } => { Stub::Struct | Stub::VTableTy { .. } => {