maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Module debugging: Use the definition to determine module-defined types. 

Follow-up to r267464. Thanks to Richard Smith for pointing this out!

llvm-svn: 267611
This commit is contained in:
Adrian Prantl 2016-04-26 21:58:18 +00:00
parent a3060c1159
commit 88d7917970
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clang/lib/CodeGen/CGDebugInfo.cpp
View File

@ -1516,9 +1516,7 @@ static bool hasExplicitMemberDefinition(CXXRecordDecl::method_iterator I,
/// 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 RecordDecl *RD) {
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)

9
clang/test/Modules/ExtDebugInfo.cpp
View File

@ -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