Skip to content

Commit fb918ce

Browse files
committed
Auto merge of #145979 - wesleywiser:revert_144407, r=jieyouxu
Revert "fix(debuginfo): disable overflow check for recursive non-enum types" This reverts commit 49eda8e. Discussed during the T-compiler triage meeting with the [decision](https://rust-lang.zulipchat.com/#narrow/channel/238009-t-compiler.2Fmeetings/topic/.5Bweekly.5D.202025-08-28/near/536614591) to revert #144407 instead of attempting a forward fix.
2 parents 085bdc2 + 161e29d commit fb918ce

File tree

2 files changed

+2
-34
lines changed

2 files changed

+2
-34
lines changed

compiler/rustc_codegen_llvm/src/debuginfo/metadata/type_map.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,8 +285,8 @@ pub(super) fn build_type_with_children<'ll, 'tcx>(
285285
// Item(T),
286286
// }
287287
// ```
288-
let is_expanding_recursive = adt_def.is_enum()
289-
&& debug_context(cx).adt_stack.borrow().iter().any(|(parent_def_id, parent_args)| {
288+
let is_expanding_recursive =
289+
debug_context(cx).adt_stack.borrow().iter().any(|(parent_def_id, parent_args)| {
290290
if def_id == *parent_def_id {
291291
args.iter().zip(parent_args.iter()).any(|(arg, parent_arg)| {
292292
if let (Some(arg), Some(parent_arg)) = (arg.as_type(), parent_arg.as_type())

tests/codegen-llvm/debuginfo-cyclic-structure.rs

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)