From: David Blaikie Date: Fri, 23 May 2014 05:03:23 +0000 (+0000) Subject: Rename a couple of variables to be more accurate. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1ed412cb72c3e0a6d5cfeaf756ab1fd014f1844b;p=oota-llvm.git Rename a couple of variables to be more accurate. It's not really a "ScopeDIE", as such - it's the abstract function definition's DIE. And we usually use "SP" for subprograms, rather than "Sub". git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209499 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 44aa529cfa4..06331e44d91 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -521,19 +521,19 @@ void DwarfDebug::constructAbstractSubprogramScopeDIE(DwarfCompileUnit &TheCU, assert(Scope->isAbstractScope()); assert(!Scope->getInlinedAt()); - DISubprogram Sub(Scope->getScopeNode()); + DISubprogram SP(Scope->getScopeNode()); - if (!ProcessedSPNodes.insert(Sub)) + if (!ProcessedSPNodes.insert(SP)) return; // Find the subprogram's DwarfCompileUnit in the SPMap in case the subprogram // was inlined from another compile unit. - DwarfCompileUnit &SPCU = *SPMap[Sub]; - DIE *ScopeDIE = SPCU.getDIE(Sub); - assert(ScopeDIE); - AbstractSPDies.insert(std::make_pair(Sub, ScopeDIE)); - SPCU.addUInt(*ScopeDIE, dwarf::DW_AT_inline, None, dwarf::DW_INL_inlined); - createAndAddScopeChildren(SPCU, Scope, *ScopeDIE); + DwarfCompileUnit &SPCU = *SPMap[SP]; + DIE *AbsDef = SPCU.getDIE(SP); + assert(AbsDef); + AbstractSPDies.insert(std::make_pair(SP, AbsDef)); + SPCU.addUInt(*AbsDef, dwarf::DW_AT_inline, None, dwarf::DW_INL_inlined); + createAndAddScopeChildren(SPCU, Scope, *AbsDef); } DIE &DwarfDebug::constructSubprogramScopeDIE(DwarfCompileUnit &TheCU,