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

Revert "Include debug info for nested structs and classes" 

This reverts commit 0af5ee9631c7c167dc40498b415876553e314c95.

llvm-svn: 274633
This commit is contained in:
Adrian McCarthy 2016-07-06 15:15:38 +00:00
parent 7649d8388a
commit 743f7f1aff
5 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1095,13 +1095,6 @@ void CGDebugInfo::CollectRecordNormalField(
elements.push_back(FieldType);
}
void CGDebugInfo::CollectRecordNestedRecord(
const RecordDecl *RD, SmallVectorImpl<llvm::Metadata *> &elements) {
QualType Ty = CGM.getContext().getTypeDeclType(RD);
llvm::DIType *nestedType = getOrCreateType(Ty, getOrCreateMainFile());
elements.push_back(nestedType);
}
void CGDebugInfo::CollectRecordFields(
const RecordDecl *record, llvm::DIFile *tunit,
SmallVectorImpl<llvm::Metadata *> &elements,
@ -1138,9 +1131,6 @@ void CGDebugInfo::CollectRecordFields(
// Bump field number for next field.
++fieldNo;
} else if (const auto *nestedRec = dyn_cast<CXXRecordDecl>(I)) {
if (!nestedRec->isImplicit() && nestedRec->getDeclContext() == record)
CollectRecordNestedRecord(nestedRec, elements);
}
}
}
@ -3643,8 +3633,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),

2
clang/lib/CodeGen/CGDebugInfo.h
View File

@ -254,8 +254,6 @@ 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);

2
clang/test/CodeGenCXX/debug-info-dup-fwd-decl.cpp
View File

@ -19,6 +19,6 @@ protected:
Test t;
// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "data"
// CHECK: !DIDerivedType(tag: DW_TAG_pointer_type
// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "data"
// CHECK-NOT: !DICompositeType(tag: DW_TAG_structure_type, name: "data"

12
clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
View File

@ -8,18 +8,18 @@ template <class T, int T::*ptr> class Foo { };
struct Bar {
int i1;
// CHECK: ![[INT:[0-9]+]] = !DIBasicType(name: "int"
// CHECK: ![[UNION:[0-9]+]] = distinct !DICompositeType(tag: DW_TAG_union_type,{{.*}} identifier: "_ZTSN3BarUt_E")
// CHECK: !DIDerivedType(tag: DW_TAG_member, scope:
// CHECK-SAME: line: [[@LINE+4]]
// CHECK-SAME: baseType: ![[UNION:[0-9]+]]
// CHECK-SAME: size: 32, align: 32, offset: 32
// CHECK: ![[UNION]] = distinct !DICompositeType(tag: DW_TAG_union_type,{{.*}} identifier: "_ZTSN3BarUt_E")
union {
// CHECK: !DIDerivedType(tag: DW_TAG_member, name: "i2",
// CHECK-SAME: line: [[@LINE+9]]
// CHECK-SAME: line: [[@LINE+5]]
// CHECK-SAME: baseType: ![[INT]]
// CHECK-SAME: size: 32, align: 32
// CHECK-NOT: offset:
// CHECK-SAME: ){{$}}
// CHECK: !DIDerivedType(tag: DW_TAG_member, scope:
// CHECK-SAME: line: [[@LINE-8]]
// CHECK-SAME: baseType: ![[UNION]]
// CHECK-SAME: size: 32, align: 32, offset: 32
int i2;
};
};

6
clang/test/CodeGenCXX/debug-info-ms-abi.cpp
View File

@ -14,9 +14,6 @@ Foo::Nested n;
// CHECK: ![[Foo:[^ ]*]] = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Foo",
// CHECK-SAME: identifier: ".?AUFoo@@"
// CHECK: distinct !DICompositeType(tag: DW_TAG_structure_type, name: "Nested",
// CHECK-SAME: identifier: ".?AUNested@Foo@@"
// CHECK: !DISubprogram(name: "f",
// CHECK-SAME: containingType: ![[Foo]], virtuality: DW_VIRTUALITY_virtual, virtualIndex: 0,
// CHECK-SAME: flags: DIFlagPrototyped | DIFlagIntroducedVirtual,
@ -28,3 +25,6 @@ Foo::Nested n;
// CHECK: !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@@"