Author: adrian Date: Tue Apr 26 16:58:18 2016 New Revision: 267611 URL: http://llvm.org/viewvc/llvm-project?rev=267611&view=rev Log: Module debugging: Use the definition to determine module-defined types.
Follow-up to r267464. Thanks to Richard Smith for pointing this out! Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp cfe/trunk/test/Modules/ExtDebugInfo.cpp Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=267611&r1=267610&r2=267611&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original) +++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Tue Apr 26 16:58:18 2016 @@ -1516,9 +1516,7 @@ static bool hasExplicitMemberDefinition( /// Does a type definition exist in an imported clang module? static bool isDefinedInClangModule(const RecordDecl *RD) { - if (!RD->isFromASTFile()) - return false; - if (!RD->getDefinition()) + if (!RD || !RD->isFromASTFile()) return false; if (!RD->isExternallyVisible() && RD->getName().empty()) return false; @@ -1535,7 +1533,7 @@ static bool isDefinedInClangModule(const static bool shouldOmitDefinition(codegenoptions::DebugInfoKind DebugKind, bool DebugTypeExtRefs, const RecordDecl *RD, const LangOptions &LangOpts) { - if (DebugTypeExtRefs && isDefinedInClangModule(RD)) + if (DebugTypeExtRefs && isDefinedInClangModule(RD->getDefinition())) return true; if (DebugKind > codegenoptions::LimitedDebugInfo) Modified: cfe/trunk/test/Modules/ExtDebugInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/ExtDebugInfo.cpp?rev=267611&r1=267610&r2=267611&view=diff ============================================================================== --- cfe/trunk/test/Modules/ExtDebugInfo.cpp (original) +++ cfe/trunk/test/Modules/ExtDebugInfo.cpp Tue Apr 26 16:58:18 2016 @@ -51,6 +51,10 @@ TypedefFwdDeclTemplate tdfdt; InAnonymousNamespace anon; +// Forward-declared in the module. +struct PureFwdDecl { int i; }; +PureFwdDecl definedLocally; + void foo() { anon.i = GlobalStruct.i = GlobalUnion.i = GlobalEnum; } @@ -133,6 +137,11 @@ void foo() { // CHECK-SAME: templateParams: // CHECK-SAME: identifier: "_ZTS15FwdDeclTemplateIiE") +// This type is defined locally and forward-declare in the module. +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "PureFwdDecl", +// CHECK-SAME: elements: +// CHECK-SAME: identifier: "_ZTS11PureFwdDecl") + // CHECK: !DIGlobalVariable(name: "anon_enum", {{.*}}, type: ![[ANON_ENUM:[0-9]+]] // CHECK: !DICompositeType(tag: DW_TAG_enumeration_type, scope: ![[NS]], // CHECK-SAME: line: 16 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits