diff options
| author | emaste <emaste@FreeBSD.org> | 2014-09-11 18:19:08 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-09-11 18:19:08 +0000 |
| commit | ba8f8d0e997e6c03f900ce9bb3bbb343070e33fc (patch) | |
| tree | 9104ea068aaff8a5468581c3f49adf518695cfd5 /contrib/llvm/tools/clang/lib/CodeGen | |
| parent | e32ad75659285da2d8a428c08190e8ab759b4157 (diff) | |
| download | FreeBSD-src-ba8f8d0e997e6c03f900ce9bb3bbb343070e33fc.zip FreeBSD-src-ba8f8d0e997e6c03f900ce9bb3bbb343070e33fc.tar.gz | |
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
MFC after: 1 week
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/tools/clang/lib/CodeGen')
| -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 |
