Author: akhuang Date: Thu May 30 15:04:11 2019 New Revision: 362166 URL: http://llvm.org/viewvc/llvm-project?rev=362166&view=rev Log: Add enums as global variables in the IR metadata.
Summary: Keeps track of the enums that were used by saving them as DIGlobalVariables, since CodeView emits debug info for global constants. Reviewers: rnk Subscribers: aprantl, cfe-commits, llvm-commits Tags: #clang, #llvm Differential Revision: https://reviews.llvm.org/D62635 Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=362166&r1=362165&r2=362166&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original) +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Thu May 30 15:04:11 2019 @@ -4240,7 +4240,7 @@ void CGDebugInfo::EmitDeclareOfBlockLite llvm::DIDerivedType * CGDebugInfo::getOrCreateStaticDataMemberDeclarationOrNull(const VarDecl *D) { - if (!D->isStaticDataMember()) + if (!D || !D->isStaticDataMember()) return nullptr; auto MI = StaticDataMemberCache.find(D->getCanonicalDecl()); @@ -4353,12 +4353,14 @@ void CGDebugInfo::EmitGlobalVariable(con StringRef Name = VD->getName(); llvm::DIType *Ty = getOrCreateType(VD->getType(), Unit); - // Do not use global variables for enums. + // Do not use global variables for enums, unless for CodeView. if (const auto *ECD = dyn_cast<EnumConstantDecl>(VD)) { const auto *ED = cast<EnumDecl>(ECD->getDeclContext()); assert(isa<EnumType>(ED->getTypeForDecl()) && "Enum without EnumType?"); (void)ED; - return; + + if (!CGM.getCodeGenOpts().EmitCodeView) + return; } llvm::DIScope *DContext = nullptr; @@ -4369,8 +4371,8 @@ void CGDebugInfo::EmitGlobalVariable(con // Emit definition for static members in CodeView. VD = cast<ValueDecl>(VD->getCanonicalDecl()); - auto *VarD = cast<VarDecl>(VD); - if (VarD->isStaticDataMember()) { + auto *VarD = dyn_cast<VarDecl>(VD); + if (VarD && VarD->isStaticDataMember()) { auto *RD = cast<RecordDecl>(VarD->getDeclContext()); getDeclContextDescriptor(VarD); // Ensure that the type is retained even though it's otherwise unreferenced. Modified: cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp?rev=362166&r1=362165&r2=362166&view=diff ============================================================================== --- cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp (original) +++ cfe/trunk/test/CodeGenCXX/debug-info-enum.cpp Thu May 30 15:04:11 2019 @@ -1,9 +1,15 @@ // RUN: %clang_cc1 -triple %itanium_abi_triple -emit-llvm -debug-info-kind=limited %s -o - | FileCheck %s +// RUN: %clang_cc1 -triple x86_64-windows-msvc -emit-llvm -gcodeview -debug-info-kind=limited %s -o - | FileCheck --check-prefix MSVC %s // CHECK: !DICompileUnit( // CHECK-SAME: enums: [[ENUMS:![0-9]*]] // CHECK: [[ENUMS]] = !{[[E1:![0-9]*]], [[E2:![0-9]*]], [[E3:![0-9]*]]} +// In MSVC check that used enum values are emitted as globals. +// MSVC: !DICompileUnit( +// MSVC-SAME: globals: [[GLOBALS:![0-9]*]] +// MSVC: [[GLOBALS]] = !{[[G1:![0-9]*]], [[G2:![0-9]*]]} + namespace test1 { // CHECK: [[E1]] = !DICompositeType(tag: DW_TAG_enumeration_type, name: "e" // CHECK-SAME: scope: [[TEST1:![0-9]*]] @@ -12,6 +18,10 @@ namespace test1 { // CHECK: [[TEST1]] = !DINamespace(name: "test1" // CHECK: [[TEST1_ENUMS]] = !{[[TEST1_E:![0-9]*]]} // CHECK: [[TEST1_E]] = !DIEnumerator(name: "E", value: 0, isUnsigned: true) + +// MSVC: [[G1]] = !DIGlobalVariableExpression(var: [[VAR1:![0-9]*]], +// MSVC-SAME: expr: !DIExpression(DW_OP_constu, 0 +// MSVC: [[VAR1]] = distinct !DIGlobalVariable(name: "E" enum e { E }; void foo() { int v = E; @@ -25,6 +35,10 @@ namespace test2 { // CHECK-SAME: elements: [[TEST1_ENUMS]] // CHECK-SAME: identifier: "_ZTSN5test21eE" // CHECK: [[TEST2]] = !DINamespace(name: "test2" + +// MSVC: [[G2]] = !DIGlobalVariableExpression(var: [[VAR2:![0-9]*]], +// MSVC-SAME: expr: !DIExpression(DW_OP_constu, 0 +// MSVC: [[VAR2]] = distinct !DIGlobalVariable(name: "E" enum e { E }; bool func(int i) { return i == E; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
