diff options
author | emaste <emaste@FreeBSD.org> | 2014-09-11 01:53:55 +0000 |
---|---|---|
committer | emaste <emaste@FreeBSD.org> | 2014-09-11 01:53:55 +0000 |
commit | 8081f48b5d0c01d86d5b3d32021fa12d8138cba1 (patch) | |
tree | b7a07adca4d96eb4216bb92429c8629342625eb3 /contrib/llvm/patches | |
parent | b2f9aa76a4bbf30efec9702139f27c272bbdfa80 (diff) | |
download | FreeBSD-src-8081f48b5d0c01d86d5b3d32021fa12d8138cba1.zip FreeBSD-src-8081f48b5d0c01d86d5b3d32021fa12d8138cba1.tar.gz |
MFC Clang debug info crash fix
r271282: Merge Clang debug info crash fix rev 200797:
Debug info: fix a crasher when when emitting debug info for
not-yet-completed templated types. getTypeSize() needs a complete type.
rdar://problem/15931354
r271283: Add clang patch for r271282
Note that r271282 contains only the src change from Clang rev 200797.
This patch file includes two follow-on changes to the test case, which
do not apply to the copy in the FreeBSD tree.
Upstream Clang revisions:
200797:
Debug info: fix a crasher when when emitting debug info for
not-yet-completed templated types. getTypeSize() needs a complete type.
rdar://problem/15931354
200798:
Simplify testcase from r200797 some more.
200805:
Further simplify r200797 and add an explanatory comment.
PR: 193347
Approved by: re
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/patches')
-rw-r--r-- | contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff b/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff new file mode 100644 index 0000000..be4ce55 --- /dev/null +++ b/contrib/llvm/patches/patch-r271282-clang-r200797-r200798-r200805-debug-info-crash.diff @@ -0,0 +1,51 @@ +diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp +index 59ba47c..dddc7e7 100644 +--- a/lib/CodeGen/CGDebugInfo.cpp ++++ b/lib/CodeGen/CGDebugInfo.cpp +@@ -2251,9 +2251,10 @@ llvm::DICompositeType CGDebugInfo::CreateLimitedType(const RecordType *Ty) { + if (T && (!T.isForwardDecl() || !RD->getDefinition())) + return T; + +- // If this is just a forward declaration, construct an appropriately +- // marked node and just return it. +- if (!RD->getDefinition()) ++ // If this is just a forward or incomplete declaration, construct an ++ // appropriately marked node and just return it. ++ const RecordDecl *D = RD->getDefinition(); ++ if (!D || !D->isCompleteDefinition()) + return getOrCreateRecordFwdDecl(Ty, RDContext); + + uint64_t Size = CGM.getContext().getTypeSize(Ty); +diff --git a/test/CodeGenCXX/debug-info-template-fwd.cpp b/test/CodeGenCXX/debug-info-template-fwd.cpp +new file mode 100644 +index 0000000..b2b7073 +--- /dev/null ++++ b/test/CodeGenCXX/debug-info-template-fwd.cpp +@@ -0,0 +1,27 @@ ++// RUN: %clang_cc1 %s -triple=x86_64-apple-darwin -g -emit-llvm -o - | FileCheck %s ++// This test is for a crash when emitting debug info for not-yet-completed ++// types. ++// Test that we don't actually emit a forward decl for the offending class: ++// CHECK: [ DW_TAG_structure_type ] [Derived<int>] {{.*}} [def] ++// rdar://problem/15931354 ++template <class A> class Derived; ++ ++template <class A> class Base { ++ static Derived<A> *create(); ++}; ++ ++template <class A> struct Derived : Base<A> { ++}; ++ ++Base<int> *f; ++ ++// During the instantiation of Derived<int>, Base<int> becomes required to be ++// complete - since the declaration has already been emitted (due to 'f', ++// above), we immediately try to build debug info for Base<int> which then ++// requires the (incomplete definition) of Derived<int> which is problematic. ++// ++// (if 'f' is not present, the point at which Base<int> becomes required to be ++// complete during the instantiation of Derived<int> is a no-op because ++// Base<int> was never emitted so we ignore it and carry on until we ++// wire up the base class of Derived<int> in the debug info later on) ++Derived<int> d; |