diff --git a/clang/include/clang/AST/DeclCXX.h b/clang/include/clang/AST/DeclCXX.h --- a/clang/include/clang/AST/DeclCXX.h +++ b/clang/include/clang/AST/DeclCXX.h @@ -508,6 +508,14 @@ return const_cast(this)->getPreviousDecl(); } + CXXRecordDecl *getParentDecl() { + return dyn_cast(getDeclContext()); + } + + const CXXRecordDecl *getParentDecl() const { + return dyn_cast(getDeclContext()); + } + CXXRecordDecl *getMostRecentDecl() { return cast( static_cast(this)->getMostRecentDecl()); diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -3633,6 +3633,8 @@ // Record exports it symbols to the containing structure. if (CXXRD->isAnonymousStructOrUnion()) Flags |= llvm::DINode::FlagExportSymbols; + + Flags |= getAccessFlag(CXXRD->getAccess(), CXXRD->getParentDecl()); } llvm::DINodeArray Annotations = CollectBTFDeclTagAnnotations(D); diff --git a/clang/test/CodeGenCXX/debug-info-access.cpp b/clang/test/CodeGenCXX/debug-info-access.cpp --- a/clang/test/CodeGenCXX/debug-info-access.cpp +++ b/clang/test/CodeGenCXX/debug-info-access.cpp @@ -25,6 +25,38 @@ void priv_default(); }; +class C { +public: + // CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "D",{{.*}} flags: DIFlagPublic | DIFlagTypePassByValue, + struct D { + }; +protected: + //CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "E",{{.*}} flags: DIFlagProtected | DIFlagTypePassByValue, + union E { + }; +public: + D d; + E e; +}; + +struct F { +private: + // CHECK: !DICompositeType(tag: DW_TAG_union_type, name: "G",{{.*}} flags: DIFlagPrivate | DIFlagTypePassByValue, + union G { + }; +public: + G g; +}; + +union H { +private: + // CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "I",{{.*}} flags: DIFlagPrivate | DIFlagTypePassByValue, + class I { + }; +public: + I i; +}; + union U { // CHECK-DAG: !DISubprogram(name: "union_pub_default",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagPrototyped, void union_pub_default(); @@ -33,7 +65,6 @@ int union_priv; }; - // CHECK: !DISubprogram(name: "free", // CHECK-SAME: flags: DIFlagPrototyped, // CHECK-SAME: spFlags: DISPFlagDefinition @@ -42,3 +73,6 @@ U u; A a; B b; +C c; +F f; +H h; diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp --- a/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfUnit.cpp @@ -1007,6 +1007,17 @@ if (CTy->isForwardDecl()) addFlag(Buffer, dwarf::DW_AT_declaration); + // Add accessibility info if available. + if (CTy->isProtected()) + addUInt(Buffer, dwarf::DW_AT_accessibility, dwarf::DW_FORM_data1, + dwarf::DW_ACCESS_protected); + else if (CTy->isPrivate()) + addUInt(Buffer, dwarf::DW_AT_accessibility, dwarf::DW_FORM_data1, + dwarf::DW_ACCESS_private); + else if (CTy->isPublic()) + addUInt(Buffer, dwarf::DW_AT_accessibility, dwarf::DW_FORM_data1, + dwarf::DW_ACCESS_public); + // Add source line info if available. if (!CTy->isForwardDecl()) addSourceLine(Buffer, CTy); diff --git a/llvm/test/DebugInfo/X86/debug-info-access.ll b/llvm/test/DebugInfo/X86/debug-info-access.ll --- a/llvm/test/DebugInfo/X86/debug-info-access.ll +++ b/llvm/test/DebugInfo/X86/debug-info-access.ll @@ -1,9 +1,8 @@ ; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj ; RUN: llvm-dwarfdump -debug-info %t | FileCheck %s -; + ; Test the DW_AT_accessibility DWARF attribute. -; -; + ; Regenerate me: ; clang++ -g tools/clang/test/CodeGenCXX/debug-info-access.cpp -S -emit-llvm -o - ; @@ -22,6 +21,34 @@ ; void priv_default(); ; }; ; +; class C { +; public: +; struct D { +; }; +; protected: +; union E { +; }; +; public: +; D d; +; E e; +; }; +; +; struct F { +; private: +; union G { +; }; +; public: +; G g; +; }; +; +; union H { +; private: +; class I { +; }; +; public: +; I i; +; }; +; ; union U { ; void union_pub_default(); ; private: @@ -33,119 +60,164 @@ ; A a; ; B b; ; U u; -; +; C c; +; F f; +; H h; + ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_name {{.*}}"free") ; CHECK-NOT: DW_AT_accessibility +; CHECK: DW_TAG_member +; CHECK: DW_AT_name {{.*}}"union_priv") +; CHECK-NOT: DW_TAG +; CHECK: DW_AT_accessibility {{.*}}(DW_ACCESS_private) + +; CHECK: DW_TAG_subprogram +; CHECK: DW_AT_name {{.*}}"union_pub_default") +; CHECK-NOT: DW_AT_accessibility + ; CHECK: DW_TAG_member ; CHECK: DW_AT_name {{.*}}"pub_default_static") ; CHECK-NOT: DW_AT_accessibility ; CHECK-NOT: DW_TAG -; + ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_name {{.*}}"pub_default") ; CHECK-NOT: DW_AT_accessibility ; CHECK: DW_TAG -; + ; CHECK: DW_TAG_inheritance ; CHECK-NOT: DW_TAG ; CHECK: DW_AT_accessibility {{.*}}(DW_ACCESS_public) -; + ; CHECK: DW_TAG_member ; CHECK: DW_AT_name {{.*}}"public_static") ; CHECK-NOT: DW_TAG ; CHECK: DW_AT_accessibility {{.*}}(DW_ACCESS_public) -; + ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_name {{.*}}"pub") ; CHECK-NOT: DW_TAG ; CHECK: DW_AT_accessibility {{.*}}(DW_ACCESS_public) -; + ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_name {{.*}}"prot") ; CHECK-NOT: DW_TAG ; CHECK: DW_AT_accessibility {{.*}}(DW_ACCESS_protected) -; + ; CHECK: DW_TAG_subprogram ; CHECK: DW_AT_name {{.*}}"priv_default") ; CHECK-NOT: DW_AT_accessibility ; CHECK: DW_TAG -; -; CHECK: DW_TAG_member -; CHECK: DW_AT_name {{.*}}"union_priv") -; CHECK-NOT: DW_TAG -; CHECK: DW_AT_accessibility {{.*}}(DW_ACCESS_private) -; -; CHECK: DW_TAG_subprogram -; CHECK: DW_AT_name {{.*}}"union_pub_default") -; CHECK-NOT: DW_AT_accessibility -; -; ModuleID = '/llvm/tools/clang/test/CodeGenCXX/debug-info-access.cpp' -source_filename = "test/DebugInfo/X86/debug-info-access.ll" -target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128" -target triple = "x86_64-apple-macosx10.10.0" +; CHECK: DW_TAG_structure_type +; CHECK: DW_AT_name ("D") +; CHECK: DW_AT_accessibility (DW_ACCESS_public) + +; CHECK: DW_TAG_union_type +; CHECK: DW_AT_name ("E") +; CHECK: DW_AT_byte_size (0x01) +; CHECK: DW_AT_accessibility (DW_ACCESS_protected) + +; CHECK: DW_TAG_union_type +; CHECK: DW_AT_name ("G") +; CHECK: DW_AT_accessibility (DW_ACCESS_private) + +; CHECK: DW_TAG_class_type +; CHECK: DW_AT_name ("I") +; CHECK: DW_AT_accessibility (DW_ACCESS_private) + +%union.U = type { i32 } %struct.A = type { i8 } %class.B = type { i8 } -%union.U = type { i32 } +%class.C = type { %"struct.C::D", %"union.C::E" } +%"struct.C::D" = type { i8 } +%"union.C::E" = type { i8 } +%struct.F = type { %"union.F::G" } +%"union.F::G" = type { i8 } +%union.H = type { %"class.H::I" } +%"class.H::I" = type { i8 } -@a = global %struct.A zeroinitializer, align 1, !dbg !0 -@b = global %class.B zeroinitializer, align 1, !dbg !11 -@u = global %union.U zeroinitializer, align 4, !dbg !23 +@u = global %union.U zeroinitializer, align 4, !dbg !0 +@a = global %struct.A zeroinitializer, align 1, !dbg !5 +@b = global %class.B zeroinitializer, align 1, !dbg !16 +@c = global %class.C zeroinitializer, align 1, !dbg !28 +@f = global %struct.F zeroinitializer, align 1, !dbg !37 +@h = global %union.H zeroinitializer, align 1, !dbg !43 -; Function Attrs: nounwind ssp uwtable -define void @_Z4freev() #0 !dbg !39 { - ret void, !dbg !42 +; Function Attrs: mustprogress noinline nounwind optnone +define dso_local void @_Z4freev() #0 !dbg !59 { +entry: + ret void, !dbg !62 } -attributes #0 = { nounwind ssp uwtable } +attributes #0 = { mustprogress noinline nounwind optnone "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-features"="+cx8,+mmx,+sse,+sse2,+x87" } -!llvm.dbg.cu = !{!32} -!llvm.module.flags = !{!36, !37} -!llvm.ident = !{!38} +!llvm.dbg.cu = !{!2} +!llvm.module.flags = !{!56, !57} +!llvm.ident = !{!58} !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression()) -!1 = !DIGlobalVariable(name: "a", scope: null, file: !2, line: 37, type: !3, isLocal: false, isDefinition: true) -!2 = !DIFile(filename: "/llvm/tools/clang/test/CodeGenCXX/debug-info-access.cpp", directory: "") -!3 = !DICompositeType(tag: DW_TAG_structure_type, name: "A", file: !2, line: 3, size: 8, align: 8, elements: !4, identifier: "_ZTS1A") -!4 = !{!5, !7} -!5 = !DIDerivedType(tag: DW_TAG_member, name: "pub_default_static", scope: !3, file: !2, line: 7, baseType: !6, flags: DIFlagStaticMember) -!6 = !DIBasicType(name: "int", size: 32, align: 32, encoding: DW_ATE_signed) -!7 = !DISubprogram(name: "pub_default", linkageName: "_ZN1A11pub_defaultEv", scope: !3, file: !2, line: 5, type: !8, isLocal: false, isDefinition: false, scopeLine: 5, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false) -!8 = !DISubroutineType(types: !9) -!9 = !{null, !10} -!10 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !3, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer) -!11 = !DIGlobalVariableExpression(var: !12, expr: !DIExpression()) -!12 = !DIGlobalVariable(name: "b", scope: null, file: !2, line: 38, type: !13, isLocal: false, isDefinition: true) -!13 = !DICompositeType(tag: DW_TAG_class_type, name: "B", file: !2, line: 11, size: 8, align: 8, elements: !14, identifier: "_ZTS1B") -!14 = !{!15, !16, !17, !21, !22} -!15 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !13, baseType: !3, flags: DIFlagPublic) -!16 = !DIDerivedType(tag: DW_TAG_member, name: "public_static", scope: !13, file: !2, line: 16, baseType: !6, flags: DIFlagPublic | DIFlagStaticMember) -!17 = !DISubprogram(name: "pub", linkageName: "_ZN1B3pubEv", scope: !13, file: !2, line: 14, type: !18, isLocal: false, isDefinition: false, scopeLine: 14, virtualIndex: 6, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false) -!18 = !DISubroutineType(types: !19) -!19 = !{null, !20} -!20 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !13, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer) -!21 = !DISubprogram(name: "prot", linkageName: "_ZN1B4protEv", scope: !13, file: !2, line: 19, type: !18, isLocal: false, isDefinition: false, scopeLine: 19, virtualIndex: 6, flags: DIFlagProtected | DIFlagPrototyped, isOptimized: false) -!22 = !DISubprogram(name: "priv_default", linkageName: "_ZN1B12priv_defaultEv", scope: !13, file: !2, line: 22, type: !18, isLocal: false, isDefinition: false, scopeLine: 22, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false) -!23 = !DIGlobalVariableExpression(var: !24, expr: !DIExpression()) -!24 = !DIGlobalVariable(name: "u", scope: null, file: !2, line: 39, type: !25, isLocal: false, isDefinition: true) -!25 = !DICompositeType(tag: DW_TAG_union_type, name: "U", file: !2, line: 25, size: 32, align: 32, elements: !26, identifier: "_ZTS1U") -!26 = !{!27, !28} -!27 = !DIDerivedType(tag: DW_TAG_member, name: "union_priv", scope: !25, file: !2, line: 30, baseType: !6, size: 32, align: 32, flags: DIFlagPrivate) -!28 = !DISubprogram(name: "union_pub_default", linkageName: "_ZN1U17union_pub_defaultEv", scope: !25, file: !2, line: 27, type: !29, isLocal: false, isDefinition: false, scopeLine: 27, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false) -!29 = !DISubroutineType(types: !30) -!30 = !{null, !31} -!31 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !25, size: 64, align: 64, flags: DIFlagArtificial | DIFlagObjectPointer) -!32 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !2, producer: "clang version 3.6.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !33, retainedTypes: !34, globals: !35, imports: !33) -!33 = !{} -!34 = !{!3, !13, !25} -!35 = !{!0, !11, !23} -!36 = !{i32 2, !"Dwarf Version", i32 2} -!37 = !{i32 2, !"Debug Info Version", i32 3} -!38 = !{!"clang version 3.6.0 "} -!39 = distinct !DISubprogram(name: "free", linkageName: "_Z4freev", scope: !2, file: !2, line: 35, type: !40, isLocal: false, isDefinition: true, scopeLine: 35, virtualIndex: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !32, retainedNodes: !33) -!40 = !DISubroutineType(types: !41) -!41 = !{null} -!42 = !DILocation(line: 35, column: 14, scope: !39) - +!1 = distinct !DIGlobalVariable(name: "u", scope: !2, file: !7, line: 73, type: !49, isLocal: false, isDefinition: true) +!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 14.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, globals: !4, splitDebugInlining: false, nameTableKind: None) +!3 = !DIFile(filename: "clang/test/CodeGenCXX/", directory: "") +!4 = !{!0, !5, !16, !28, !37, !43} +!5 = !DIGlobalVariableExpression(var: !6, expr: !DIExpression()) +!6 = distinct !DIGlobalVariable(name: "a", scope: !2, file: !7, line: 74, type: !8, isLocal: false, isDefinition: true) +!7 = !DIFile(filename: "clang/test/CodeGenCXX/debug-info-access.cpp", directory: "") +!8 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "A", file: !7, line: 3, size: 8, flags: DIFlagTypePassByValue, elements: !9, identifier: "_ZTS1A") +!9 = !{!10, !12} +!10 = !DIDerivedType(tag: DW_TAG_member, name: "pub_default_static", scope: !8, file: !7, line: 9, baseType: !11, flags: DIFlagStaticMember) +!11 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!12 = !DISubprogram(name: "pub_default", linkageName: "_ZN1A11pub_defaultEv", scope: !8, file: !7, line: 7, type: !13, scopeLine: 7, flags: DIFlagPrototyped, spFlags: 0) +!13 = !DISubroutineType(types: !14) +!14 = !{null, !15} +!15 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !8, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!16 = !DIGlobalVariableExpression(var: !17, expr: !DIExpression()) +!17 = distinct !DIGlobalVariable(name: "b", scope: !2, file: !7, line: 75, type: !18, isLocal: false, isDefinition: true) +!18 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "B", file: !7, line: 14, size: 8, flags: DIFlagTypePassByValue, elements: !19, identifier: "_ZTS1B") +!19 = !{!20, !21, !22, !26, !27} +!20 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !18, baseType: !8, flags: DIFlagPublic, extraData: i32 0) +!21 = !DIDerivedType(tag: DW_TAG_member, name: "public_static", scope: !18, file: !7, line: 19, baseType: !11, flags: DIFlagPublic | DIFlagStaticMember) +!22 = !DISubprogram(name: "pub", linkageName: "_ZN1B3pubEv", scope: !18, file: !7, line: 17, type: !23, scopeLine: 17, flags: DIFlagPublic | DIFlagPrototyped, spFlags: 0) +!23 = !DISubroutineType(types: !24) +!24 = !{null, !25} +!25 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !18, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!26 = !DISubprogram(name: "prot", linkageName: "_ZN1B4protEv", scope: !18, file: !7, line: 22, type: !23, scopeLine: 22, flags: DIFlagProtected | DIFlagPrototyped, spFlags: 0) +!27 = !DISubprogram(name: "priv_default", linkageName: "_ZN1B12priv_defaultEv", scope: !18, file: !7, line: 25, type: !23, scopeLine: 25, flags: DIFlagPrototyped, spFlags: 0) +!28 = !DIGlobalVariableExpression(var: !29, expr: !DIExpression()) +!29 = distinct !DIGlobalVariable(name: "c", scope: !2, file: !7, line: 76, type: !30, isLocal: false, isDefinition: true) +!30 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "C", file: !7, line: 28, size: 16, flags: DIFlagTypePassByValue, elements: !31, identifier: "_ZTS1C") +!31 = !{!32, !35} +!32 = !DIDerivedType(tag: DW_TAG_member, name: "d", scope: !30, file: !7, line: 38, baseType: !33, size: 8, flags: DIFlagPublic) +!33 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "D", scope: !30, file: !7, line: 31, size: 8, flags: DIFlagPublic | DIFlagTypePassByValue, elements: !34, identifier: "_ZTSN1C1DE") +!34 = !{} +!35 = !DIDerivedType(tag: DW_TAG_member, name: "e", scope: !30, file: !7, line: 39, baseType: !36, size: 8, offset: 8, flags: DIFlagPublic) +!36 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "E", scope: !30, file: !7, line: 35, size: 8, flags: DIFlagProtected | DIFlagTypePassByValue, elements: !34, identifier: "_ZTSN1C1EE") +!37 = !DIGlobalVariableExpression(var: !38, expr: !DIExpression()) +!38 = distinct !DIGlobalVariable(name: "f", scope: !2, file: !7, line: 77, type: !39, isLocal: false, isDefinition: true) +!39 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "F", file: !7, line: 42, size: 8, flags: DIFlagTypePassByValue, elements: !40, identifier: "_ZTS1F") +!40 = !{!41} +!41 = !DIDerivedType(tag: DW_TAG_member, name: "g", scope: !39, file: !7, line: 48, baseType: !42, size: 8) +!42 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "G", scope: !39, file: !7, line: 45, size: 8, flags: DIFlagPrivate | DIFlagTypePassByValue, elements: !34, identifier: "_ZTSN1F1GE") +!43 = !DIGlobalVariableExpression(var: !44, expr: !DIExpression()) +!44 = distinct !DIGlobalVariable(name: "h", scope: !2, file: !7, line: 78, type: !45, isLocal: false, isDefinition: true) +!45 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "H", file: !7, line: 51, size: 8, flags: DIFlagTypePassByValue, elements: !46, identifier: "_ZTS1H") +!46 = !{!47} +!47 = !DIDerivedType(tag: DW_TAG_member, name: "i", scope: !45, file: !7, line: 57, baseType: !48, size: 8) +!48 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "I", scope: !45, file: !7, line: 54, size: 8, flags: DIFlagPrivate | DIFlagTypePassByValue, elements: !34, identifier: "_ZTSN1H1IE") +!49 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "U", file: !7, line: 60, size: 32, flags: DIFlagTypePassByValue, elements: !50, identifier: "_ZTS1U") +!50 = !{!51, !52} +!51 = !DIDerivedType(tag: DW_TAG_member, name: "union_priv", scope: !49, file: !7, line: 65, baseType: !11, size: 32, flags: DIFlagPrivate) +!52 = !DISubprogram(name: "union_pub_default", linkageName: "_ZN1U17union_pub_defaultEv", scope: !49, file: !7, line: 62, type: !53, scopeLine: 62, flags: DIFlagPrototyped, spFlags: 0) +!53 = !DISubroutineType(types: !54) +!54 = !{null, !55} +!55 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !49, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer) +!56 = !{i32 2, !"Debug Info Version", i32 3} +!57 = !{i32 1, !"wchar_size", i32 4} +!58 = !{!"clang version 14.0.0"} +!59 = distinct !DISubprogram(name: "free", linkageName: "_Z4freev", scope: !7, file: !7, line: 71, type: !60, scopeLine: 71, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !2, retainedNodes: !34) +!60 = !DISubroutineType(types: !61) +!61 = !{null} +!62 = !DILocation(line: 71, column: 14, scope: !59)