mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #84752 - lrh2000:generator-debuginfo, r=tmandry

Browse Source 
Fix debuginfo for generators

First, all fields except the discriminant (including `outer_fields`) should be put into structures inside the variant part, which gives an equivalent layout but offers us much better integration with debuggers.

Second, artificial flags in generator variants should be removed.
 - Literally, variants are not artificial. We have `yield` statements, upvars and inner variables in the source code.
 - Functionally, we don't want debuggers to suppress the variants. It contains the state of the generator, which is useful when debugging. So they shouldn't be marked artificial.
 - Debuggers may use artificial flags to find the active variant. In this case, marking variants artificial will make debuggers not work properly.

Fixes #62572.
Fixes #79009.

And refer https://rust-lang.zulipchat.com/#narrow/stream/131828-t-compiler/topic/Debuginfo.20for.20generators.
This commit is contained in:
Dylan DPC 2021-05-02 17:00:23 +02:00 committed by GitHub
commit 2553053828
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 114 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs
View File

@ -309,6 +309,7 @@ impl RecursiveTypeDescription<'ll, 'tcx> {
unfinished_type, unfinished_type,
member_holding_stub, member_holding_stub,
member_descriptions, member_descriptions,
None,
); );
MetadataCreationResult::new(metadata_stub, true) MetadataCreationResult::new(metadata_stub, true)
} }
@ -1459,6 +1460,7 @@ struct EnumMemberDescriptionFactory<'ll, 'tcx> {
layout: TyAndLayout<'tcx>, layout: TyAndLayout<'tcx>,
tag_type_metadata: Option<&'ll DIType>, tag_type_metadata: Option<&'ll DIType>,
containing_scope: &'ll DIScope, containing_scope: &'ll DIScope,
common_members: Vec<Option<&'ll DIType>>,
span: Span, span: Span,
} }
@ -1493,10 +1495,6 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
} else { } else {
type_metadata(cx, self.enum_type, self.span) type_metadata(cx, self.enum_type, self.span)
}; };
let flags = match self.enum_type.kind() {
ty::Generator(..) => DIFlags::FlagArtificial,
_ => DIFlags::FlagZero,
};
match self.layout.variants { match self.layout.variants {
Variants::Single { index } => { Variants::Single { index } => {
@ -1523,6 +1521,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
self.enum_type, self.enum_type,
variant_type_metadata, variant_type_metadata,
member_descriptions, member_descriptions,
Some(&self.common_members),
); );
vec![MemberDescription { vec![MemberDescription {
name: if fallback { String::new() } else { variant_info.variant_name() }, name: if fallback { String::new() } else { variant_info.variant_name() },
@ -1530,7 +1529,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
offset: Size::ZERO, offset: Size::ZERO,
size: self.layout.size, size: self.layout.size,
align: self.layout.align.abi, align: self.layout.align.abi,
flags, flags: DIFlags::FlagZero,
discriminant: None, discriminant: None,
source_info: variant_info.source_info(cx), source_info: variant_info.source_info(cx),
}] }]
@ -1572,6 +1571,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
self.enum_type, self.enum_type,
variant_type_metadata, variant_type_metadata,
member_descriptions, member_descriptions,
Some(&self.common_members),
); );
MemberDescription { MemberDescription {
@ -1584,7 +1584,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
offset: Size::ZERO, offset: Size::ZERO,
size: self.layout.size, size: self.layout.size,
align: self.layout.align.abi, align: self.layout.align.abi,
flags, flags: DIFlags::FlagZero,
discriminant: Some( discriminant: Some(
self.layout.ty.discriminant_for_variant(cx.tcx, i).unwrap().val self.layout.ty.discriminant_for_variant(cx.tcx, i).unwrap().val
as u64, as u64,
@ -1621,6 +1621,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
self.enum_type, self.enum_type,
variant_type_metadata, variant_type_metadata,
variant_member_descriptions, variant_member_descriptions,
Some(&self.common_members),
); );
// Encode the information about the null variant in the union // Encode the information about the null variant in the union
@ -1667,7 +1668,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
offset: Size::ZERO, offset: Size::ZERO,
size: variant.size, size: variant.size,
align: variant.align.abi, align: variant.align.abi,
flags, flags: DIFlags::FlagZero,
discriminant: None, discriminant: None,
source_info: variant_info.source_info(cx), source_info: variant_info.source_info(cx),
}] }]
@ -1695,6 +1696,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
self.enum_type, self.enum_type,
variant_type_metadata, variant_type_metadata,
member_descriptions, member_descriptions,
Some(&self.common_members),
); );
let niche_value = if i == dataful_variant { let niche_value = if i == dataful_variant {
@ -1717,7 +1719,7 @@ impl EnumMemberDescriptionFactory<'ll, 'tcx> {
offset: Size::ZERO, offset: Size::ZERO,
size: self.layout.size, size: self.layout.size,
align: self.layout.align.abi, align: self.layout.align.abi,
flags, flags: DIFlags::FlagZero,
discriminant: niche_value, discriminant: niche_value,
source_info: variant_info.source_info(cx), source_info: variant_info.source_info(cx),
} }
@ -1849,13 +1851,6 @@ impl<'tcx> VariantInfo<'_, 'tcx> {
} }
None None
} }
fn is_artificial(&self) -> bool {
match self {
VariantInfo::Generator { .. } => true,
VariantInfo::Adt(..) => false,
}
}
} }
/// Returns a tuple of (1) `type_metadata_stub` of the variant, (2) a /// Returns a tuple of (1) `type_metadata_stub` of the variant, (2) a
@ -1881,8 +1876,7 @@ fn describe_enum_variant(
&variant_name, &variant_name,
unique_type_id, unique_type_id,
Some(containing_scope), Some(containing_scope),
// FIXME(tmandry): This doesn't seem to have any effect. DIFlags::FlagZero,
if variant.is_artificial() { DIFlags::FlagArtificial } else { DIFlags::FlagZero },
) )
}); });
@ -1945,11 +1939,6 @@ fn prepare_enum_metadata(
) -> RecursiveTypeDescription<'ll, 'tcx> { ) -> RecursiveTypeDescription<'ll, 'tcx> {
let tcx = cx.tcx; let tcx = cx.tcx;
let enum_name = compute_debuginfo_type_name(tcx, enum_type, false); let enum_name = compute_debuginfo_type_name(tcx, enum_type, false);
// FIXME(tmandry): This doesn't seem to have any effect.
let enum_flags = match enum_type.kind() {
ty::Generator(..) => DIFlags::FlagArtificial,
_ => DIFlags::FlagZero,
};
let containing_scope = get_namespace_for_item(cx, enum_def_id); let containing_scope = get_namespace_for_item(cx, enum_def_id);
// FIXME: This should emit actual file metadata for the enum, but we // FIXME: This should emit actual file metadata for the enum, but we
@ -2082,7 +2071,7 @@ fn prepare_enum_metadata(
UNKNOWN_LINE_NUMBER, UNKNOWN_LINE_NUMBER,
layout.size.bits(), layout.size.bits(),
layout.align.abi.bits() as u32, layout.align.abi.bits() as u32,
enum_flags, DIFlags::FlagZero,
None, None,
0, // RuntimeLang 0, // RuntimeLang
unique_type_id_str.as_ptr().cast(), unique_type_id_str.as_ptr().cast(),
@ -2102,6 +2091,7 @@ fn prepare_enum_metadata(
layout, layout,
tag_type_metadata: discriminant_type_metadata, tag_type_metadata: discriminant_type_metadata,
containing_scope, containing_scope,
common_members: vec![],
span, span,
}), }),
); );
@ -2171,7 +2161,7 @@ fn prepare_enum_metadata(
} }
}; };
let mut outer_fields = match layout.variants { let outer_fields = match layout.variants {
Variants::Single { .. } => vec![], Variants::Single { .. } => vec![],
Variants::Multiple { .. } => { Variants::Multiple { .. } => {
let tuple_mdf = TupleMemberDescriptionFactory { let tuple_mdf = TupleMemberDescriptionFactory {
@ -2203,18 +2193,21 @@ fn prepare_enum_metadata(
UNKNOWN_LINE_NUMBER, UNKNOWN_LINE_NUMBER,
layout.size.bits(), layout.size.bits(),
layout.align.abi.bits() as u32, layout.align.abi.bits() as u32,
enum_flags, DIFlags::FlagZero,
discriminator_metadata, discriminator_metadata,
empty_array, empty_array,
variant_part_unique_type_id_str.as_ptr().cast(), variant_part_unique_type_id_str.as_ptr().cast(),
variant_part_unique_type_id_str.len(), variant_part_unique_type_id_str.len(),
) )
}; };
outer_fields.push(Some(variant_part));
let struct_wrapper = { let struct_wrapper = {
// The variant part must be wrapped in a struct according to DWARF. // The variant part must be wrapped in a struct according to DWARF.
let type_array = create_DIArray(DIB(cx), &outer_fields); // All fields except the discriminant (including `outer_fields`)
// should be put into structures inside the variant part, which gives
// an equivalent layout but offers us much better integration with
// debuggers.
let type_array = create_DIArray(DIB(cx), &[Some(variant_part)]);
let type_map = debug_context(cx).type_map.borrow(); let type_map = debug_context(cx).type_map.borrow();
let unique_type_id_str = type_map.get_unique_type_id_as_string(unique_type_id); let unique_type_id_str = type_map.get_unique_type_id_as_string(unique_type_id);
@ -2229,7 +2222,7 @@ fn prepare_enum_metadata(
UNKNOWN_LINE_NUMBER, UNKNOWN_LINE_NUMBER,
layout.size.bits(), layout.size.bits(),
layout.align.abi.bits() as u32, layout.align.abi.bits() as u32,
enum_flags, DIFlags::FlagZero,
None, None,
type_array, type_array,
0, 0,
@ -2251,6 +2244,7 @@ fn prepare_enum_metadata(
layout, layout,
tag_type_metadata: None, tag_type_metadata: None,
containing_scope, containing_scope,
common_members: outer_fields,
span, span,
}), }),
) )
@ -2283,7 +2277,13 @@ fn composite_type_metadata(
DIFlags::FlagZero, DIFlags::FlagZero,
); );
// ... and immediately create and add the member descriptions. // ... and immediately create and add the member descriptions.
set_members_of_composite_type(cx, composite_type, composite_type_metadata, member_descriptions); set_members_of_composite_type(
cx,
composite_type,
composite_type_metadata,
member_descriptions,
None,
);
composite_type_metadata composite_type_metadata
} }
@ -2293,6 +2293,7 @@ fn set_members_of_composite_type(
composite_type: Ty<'tcx>, composite_type: Ty<'tcx>,
composite_type_metadata: &'ll DICompositeType, composite_type_metadata: &'ll DICompositeType,
member_descriptions: Vec<MemberDescription<'ll>>, member_descriptions: Vec<MemberDescription<'ll>>,
common_members: Option<&Vec<Option<&'ll DIType>>>,
) { ) {
// In some rare cases LLVM metadata uniquing would lead to an existing type // In some rare cases LLVM metadata uniquing would lead to an existing type
// description being used instead of a new one created in // description being used instead of a new one created in
@ -2311,10 +2312,13 @@ fn set_members_of_composite_type(
} }
} }
let member_metadata: Vec<_> = member_descriptions let mut member_metadata: Vec<_> = member_descriptions
.into_iter() .into_iter()
.map(|desc| Some(desc.into_metadata(cx, composite_type_metadata))) .map(|desc| Some(desc.into_metadata(cx, composite_type_metadata)))
.collect(); .collect();
if let Some(other_members) = common_members {
member_metadata.extend(other_members.iter());
}
let type_params = compute_type_parameters(cx, composite_type); let type_params = compute_type_parameters(cx, composite_type);
unsafe { unsafe {

24
src/test/codegen/async-fn-debug-msvc.rs
View File

@ -1,7 +1,7 @@
// Verify debuginfo for generators: // Verify debuginfo for generators:
// - Each variant points to the file and line of its yield point // - Each variant points to the file and line of its yield point
// - The generator types and variants are marked artificial // - The discriminants are marked artificial
// - Captured vars from the source are not marked artificial // - Other fields are not marked artificial
// //
// //
// compile-flags: -C debuginfo=2 --edition=2018 // compile-flags: -C debuginfo=2 --edition=2018
@ -17,26 +17,32 @@ async fn async_fn_test() {
// FIXME: No way to reliably check the filename. // FIXME: No way to reliably check the filename.
// CHECK-DAG: [[ASYNC_FN:!.*]] = !DINamespace(name: "async_fn_test" // CHECK-DAG: [[ASYNC_FN:!.*]] = !DINamespace(name: "async_fn_test"
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0", scope: [[ASYNC_FN]], {{.*}}flags: DIFlagArtificial // CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0", scope: [[ASYNC_FN]]
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// For brevity, we only check the struct name and members of the last variant. // For brevity, we only check the struct name and members of the last variant.
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 11, // CHECK-SAME: file: [[FILE:![0-9]*]], line: 11,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 15, // CHECK-SAME: file: [[FILE]], line: 15,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 15, // CHECK-SAME: file: [[FILE]], line: 15,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 12, // CHECK-SAME: file: [[FILE]], line: 12,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 14, // CHECK-SAME: file: [[FILE]], line: 14,
// CHECK-SAME: baseType: [[VARIANT:![0-9]*]] // CHECK-SAME: baseType: [[VARIANT:![0-9]*]]
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[ASYNC_FN]], // CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[ASYNC_FN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "RUST$ENUM$DISR", scope: [[S1]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "RUST$ENUM$DISR", scope: [[S1]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-SAME: flags: DIFlagArtificial
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]] // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]]

29
src/test/codegen/async-fn-debug.rs
View File

@ -1,7 +1,7 @@
// Verify debuginfo for async fn: // Verify debuginfo for async fn:
// - Each variant points to the file and line of its yield point // - Each variant points to the file and line of its yield point
// - The generator types and variants are marked artificial // - The discriminants are marked artificial
// - Captured vars from the source are not marked artificial // - Other fields are not marked artificial
// //
// //
// compile-flags: -C debuginfo=2 --edition=2018 // compile-flags: -C debuginfo=2 --edition=2018
@ -17,29 +17,36 @@ async fn async_fn_test() {
// FIXME: No way to reliably check the filename. // FIXME: No way to reliably check the filename.
// CHECK-DAG: [[ASYNC_FN:!.*]] = !DINamespace(name: "async_fn_test" // CHECK-DAG: [[ASYNC_FN:!.*]] = !DINamespace(name: "async_fn_test"
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "generator-0", scope: [[ASYNC_FN]], {{.*}}flags: DIFlagArtificial // CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "generator-0", scope: [[ASYNC_FN]]
// CHECK: [[VARIANT:!.*]] = !DICompositeType(tag: DW_TAG_variant_part, scope: [[ASYNC_FN]], // CHECK: [[VARIANT:!.*]] = !DICompositeType(tag: DW_TAG_variant_part, scope: [[ASYNC_FN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: discriminator: [[DISC:![0-9]*]] // CHECK-SAME: discriminator: [[DISC:![0-9]*]]
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "0", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "0", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 11, // CHECK-SAME: file: [[FILE:![0-9]*]], line: 11,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DICompositeType(tag: DW_TAG_structure_type, name: "Unresumed", scope: [[GEN]], // CHECK: {{!.*}} = !DICompositeType(tag: DW_TAG_structure_type, name: "Unresumed", scope: [[GEN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "1", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "1", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 15, // CHECK-SAME: file: [[FILE]], line: 15,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "2", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "2", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 15, // CHECK-SAME: file: [[FILE]], line: 15,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "3", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "3", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 12, // CHECK-SAME: file: [[FILE]], line: 12,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "4", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "4", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 14, // CHECK-SAME: file: [[FILE]], line: 14,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]], // CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]] // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]]
// CHECK-NOT: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: ) // CHECK-SAME: )

24
src/test/codegen/generator-debug-msvc.rs
View File

@ -1,7 +1,7 @@
// Verify debuginfo for generators: // Verify debuginfo for generators:
// - Each variant points to the file and line of its yield point // - Each variant points to the file and line of its yield point
// - The generator types and variants are marked artificial // - The discriminants are marked artificial
// - Captured vars from the source are not marked artificial // - Other fields are not marked artificial
// //
// //
// compile-flags: -C debuginfo=2 // compile-flags: -C debuginfo=2
@ -21,26 +21,32 @@ fn generator_test() -> impl Generator<Yield = i32, Return = ()> {
// FIXME: No way to reliably check the filename. // FIXME: No way to reliably check the filename.
// CHECK-DAG: [[GEN_FN:!.*]] = !DINamespace(name: "generator_test" // CHECK-DAG: [[GEN_FN:!.*]] = !DINamespace(name: "generator_test"
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0", scope: [[GEN_FN]], {{.*}}flags: DIFlagArtificial // CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_union_type, name: "generator-0", scope: [[GEN_FN]]
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// For brevity, we only check the struct name and members of the last variant. // For brevity, we only check the struct name and members of the last variant.
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 14, // CHECK-SAME: file: [[FILE:![0-9]*]], line: 14,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 18, // CHECK-SAME: file: [[FILE]], line: 18,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 18, // CHECK-SAME: file: [[FILE]], line: 18,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 15, // CHECK-SAME: file: [[FILE]], line: 15,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, scope: [[GEN]],
// CHECK-SAME: file: [[FILE]], line: 17, // CHECK-SAME: file: [[FILE]], line: 17,
// CHECK-SAME: baseType: [[VARIANT:![0-9]*]] // CHECK-SAME: baseType: [[VARIANT:![0-9]*]]
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN_FN]], // CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN_FN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "RUST$ENUM$DISR", scope: [[S1]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "RUST$ENUM$DISR", scope: [[S1]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-SAME: flags: DIFlagArtificial
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]] // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]]

29
src/test/codegen/generator-debug.rs
View File

@ -1,7 +1,7 @@
// Verify debuginfo for generators: // Verify debuginfo for generators:
// - Each variant points to the file and line of its yield point // - Each variant points to the file and line of its yield point
// - The generator types and variants are marked artificial // - The discriminants are marked artificial
// - Captured vars from the source are not marked artificial // - Other fields are not marked artificial
// //
// //
// compile-flags: -C debuginfo=2 --edition=2018 // compile-flags: -C debuginfo=2 --edition=2018
@ -21,29 +21,36 @@ fn generator_test() -> impl Generator<Yield = i32, Return = ()> {
// FIXME: No way to reliably check the filename. // FIXME: No way to reliably check the filename.
// CHECK-DAG: [[GEN_FN:!.*]] = !DINamespace(name: "generator_test" // CHECK-DAG: [[GEN_FN:!.*]] = !DINamespace(name: "generator_test"
// CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "generator-0", scope: [[GEN_FN]], {{.*}}flags: DIFlagArtificial // CHECK-DAG: [[GEN:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "generator-0", scope: [[GEN_FN]]
// CHECK: [[VARIANT:!.*]] = !DICompositeType(tag: DW_TAG_variant_part, scope: [[GEN_FN]], // CHECK: [[VARIANT:!.*]] = !DICompositeType(tag: DW_TAG_variant_part, scope: [[GEN_FN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: discriminator: [[DISC:![0-9]*]] // CHECK-SAME: discriminator: [[DISC:![0-9]*]]
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "0", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "0", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE:![0-9]*]], line: 14, // CHECK-SAME: file: [[FILE:![0-9]*]], line: 14,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DICompositeType(tag: DW_TAG_structure_type, name: "Unresumed", scope: [[GEN]], // CHECK: {{!.*}} = !DICompositeType(tag: DW_TAG_structure_type, name: "Unresumed", scope: [[GEN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "1", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "1", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 18, // CHECK-SAME: file: [[FILE]], line: 18,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "2", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "2", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 18, // CHECK-SAME: file: [[FILE]], line: 18,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "3", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "3", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 15, // CHECK-SAME: file: [[FILE]], line: 15,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "4", scope: [[VARIANT]], // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "4", scope: [[VARIANT]],
// CHECK-SAME: file: [[FILE]], line: 17, // CHECK-SAME: file: [[FILE]], line: 17,
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]], // CHECK: [[S1:!.*]] = !DICompositeType(tag: DW_TAG_structure_type, name: "Suspend1", scope: [[GEN]],
// CHECK-SAME: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: )
// CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]] // CHECK: {{!.*}} = !DIDerivedType(tag: DW_TAG_member, name: "s", scope: [[S1]]
// CHECK-NOT: flags: DIFlagArtificial // CHECK-NOT: flags: DIFlagArtificial
// CHECK-SAME: ) // CHECK-SAME: )

20
src/test/debuginfo/generator-objects.rs
View File

@ -1,37 +1,41 @@
// Require a gdb that can read DW_TAG_variant_part. // Require a gdb that can read DW_TAG_variant_part.
// min-gdb-version: 8.2 // min-gdb-version: 8.2
// LLDB without native Rust support cannot read DW_TAG_variant_part,
// so it prints nothing for generators. But those tests are kept to
// ensure that LLDB won't crash at least (like #57822).
// compile-flags:-g // compile-flags:-g
// === GDB TESTS =================================================================================== // === GDB TESTS ===================================================================================
// gdb-command:run // gdb-command:run
// gdb-command:print b // gdb-command:print b
// gdb-check:$1 = generator_objects::main::generator-0 {__0: 0x[...], <<variant>>: {__state: 0, 0: generator_objects::main::generator-0::Unresumed, 1: generator_objects::main::generator-0::Returned, 2: generator_objects::main::generator-0::Panicked, 3: generator_objects::main::generator-0::Suspend0 {[...]}, 4: generator_objects::main::generator-0::Suspend1 {[...]}}} // gdb-check:$1 = generator_objects::main::generator-0::Unresumed(0x[...])
// gdb-command:continue // gdb-command:continue
// gdb-command:print b // gdb-command:print b
// gdb-check:$2 = generator_objects::main::generator-0 {__0: 0x[...], <<variant>>: {__state: 3, 0: generator_objects::main::generator-0::Unresumed, 1: generator_objects::main::generator-0::Returned, 2: generator_objects::main::generator-0::Panicked, 3: generator_objects::main::generator-0::Suspend0 {c: 6, d: 7}, 4: generator_objects::main::generator-0::Suspend1 {[...]}}} // gdb-check:$2 = generator_objects::main::generator-0::Suspend0{c: 6, d: 7, __0: 0x[...]}
// gdb-command:continue // gdb-command:continue
// gdb-command:print b // gdb-command:print b
// gdb-check:$3 = generator_objects::main::generator-0 {__0: 0x[...], <<variant>>: {__state: 4, 0: generator_objects::main::generator-0::Unresumed, 1: generator_objects::main::generator-0::Returned, 2: generator_objects::main::generator-0::Panicked, 3: generator_objects::main::generator-0::Suspend0 {[...]}, 4: generator_objects::main::generator-0::Suspend1 {c: 7, d: 8}}} // gdb-check:$3 = generator_objects::main::generator-0::Suspend1{c: 7, d: 8, __0: 0x[...]}
// gdb-command:continue // gdb-command:continue
// gdb-command:print b // gdb-command:print b
// gdb-check:$4 = generator_objects::main::generator-0 {__0: 0x[...], <<variant>>: {__state: 1, 0: generator_objects::main::generator-0::Unresumed, 1: generator_objects::main::generator-0::Returned, 2: generator_objects::main::generator-0::Panicked, 3: generator_objects::main::generator-0::Suspend0 {[...]}, 4: generator_objects::main::generator-0::Suspend1 {[...]}}} // gdb-check:$4 = generator_objects::main::generator-0::Returned(0x[...])
// === LLDB TESTS ================================================================================== // === LLDB TESTS ==================================================================================
// lldb-command:run // lldb-command:run
// lldb-command:print b // lldb-command:print b
// lldbg-check:(generator_objects::main::generator-0) $0 = { 0 = 0x[...] } // lldbg-check:(generator_objects::main::generator-0) $0 =
// lldb-command:continue // lldb-command:continue
// lldb-command:print b // lldb-command:print b
// lldbg-check:(generator_objects::main::generator-0) $1 = { 0 = 0x[...] } // lldbg-check:(generator_objects::main::generator-0) $1 =
// lldb-command:continue // lldb-command:continue
// lldb-command:print b // lldb-command:print b
// lldbg-check:(generator_objects::main::generator-0) $2 = { 0 = 0x[...] } // lldbg-check:(generator_objects::main::generator-0) $2 =
// lldb-command:continue // lldb-command:continue
// lldb-command:print b // lldb-command:print b
// lldbg-check:(generator_objects::main::generator-0) $3 = { 0 = 0x[...] } // lldbg-check:(generator_objects::main::generator-0) $3 =
#![feature(omit_gdb_pretty_printer_section, generators, generator_trait)] #![feature(omit_gdb_pretty_printer_section, generators, generator_trait)]
#![omit_gdb_pretty_printer_section] #![omit_gdb_pretty_printer_section]

4
src/test/debuginfo/issue-57822.rs
View File

@ -14,7 +14,7 @@
// gdb-check:$1 = issue_57822::main::closure-1 (issue_57822::main::closure-0 (1)) // gdb-check:$1 = issue_57822::main::closure-1 (issue_57822::main::closure-0 (1))
// gdb-command:print b // gdb-command:print b
// gdb-check:$2 = issue_57822::main::generator-3 {__0: issue_57822::main::generator-2 {__0: 2, <<variant>>: {[...]}}, <<variant>>: {[...]}} // gdb-check:$2 = issue_57822::main::generator-3::Unresumed(issue_57822::main::generator-2::Unresumed(2))
// === LLDB TESTS ================================================================================== // === LLDB TESTS ==================================================================================
@ -24,7 +24,7 @@
// lldbg-check:(issue_57822::main::closure-1) $0 = { 0 = { 0 = 1 } } // lldbg-check:(issue_57822::main::closure-1) $0 = { 0 = { 0 = 1 } }
// lldb-command:print b // lldb-command:print b
// lldbg-check:(issue_57822::main::generator-3) $1 = { 0 = { 0 = 2 } } // lldbg-check:(issue_57822::main::generator-3) $1 =
#![feature(omit_gdb_pretty_printer_section, generators, generator_trait)] #![feature(omit_gdb_pretty_printer_section, generators, generator_trait)]
#![omit_gdb_pretty_printer_section] #![omit_gdb_pretty_printer_section]