diff options
| author | emaste <emaste@FreeBSD.org> | 2014-09-18 01:24:40 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-09-18 01:24:40 +0000 |
| commit | 487e77199d4640297562cecebfebd6e9c8f16b75 (patch) | |
| tree | 26f8bde6474379e1b86bc1bcfcaf1ef7ce5f2f2a /contrib/llvm/tools | |
| parent | badeddde87763438fc72356ea1e5ee42847528a1 (diff) | |
| download | FreeBSD-src-487e77199d4640297562cecebfebd6e9c8f16b75.zip FreeBSD-src-487e77199d4640297562cecebfebd6e9c8f16b75.tar.gz | |
MFC Clang debuginfo crash fix
r271432: Merge upstream Clang rev 205331 debuginfo crash fix:
Debug info: fix a crash when emitting IndirectFieldDecls, which were
previously not handled at all.
rdar://problem/16348575
r271433: Add clang patch corresponding to r271432
Approved by: re
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/tools')
| -rw-r--r-- | contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp b/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp index b4109c7..b7b9d8c 100644 --- a/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp @@ -1241,7 +1241,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 |
