commit f068c92f22cc5c42433f5bd37b000a714a56670f
author Eric Christopher <echristo@gmail.com> Tue Apr 02 22:59:11 2013 +0000
committer Eric Christopher <echristo@gmail.com> Tue Apr 02 22:59:11 2013 +0000
tree 68bc9dd9cefe1a25b73a1c8f2a4932f021180cfd
parent 58b65d953e67251bfce28a5251bb3b496490f343

Revert "Revert r178079, it caused PR15637."

This reverts commit r178497 since the backend has been fixed.

Also add a test to ensure that we're emitting template information for unions.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178587 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGDebugInfo.h

diff --git a/lib/CodeGen/CGDebugInfo.h b/lib/CodeGen/CGDebugInfo.h
index aca5f95..3a0df99 100644
--- a/lib/CodeGen/CGDebugInfo.h
+++ b/lib/CodeGen/CGDebugInfo.h
@@ -51,7 +51,7 @@
   SourceLocation CurLoc, PrevLoc;
   llvm::DIType VTablePtrType;
   llvm::DIType ClassTy;
-  llvm::DIType ObjTy;
+  llvm::DICompositeType ObjTy;
   llvm::DIType SelTy;
   llvm::DIType OCLImage1dDITy, OCLImage1dArrayDITy, OCLImage1dBufferDITy;
   llvm::DIType OCLImage2dDITy, OCLImage2dArrayDITy;