diff options
author | David Blaikie <dblaikie@gmail.com> | 2012-11-02 20:49:01 +0000 |
---|---|---|
committer | David Blaikie <dblaikie@gmail.com> | 2012-11-02 20:49:01 +0000 |
commit | 9417b05ef982bd3dbcae2fa24083b5be00d6c4f1 (patch) | |
tree | ecca785a294b0ffa910b4aeb96f7a7688a12a09e | |
parent | 715852c9ce1a0b6afe1928d8da4d51e138aed851 (diff) |
Fix debug tag type of forward declarations of struct/class in C++.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167308 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/CodeGen/CGDebugInfo.cpp | 16 | ||||
-rw-r--r-- | test/CodeGen/debug-info.c | 5 | ||||
-rw-r--r-- | test/CodeGenCXX/debug-info-class.cpp | 18 |
3 files changed, 23 insertions, 16 deletions
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 57c4e9e417..e873806b91 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -518,21 +518,17 @@ llvm::DIType CGDebugInfo::createRecordFwdDecl(const RecordDecl *RD, llvm::DIDescriptor Ctx) { llvm::DIFile DefUnit = getOrCreateFile(RD->getLocation()); unsigned Line = getLineNumber(RD->getLocation()); - StringRef RDName = RD->getName(); + StringRef RDName = getClassName(RD); - // Get the tag. - const CXXRecordDecl *CXXDecl = dyn_cast<CXXRecordDecl>(RD); unsigned Tag = 0; - if (CXXDecl) { - RDName = getClassName(RD); - Tag = llvm::dwarf::DW_TAG_class_type; - } - else if (RD->isStruct() || RD->isInterface()) + if (RD->isStruct() || RD->isInterface()) Tag = llvm::dwarf::DW_TAG_structure_type; else if (RD->isUnion()) Tag = llvm::dwarf::DW_TAG_union_type; - else - llvm_unreachable("Unknown RecordDecl type!"); + else { + assert(RD->isClass()); + Tag = llvm::dwarf::DW_TAG_class_type; + } // Create the type. return DBuilder.createForwardDecl(Tag, RDName, Ctx, DefUnit, Line); diff --git a/test/CodeGen/debug-info.c b/test/CodeGen/debug-info.c index af2ce969bc..12ba6058d3 100644 --- a/test/CodeGen/debug-info.c +++ b/test/CodeGen/debug-info.c @@ -1,5 +1,4 @@ -// RUN: %clang_cc1 -triple x86_64-unk-unk -o %t -emit-llvm -g %s -// RUN: FileCheck --input-file=%t %s +// RUN: %clang_cc1 -triple x86_64-unk-unk -o - -emit-llvm -g %s | FileCheck %s // PR3023 void convert(void) { @@ -8,7 +7,7 @@ void convert(void) { // PR2784 -struct OPAQUE; +struct OPAQUE; // CHECK: DW_TAG_structure_type typedef struct OPAQUE *PTR; PTR p; diff --git a/test/CodeGenCXX/debug-info-class.cpp b/test/CodeGenCXX/debug-info-class.cpp index 151c5f9053..dca8535fb2 100644 --- a/test/CodeGenCXX/debug-info-class.cpp +++ b/test/CodeGenCXX/debug-info-class.cpp @@ -1,12 +1,24 @@ -// RUN: %clang -emit-llvm -g -S %s -o - | grep HdrSize -struct A { +// RUN: %clang -emit-llvm -g -S %s -o - | FileCheck %s +struct foo; +void func(foo *f) { // CHECK: DW_TAG_structure_type +} +class bar; +void func(bar *f) { // CHECK: DW_TAG_class_type +} +union baz; +void func(baz *f) { // CHECK: DW_TAG_union_type +} +struct A { // FIXME: we're still emitting this as DW_TAG_class_type int one; - static const int HdrSize = 52; + static const int HdrSize = 52; // CHECK: HdrSize int two; A() { int x = 1; } }; +class B { // CHECK: DW_TAG_class_type +}; int main() { A a; + B b; } |