r184512 - Fix all the silly things I committed in r184509

[David Blaikie]

Author: dblaikie
Date: Thu Jun 20 19:59:44 2013
New Revision: 184512

URL: http://llvm.org/viewvc/llvm-project?rev=184512&view=rev
Log:
Fix all the silly things I committed in r184509

Modified:
    cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
    cfe/trunk/lib/CodeGen/CGDebugInfo.h
    cfe/trunk/lib/CodeGen/CodeGenTypes.cpp

Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=184512&r1=184511&r2=184512&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Thu Jun 20 19:59:44 2013
@@ -1916,10 +1916,11 @@ void CGDebugInfo::completeFwdDecl(const
   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

Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.h?rev=184512&r1=184511&r2=184512&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.h (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.h Thu Jun 20 19:59:44 2013
@@ -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.

Modified: cfe/trunk/lib/CodeGen/CodeGenTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenTypes.cpp?rev=184512&r1=184511&r2=184512&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenTypes.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenTypes.cpp Thu Jun 20 19:59:44 2013
@@ -264,7 +264,7 @@ void CodeGenTypes::UpdateCompletedType(c
   // 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,