Skip to content

Retain type information for nested unused enum #137682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Retain type information for nested unused enum #137682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0647828
Retain unused nested enum type information
ykhatav Apr 28, 2025
c14676e
apply clang-format
ykhatav Apr 28, 2025
5ea1249
Add clang test
ykhatav Apr 28, 2025
cc57ed6
remove unnecessary checks
ykhatav Apr 28, 2025
fcb09dd
fix windows failure
ykhatav Apr 28, 2025
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
10 changes: 10 additions & 0 deletions clang/lib/CodeGen/CGDebugInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,6 +1901,14 @@ CGDebugInfo::CreateRecordStaticField(const VarDecl *Var, llvm::DIType *RecordTy,
return GV;
}

void CGDebugInfo::CollectRecordEnumType(
const EnumDecl *ED, SmallVectorImpl<llvm::Metadata *> &elements) {
QualType Ty = CGM.getContext().getTypeDeclType(ED);
SourceLocation Loc = ED->getLocation();
if (llvm::DIType *enumType = getOrCreateType(Ty, getOrCreateFile(Loc)))
elements.push_back(enumType);
}

void CGDebugInfo::CollectRecordNormalField(
const FieldDecl *field, uint64_t OffsetInBits, llvm::DIFile *tunit,
SmallVectorImpl<llvm::Metadata *> &elements, llvm::DIType *RecordTy,
Expand Down Expand Up @@ -1987,6 +1995,8 @@ void CGDebugInfo::CollectRecordFields(

// Bump field number for next field.
++fieldNo;
} else if (const auto *enumType = dyn_cast<EnumDecl>(I)) {
CollectRecordEnumType(enumType, elements);
} else if (CGM.getCodeGenOpts().EmitCodeView) {
// Debug info for nested types is included in the member list only for
// CodeView.
Expand Down
2 changes: 2 additions & 0 deletions clang/lib/CodeGen/CGDebugInfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,8 @@ class CGDebugInfo {
llvm::DIDerivedType *CreateRecordStaticField(const VarDecl *Var,
llvm::DIType *RecordTy,
const RecordDecl *RD);
void CollectRecordEnumType(const EnumDecl *ED,
SmallVectorImpl<llvm::Metadata *> &elements);
void CollectRecordNormalField(const FieldDecl *Field, uint64_t OffsetInBits,
llvm::DIFile *F,
SmallVectorImpl<llvm::Metadata *> &E,
Expand Down
26 changes: 26 additions & 0 deletions clang/test/CodeGen/unused_nested_enump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// RUN: %clang_cc1 -debug-info-kind=unused-types -emit-llvm -o - %s | FileCheck %s

struct Type {
enum { Unused };
int value = 0;
};
int main() {
Type t;
return t.value;
}

// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type
// CHECK-SAME: scope: ![[STRUCT:[0-9]+]]
// CHECK-SAME: elements: ![[ELEMENTS:[0-9]+]]

// CHECK: ![[STRUCT]] = distinct !DICompositeType(tag: DW_TAG_structure_type
// CHECK-SAME: elements: ![[STRUCT_ELEMENTS:[0-9]+]]

// CHECK: ![[STRUCT_ELEMENTS]] = !{![[ENUM_MEMBER:[0-9]+]], ![[VALUE_MEMBER:[0-9]+]]}

// CHECK: ![[VALUE_MEMBER]] = !DIDerivedType(tag: DW_TAG_member
// CHECK-SAME: name: "value"
// CHECK-SAME: scope: ![[STRUCT]]

// CHECK: ![[ELEMENTS]] = !{![[ENUMERATOR:[0-9]+]]}
// CHECK: ![[ENUMERATOR]] = !DIEnumerator(name: "Unused", value: 0