From 2fdf433e51db56f25587478bb3c6b6c591f64879 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Tue, 26 Nov 2013 00:35:04 +0000 Subject: [PATCH] DebugInfo: Remove CompileUnit::constructTypeDIEImpl now that it's just a simple wrapper again. r195698 moved the type unit checking up into getOrCreateTypeDIE so remove the redundant check and fold the functions back together again. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@195700 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp | 13 ++----------- lib/CodeGen/AsmPrinter/DwarfCompileUnit.h | 4 ---- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp index 2316301b402..893df15e50b 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp @@ -923,7 +923,7 @@ DIE *CompileUnit::createTypeDIE(DICompositeType Ty) { // Create new type. TyDIE = createAndAddDIE(Ty.getTag(), *ContextDIE, Ty); - constructTypeDIEImpl(*TyDIE, Ty); + constructTypeDIE(*TyDIE, Ty); updateAcceleratorTables(Context, Ty, TyDIE); return TyDIE; @@ -994,7 +994,7 @@ DIE *CompileUnit::getOrCreateTypeDIE(const MDNode *TyNode) { // Skip updating the accellerator tables since this is not the full type return TyDIE; } - constructTypeDIEImpl(*TyDIE, CTy); + constructTypeDIE(*TyDIE, CTy); } else { assert(Ty.isDerivedType() && "Unknown kind of DIType"); constructTypeDIE(*TyDIE, DIDerivedType(Ty)); @@ -1169,15 +1169,6 @@ void CompileUnit::constructTypeDIE(DIE &Buffer, DIDerivedType DTy) { /// constructTypeDIE - Construct type DIE from DICompositeType. void CompileUnit::constructTypeDIE(DIE &Buffer, DICompositeType CTy) { - // If this is a type applicable to a type unit it then add it to the - // list of types we'll compute a hash for later. - if (shouldCreateTypeUnit(CTy, DD)) - DD->addTypeUnitType(&Buffer, CTy); - else - constructTypeDIEImpl(Buffer, CTy); -} - -void CompileUnit::constructTypeDIEImpl(DIE &Buffer, DICompositeType CTy) { // Add name if not anonymous or intermediate type. StringRef Name = CTy.getName(); diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h index 8fdd2e012d1..b39a2fd78fc 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h +++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h @@ -327,10 +327,6 @@ public: DIE *createAndAddDIE(unsigned Tag, DIE &Parent, DIDescriptor N = DIDescriptor()); - /// constructTypeDIEImpl - Construct type DIE that is not a type unit - /// reference from a DICompositeType. - void constructTypeDIEImpl(DIE &Buffer, DICompositeType CTy); - /// Compute the size of a header for this unit, not including the initial /// length field. unsigned getHeaderSize() const { -- 2.11.0