From: Adrian Prantl Date: Wed, 20 Jan 2016 01:29:34 +0000 (+0000) Subject: Module Debugging: Fine-tune the condition that determines whether a type X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d5d4c39659f11dfbe8e11c857cadf5c449b559b;p=clang Module Debugging: Fine-tune the condition that determines whether a type can be found in a module. There are externally visible anonymous types that can be found: typedef struct { } s; // I can be found via the typedef. There are anonymous internal types that can be found: namespace { struct s {}; } // I can be found by name. rdar://problem/24199640 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@258272 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index fa501fce75..28e2848968 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -1537,7 +1537,7 @@ static bool shouldOmitDefinition(CodeGenOptions::DebugInfoKind DebugKind, const LangOptions &LangOpts) { // Does the type exist in an imported clang module? if (DebugTypeExtRefs && RD->isFromASTFile() && RD->getDefinition() && - RD->isExternallyVisible()) + (RD->isExternallyVisible() || !RD->getName().empty())) return true; if (DebugKind > CodeGenOptions::LimitedDebugInfo) diff --git a/test/Modules/ExtDebugInfo.cpp b/test/Modules/ExtDebugInfo.cpp index 101b0f1e16..b9eae12ded 100644 --- a/test/Modules/ExtDebugInfo.cpp +++ b/test/Modules/ExtDebugInfo.cpp @@ -39,8 +39,10 @@ TypedefUnion tdu; TypedefEnum tde; TypedefStruct tds; +InAnonymousNamespace anon; + void foo() { - GlobalStruct.i = GlobalUnion.i = GlobalEnum; + anon.i = GlobalStruct.i = GlobalUnion.i = GlobalEnum; } // CHECK: ![[NS:.*]] = !DINamespace(name: "DebugCXX", scope: ![[MOD:[0-9]+]], @@ -93,4 +95,10 @@ void foo() { // CHECK: ![[GLOBAL_STRUCT]] = !DICompositeType(tag: DW_TAG_structure_type, // CHECK-SAME: elements: !{{[0-9]+}}) +// CHECK: !DIGlobalVariable(name: "anon", +// CHECK-SAME: type: ![[GLOBAL_ANON:[0-9]+]] +// CHECK: ![[GLOBAL_ANON]] = !DICompositeType(tag: DW_TAG_structure_type, +// CHECK-SAME: name: "InAnonymousNamespace", {{.*}}DIFlagFwdDecl) + + // CHECK: !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: !0, entity: !"_ZTSN8DebugCXX6StructE", line: 24) diff --git a/test/Modules/Inputs/DebugCXX.h b/test/Modules/Inputs/DebugCXX.h index cd2b7a6749..39dda959ce 100644 --- a/test/Modules/Inputs/DebugCXX.h +++ b/test/Modules/Inputs/DebugCXX.h @@ -66,3 +66,9 @@ typedef struct { int i; } TypedefStruct; union { int i; } GlobalUnion; struct { int i; } GlobalStruct; enum { e5 = 5 } GlobalEnum; + +namespace { + namespace { + struct InAnonymousNamespace { int i; }; + } +} diff --git a/test/Modules/ModuleDebugInfo.cpp b/test/Modules/ModuleDebugInfo.cpp index 1f574568b6..a2b735b3b7 100644 --- a/test/Modules/ModuleDebugInfo.cpp +++ b/test/Modules/ModuleDebugInfo.cpp @@ -81,4 +81,8 @@ // CHECK: !DICompositeType(tag: DW_TAG_structure_type, // CHECK-SAME-NOT: name: +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, +// CHECK-SAME: name: "InAnonymousNamespace", +// CHECK-SAME: elements: !{{[0-9]+}}) + // CHECK-NEG-NOT: !DICompositeType(tag: DW_TAG_structure_type, name: "PureForwardDecl"