Reroll "Include unreferenced nested types in member list only for CodeView"
Another attempt at r276271, hopefully without breaking ModuleDebugInfo test. llvm-svn: 276317
This commit is contained in:
parent
29b24dfe44
commit
ab1e786503
|
@ -1090,6 +1090,14 @@ void CGDebugInfo::CollectRecordNormalField(
|
|||
elements.push_back(FieldType);
|
||||
}
|
||||
|
||||
void CGDebugInfo::CollectRecordNestedRecord(
|
||||
const RecordDecl *RD, SmallVectorImpl<llvm::Metadata *> &elements) {
|
||||
QualType Ty = CGM.getContext().getTypeDeclType(RD);
|
||||
SourceLocation Loc = RD->getLocation();
|
||||
llvm::DIType *nestedType = getOrCreateType(Ty, getOrCreateFile(Loc));
|
||||
elements.push_back(nestedType);
|
||||
}
|
||||
|
||||
void CGDebugInfo::CollectRecordFields(
|
||||
const RecordDecl *record, llvm::DIFile *tunit,
|
||||
SmallVectorImpl<llvm::Metadata *> &elements,
|
||||
|
@ -1101,6 +1109,10 @@ void CGDebugInfo::CollectRecordFields(
|
|||
else {
|
||||
const ASTRecordLayout &layout = CGM.getContext().getASTRecordLayout(record);
|
||||
|
||||
// Debug info for nested records is included in the member list only for
|
||||
// CodeView.
|
||||
bool IncludeNestedRecords = CGM.getCodeGenOpts().EmitCodeView;
|
||||
|
||||
// Field number for non-static fields.
|
||||
unsigned fieldNo = 0;
|
||||
|
||||
|
@ -1126,7 +1138,10 @@ void CGDebugInfo::CollectRecordFields(
|
|||
|
||||
// Bump field number for next field.
|
||||
++fieldNo;
|
||||
}
|
||||
} else if (const auto *nestedRec = dyn_cast<CXXRecordDecl>(I))
|
||||
if (IncludeNestedRecords && !nestedRec->isImplicit() &&
|
||||
nestedRec->getDeclContext() == record)
|
||||
CollectRecordNestedRecord(nestedRec, elements);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3620,8 +3635,8 @@ void CGDebugInfo::EmitUsingDirective(const UsingDirectiveDecl &UD) {
|
|||
if (CGM.getCodeGenOpts().getDebugInfo() < codegenoptions::LimitedDebugInfo)
|
||||
return;
|
||||
const NamespaceDecl *NSDecl = UD.getNominatedNamespace();
|
||||
if (!NSDecl->isAnonymousNamespace() ||
|
||||
CGM.getCodeGenOpts().DebugExplicitImport) {
|
||||
if (!NSDecl->isAnonymousNamespace() ||
|
||||
CGM.getCodeGenOpts().DebugExplicitImport) {
|
||||
DBuilder.createImportedModule(
|
||||
getCurrentContextDescriptor(cast<Decl>(UD.getDeclContext())),
|
||||
getOrCreateNameSpace(NSDecl),
|
||||
|
|
|
@ -254,6 +254,8 @@ class CGDebugInfo {
|
|||
llvm::DIFile *F,
|
||||
SmallVectorImpl<llvm::Metadata *> &E,
|
||||
llvm::DIType *RecordTy, const RecordDecl *RD);
|
||||
void CollectRecordNestedRecord(const RecordDecl *RD,
|
||||
SmallVectorImpl<llvm::Metadata *> &E);
|
||||
void CollectRecordFields(const RecordDecl *Decl, llvm::DIFile *F,
|
||||
SmallVectorImpl<llvm::Metadata *> &E,
|
||||
llvm::DICompositeType *RecordTy);
|
||||
|
|
|
@ -19,6 +19,6 @@ protected:
|
|||
|
||||
Test t;
|
||||
|
||||
// CHECK: !DIDerivedType(tag: DW_TAG_pointer_type
|
||||
// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "data"
|
||||
// CHECK: !DIDerivedType(tag: DW_TAG_pointer_type
|
||||
// CHECK-NOT: !DICompositeType(tag: DW_TAG_structure_type, name: "data"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// RUN: %clang_cc1 %s -triple=i686-pc-windows-msvc -debug-info-kind=limited -emit-llvm -o - | FileCheck %s
|
||||
// RUN: %clang_cc1 %s -triple=i686-pc-windows-msvc -debug-info-kind=limited -gcodeview -emit-llvm -o - | FileCheck %s
|
||||
|
||||
// Tests that certain miscellaneous features work in the MS ABI.
|
||||
|
||||
|
@ -12,19 +12,22 @@ Foo f;
|
|||
Foo::Nested n;
|
||||
|
||||
// CHECK: ![[Foo:[^ ]*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo",
|
||||
// CHECK-SAME: elements: ![[elements:[0-9]+]]
|
||||
// CHECK-SAME: identifier: ".?AUFoo@@"
|
||||
|
||||
// CHECK: !DISubprogram(name: "f",
|
||||
// CHECK: ![[elements]] = !{![[vptr:[0-9]+]], ![[Nested:[0-9]+]], ![[f:[0-9]+]], ![[g:[0-9]+]], ![[h:[0-9]+]]}
|
||||
|
||||
// CHECK: ![[Nested]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Nested",
|
||||
// CHECK-SAME: identifier: ".?AUNested@Foo@@"
|
||||
|
||||
// CHECK: ![[f]] = !DISubprogram(name: "f",
|
||||
// CHECK-SAME: containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 0,
|
||||
// CHECK-SAME: flags: DIFlagPrototyped | DIFlagIntroducedVirtual,
|
||||
|
||||
// CHECK: !DISubprogram(name: "g",
|
||||
// CHECK: ![[g]] = !DISubprogram(name: "g",
|
||||
// CHECK-SAME: containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 1,
|
||||
// CHECK-SAME: flags: DIFlagPrototyped | DIFlagIntroducedVirtual,
|
||||
|
||||
// CHECK: !DISubprogram(name: "h",
|
||||
// CHECK: ![[h]] = !DISubprogram(name: "h",
|
||||
// CHECK-SAME: containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 2,
|
||||
// CHECK-SAME: flags: DIFlagPrototyped | DIFlagIntroducedVirtual,
|
||||
|
||||
// CHECK: distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Nested",
|
||||
// CHECK-SAME: identifier: ".?AUNested@Foo@@"
|
||||
|
|
|
@ -121,7 +121,7 @@
|
|||
// CHECK-SAME: flags: DIFlagFwdDecl,
|
||||
// CHECK-SAME: identifier: "_ZTS9Template1IPvE")
|
||||
|
||||
// Explicit instatiation.
|
||||
// Explicit instantiation.
|
||||
// CHECK: !DICompositeType(tag: DW_TAG_class_type, name: "Template1<int>",
|
||||
// CHECK-SAME: templateParams:
|
||||
// CHECK-SAME: identifier: "_ZTS9Template1IiE")
|
||||
|
|
Loading…
Reference in New Issue