svn commit: r271432 - head/contrib/llvm/tools/clang/lib/CodeGen

[Ed Maste]

Author: emaste
Date: Thu Sep 11 18:19:08 2014
New Revision: 271432
URL: http://svnweb.freebsd.org/changeset/base/271432

Log:
  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

Modified:
  head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp

Modified: head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Thu Sep 11 18:12:28 2014	(r271431)
+++ head/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp	Thu Sep 11 18:19:08 2014	(r271432)
@@ -1241,7 +1241,7 @@ CollectTemplateParams(const TemplatePara
         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