Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -285,8 +285,8 @@ pub(super) fn build_type_with_children<'ll, 'tcx>(
// Item(T),
// }
// ```
let is_expanding_recursive =
debug_context(cx).adt_stack.borrow().iter().any(|(parent_def_id, parent_args)| {
let is_expanding_recursive = adt_def.is_enum()
&& debug_context(cx).adt_stack.borrow().iter().any(|(parent_def_id, parent_args)| {
if def_id == *parent_def_id {
args.iter().zip(parent_args.iter()).any(|(arg, parent_arg)| {
if let (Some(arg), Some(parent_arg)) = (arg.as_type(), parent_arg.as_type())
Expand Down
32 changes: 32 additions & 0 deletions tests/codegen-llvm/debuginfo-cyclic-structure.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//@ compile-flags:-g -Copt-level=0 -C panic=abort

// Check that debug information exists for structures containing loops (cyclic references).
// Previously it may incorrectly prune member information during recursive type inference check.

// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "Arc<debuginfo_cyclic_structure::Inner<alloc::sync::Arc<debuginfo_cyclic_structure::Handle{{.*}}elements: ![[FIELDS:[0-9]+]]
// CHECK: ![[FIELDS]] = !{!{{.*}}}
// CHECK-NOT: ![[FIELDS]] = !{}

#![crate_type = "lib"]

use std::mem::MaybeUninit;
use std::sync::Arc;

struct Inner<T> {
buffer: Box<MaybeUninit<T>>,
}
struct Shared {
shared: Arc<Inner<Arc<Handle>>>,
}
struct Handle {
shared: Shared,
}
struct Core {
inner: Arc<Inner<Arc<Handle>>>,
}

#[no_mangle]
extern "C" fn test() {
let с = Core { inner: Arc::new(Inner { buffer: Box::new(MaybeUninit::uninit()) }) };
std::hint::black_box(с);
}
Loading