47 lines
1.8 KiB
Diff
47 lines
1.8 KiB
Diff
commit 96365aef99ec463375dfdaf6eb260823e0477b6a
|
|
Author: Adrian Prantl <aprantl@apple.com>
|
|
Date: Tue Apr 1 17:52:06 2014 +0000
|
|
|
|
Debug info: fix a crash when emitting IndirectFieldDecls, which were
|
|
previously not handled at all.
|
|
rdar://problem/16348575
|
|
|
|
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@205331 91177308-0d34-0410-b5e6-96231b3b80d8
|
|
|
|
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
|
|
index 82db942..2556cf9 100644
|
|
--- tools/clang/lib/CodeGen/CGDebugInfo.cpp
|
|
+++ tools/clangb/lib/CodeGen/CGDebugInfo.cpp
|
|
@@ -1252,7 +1252,7 @@ CollectTemplateParams(const TemplateParameterList *TPList,
|
|
V = CGM.GetAddrOfFunction(FD);
|
|
// Member data pointers have special handling too to compute the fixed
|
|
// offset within the object.
|
|
- if (isa<FieldDecl>(D)) {
|
|
+ if (isa<FieldDecl>(D) || isa<IndirectFieldDecl>(D)) {
|
|
// These five lines (& possibly the above member function pointer
|
|
// handling) might be able to be refactored to use similar code in
|
|
// CodeGenModule::getMemberPointerConstant
|
|
diff --git a/test/CodeGenCXX/debug-info-indirect-field-decl.cpp b/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
|
|
new file mode 100644
|
|
index 0000000..131ceba
|
|
--- /dev/null
|
|
+++ tools/clang/test/CodeGenCXX/debug-info-indirect-field-decl.cpp
|
|
@@ -0,0 +1,17 @@
|
|
+// RUN: %clang_cc1 -emit-llvm -g -triple x86_64-apple-darwin %s -o - | FileCheck %s
|
|
+//
|
|
+// Test that indirect field decls are handled gracefully.
|
|
+// rdar://problem/16348575
|
|
+//
|
|
+template <class T, int T::*ptr> class Foo { };
|
|
+
|
|
+struct Bar {
|
|
+ int i1;
|
|
+ // CHECK: [ DW_TAG_member ] [line [[@LINE+1]], size 32, align 32, offset 32] [from _ZTSN3BarUt_E]
|
|
+ union {
|
|
+ // CHECK: [ DW_TAG_member ] [i2] [line [[@LINE+1]], size 32, align 32, offset 0] [from int]
|
|
+ int i2;
|
|
+ };
|
|
+};
|
|
+
|
|
+Foo<Bar, &Bar::i2> the_foo;
|