From c37bb3a98f9ad7a694bff8a3f1ff54c9e5a05330 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sat, 26 Apr 2014 22:37:45 +0000 Subject: DwarfDebug: Roll argument into call. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207334 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'lib/CodeGen') diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 69f7d1146d..943d290058 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -515,12 +515,10 @@ DIE *DwarfDebug::createScopeChildrenDIE( if (LScopes.isCurrentFunctionScope(Scope)) { for (DbgVariable *ArgDV : CurrentFnArguments) if (ArgDV) { - std::unique_ptr Arg = - TheCU.constructVariableDIE(*ArgDV, Scope->isAbstractScope()); - assert(Arg); + Children.push_back( + TheCU.constructVariableDIE(*ArgDV, Scope->isAbstractScope())); if (ArgDV->isObjectPointer()) - ObjectPointer = Arg.get(); - Children.push_back(std::move(Arg)); + ObjectPointer = Children.back().get(); } // If this is a variadic function, add an unspecified parameter. @@ -535,12 +533,10 @@ DIE *DwarfDebug::createScopeChildrenDIE( // Collect lexical scope children first. for (DbgVariable *DV : ScopeVariables.lookup(Scope)) { - std::unique_ptr Variable = - TheCU.constructVariableDIE(*DV, Scope->isAbstractScope()); - assert(Variable); + Children.push_back( + TheCU.constructVariableDIE(*DV, Scope->isAbstractScope())); if (DV->isObjectPointer()) - ObjectPointer = Variable.get(); - Children.push_back(std::move(Variable)); + ObjectPointer = Children.back().get(); } for (LexicalScope *LS : Scope->getChildren()) if (DIE *Nested = constructScopeDIE(TheCU, LS)) -- cgit v1.2.3