DebugInfo: Delete old subclasses of DIType

[oota-llvm.git] / lib / CodeGen / AsmPrinter / DwarfDebug.h

diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.h b/lib/CodeGen/AsmPrinter/DwarfDebug.h
index 4b0506f4c10565230c2a6e598ce45a3fbd844ddf..ef971124dea7b6baf55efe55af820966361920d6 100644 (file)
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -165,7 +165,7 @@ public:
     return Expr.back()->getNumElements() > 0;
   }
   bool isBlockByrefVariable() const;
     return Expr.back()->getNumElements() > 0;
   }
   bool isBlockByrefVariable() const;

-  DIType getType() const;
+  const MDType *getType() const;

 
 private:
   /// resolve - Look in the DwarfDebug map for the MDNode that
 
 private:
   /// resolve - Look in the DwarfDebug map for the MDNode that


@@ -268,7 +268,8 @@ class DwarfDebug : public AsmPrinterHandler {
   // them.
   DenseMap<const MDNode *, const DwarfTypeUnit *> DwarfTypeUnits;
 
   // them.
   DenseMap<const MDNode *, const DwarfTypeUnit *> DwarfTypeUnits;
 

-  SmallVector<std::pair<std::unique_ptr<DwarfTypeUnit>, DICompositeType>, 1>
+  SmallVector<
+      std::pair<std::unique_ptr<DwarfTypeUnit>, const MDCompositeType *>, 1>

       TypeUnitsUnderConstruction;
 
   // Whether to emit the pubnames/pubtypes sections.
       TypeUnitsUnderConstruction;
 
   // Whether to emit the pubnames/pubtypes sections.


@@ -321,7 +322,7 @@ class DwarfDebug : public AsmPrinterHandler {
   DwarfAccelTable AccelNamespace;
   DwarfAccelTable AccelTypes;
 
   DwarfAccelTable AccelNamespace;
   DwarfAccelTable AccelTypes;
 

-  DenseMap<const Function *, DISubprogram> FunctionDIs;
+  DenseMap<const Function *, MDSubprogram *> FunctionDIs;

 
   MCDwarfDwoLineTable *getDwoLineTable(const DwarfCompileUnit &);
 
 
   MCDwarfDwoLineTable *getDwoLineTable(const DwarfCompileUnit &);
 


@@ -519,7 +520,7 @@ public:
   /// \brief Add a DIE to the set of types that we're going to pull into
   /// type units.
   void addDwarfTypeUnitType(DwarfCompileUnit &CU, StringRef Identifier,
   /// \brief Add a DIE to the set of types that we're going to pull into
   /// type units.
   void addDwarfTypeUnitType(DwarfCompileUnit &CU, StringRef Identifier,

-                            DIE &Die, DICompositeType CTy);
+                            DIE &Die, const MDCompositeType *CTy);

 
   /// \brief Add a label so that arange data can be generated for it.
   void addArangeLabel(SymbolCU SCU) { ArangeLabels.push_back(SCU); }
 
   /// \brief Add a label so that arange data can be generated for it.
   void addArangeLabel(SymbolCU SCU) { ArangeLabels.push_back(SCU); }