Fix all the silly things I committed in r184509

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

diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index e1b6342349684e40ccb7f95f1920811db950a9e7..b2f3120ec387089ddf8a45dd0c3a000c61f1b83f 100644 (file)
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -1916,10 +1916,11 @@ void CGDebugInfo::completeFwdDecl(const RecordDecl &RD) {
   if (DebugKind <= CodeGenOptions::LimitedDebugInfo)
     return;
 
-  llvm::DIType T = getTypeOrNull(CGM.getContext().getRecordType(&RD));
+  QualType QTy = CGM.getContext().getRecordType(&RD);
+  llvm::DIType T = getTypeOrNull(QTy);
 
   if (T.Verify() && T.isForwardDecl())
-    getOrCreateType(QTy, getOrCreateFile(RD.getLocation());
+    getOrCreateType(QTy, getOrCreateFile(RD.getLocation()));
 }
 
 /// getCachedInterfaceTypeOrNull - Get the type from the interface

diff --git a/lib/CodeGen/CGDebugInfo.h b/lib/CodeGen/CGDebugInfo.h
index 72a9d71d79f3e71c07e7905c1da25ce477da5807..4603b9c606019d8c1d1b3b178b1ed622c6a626c3 100644 (file)
--- a/lib/CodeGen/CGDebugInfo.h
+++ b/lib/CodeGen/CGDebugInfo.h
@@ -289,7 +289,7 @@ public:
   llvm::DIType getOrCreateInterfaceType(QualType Ty,
                                         SourceLocation Loc);
 
-  void completeFwdDecls(const RecordDecl *TD);
+  void completeFwdDecl(const RecordDecl &TD);
 
 private:
   /// EmitDeclare - Emit call to llvm.dbg.declare for a variable declaration.

diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index 6ebb418e5ef5e7d922c8ff130fbda69474112bcc..88a1393a68f395ef5bf08b2f50bbd37308b98ff2 100644 (file)
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -264,7 +264,7 @@ void CodeGenTypes::UpdateCompletedType(const TagDecl *TD) {
   // If necessary, provide the full definition of a type only used with a
   // declaration so far.
   if (CGDebugInfo *DI = CGM.getModuleDebugInfo())
-    DI->completeFwdDecls(RD);
+    DI->completeFwdDecl(*RD);
 }
 
 static llvm::Type *getTypeForFormat(llvm::LLVMContext &VMContext,