[llvm-commits] [llvm] r138006 - in /llvm/trunk/lib/CodeGen/AsmPrinter: DwarfCompileUnit.cpp DwarfDebug.cpp DwarfDebug.h

[Devang Patel]

Author: dpatel
Date: Thu Aug 18 18:17:55 2011
New Revision: 138006

URL: http://llvm.org/viewvc/llvm-project?rev=138006&view=rev
Log:
Eliminate unnecessary forwarding function.

Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=138006&r1=138005&r2=138006&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Thu Aug 18 18:17:55 2011
@@ -1035,6 +1035,9 @@
     return;
 
   DIGlobalVariable GV(N);
+  if (!GV.Verify())
+    return;
+
   DIE *VariableDIE = new DIE(GV.getTag());
   // Add to map.
   insertDIE(N, VariableDIE);

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp?rev=138006&r1=138005&r2=138006&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.cpp Thu Aug 18 18:17:55 2011
@@ -510,19 +510,6 @@
   return NewCU;
 }
 
-/// constructGlobalVariableDIE - Construct global variable DIE.
-void DwarfDebug::constructGlobalVariableDIE(CompileUnit *TheCU,
-                                            const MDNode *N) {
-  DIGlobalVariable GV(N);
-
-  // If debug information is malformed then ignore it.
-  if (GV.Verify() == false)
-    return;
-
-  TheCU->createGlobalVariableDIE(N);
-  return;
-}
-
 /// construct SubprogramDIE - Construct subprogram DIE.
 void DwarfDebug::constructSubprogramDIE(CompileUnit *TheCU, 
                                         const MDNode *N) {
@@ -561,7 +548,7 @@
     for (unsigned i = 0, e = NMD->getNumOperands(); i != e; ++i) {
       const MDNode *N = NMD->getOperand(i);
       if (CompileUnit *CU = CUMap.lookup(DIGlobalVariable(N).getCompileUnit()))
-        constructGlobalVariableDIE(CU, N);
+        CU->createGlobalVariableDIE(N);
     }
   
   if (NamedMDNode *NMD = M->getNamedMetadata("llvm.dbg.enum"))
@@ -607,7 +594,7 @@
          E = DbgFinder.global_variable_end(); I != E; ++I) {
     const MDNode *N = *I;
     if (CompileUnit *CU = CUMap.lookup(DIGlobalVariable(N).getCompileUnit()))
-      constructGlobalVariableDIE(CU, N);
+      CU->createGlobalVariableDIE(N);
   }
     
   // Create DIEs for each subprogram.
@@ -637,7 +624,7 @@
       CompileUnit *CU = constructCompileUnit(CUNode);
       DIArray GVs = CUNode.getGlobalVariables();
       for (unsigned i = 0, e = GVs.getNumElements(); i != e; ++i)
-        constructGlobalVariableDIE(CU, GVs.getElement(i));
+        CU->createGlobalVariableDIE(GVs.getElement(i));
       DIArray SPs = CUNode.getSubprograms();
       for (unsigned i = 0, e = SPs.getNumElements(); i != e; ++i)
         constructSubprogramDIE(CU, SPs.getElement(i));

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h?rev=138006&r1=138005&r2=138006&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfDebug.h Thu Aug 18 18:17:55 2011
@@ -417,9 +417,6 @@
   /// metadata node with tag DW_TAG_compile_unit.
   CompileUnit *constructCompileUnit(const MDNode *N);
 
-  /// constructGlobalVariableDIE - Construct global variable DIE.
-  void constructGlobalVariableDIE(CompileUnit *TheCU, const MDNode *N);
-
   /// construct SubprogramDIE - Construct subprogram DIE.
   void constructSubprogramDIE(CompileUnit *TheCU, const MDNode *N);