[cfe-commits] r149013 - /cfe/trunk/lib/CodeGen/CGDebugInfo.cpp

[Eric Christopher]

Author: echristo
Date: Wed Jan 25 19:57:29 2012
New Revision: 149013

URL: http://llvm.org/viewvc/llvm-project?rev=149013&view=rev
Log:
Collect this information together. No reason to have it split.

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

Modified: cfe/trunk/lib/CodeGen/CGDebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDebugInfo.cpp?rev=149013&r1=149012&r2=149013&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGDebugInfo.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGDebugInfo.cpp Wed Jan 25 19:57:29 2012
@@ -1171,18 +1171,16 @@
   // Convert all the elements.
   SmallVector<llvm::Value *, 16> EltTys;
 
-  const CXXRecordDecl *CXXDecl = dyn_cast<CXXRecordDecl>(RD);
-  if (CXXDecl) {
-    CollectCXXBases(CXXDecl, Unit, EltTys, FwdDecl);
-    CollectVTableInfo(CXXDecl, Unit, EltTys);
-  }
-
   // Collect static variables with initializers.
   CollectRecordStaticVars(RD, FwdDecl);
-
   CollectRecordFields(RD, Unit, EltTys, FwdDecl);
+
+  // Collect C++ information.
+  const CXXRecordDecl *CXXDecl = dyn_cast<CXXRecordDecl>(RD);
   llvm::DIArray TParamsArray;
   if (CXXDecl) {
+    CollectCXXBases(CXXDecl, Unit, EltTys, FwdDecl);
+    CollectVTableInfo(CXXDecl, Unit, EltTys);
     CollectCXXMemberFunctions(CXXDecl, Unit, EltTys, FwdDecl);
     CollectCXXFriends(CXXDecl, Unit, EltTys, FwdDecl);
     if (const ClassTemplateSpecializationDecl *TSpecial