From b861d48f798bc772be99df66d40727c80d3da1dd Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Wed, 30 Apr 2014 21:44:17 +0000 Subject: [PATCH] Slightly simplify code in DwarfDebug::beginFunction git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207710 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index e0bc4bd7239..8de084abff1 100644 --- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -1440,9 +1440,8 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { Asm->OutStreamer.EmitLabel(FunctionBeginSym); // Collect user variables, find the end of the prologue. - for (MachineFunction::const_iterator I = MF->begin(), E = MF->end(); I != E; - ++I) { - for (MachineBasicBlock::const_iterator II = I->begin(), IE = I->end(); + for (const auto &MBB : *MF) { + for (MachineBasicBlock::const_iterator II = MBB.begin(), IE = MBB.end(); II != IE; ++II) { const MachineInstr *MI = II; if (MI->isDebugValue()) { @@ -1454,12 +1453,11 @@ void DwarfDebug::beginFunction(const MachineFunction *MF) { std::make_pair(Var, SmallVector())); if (IterPair.second) UserVariables.push_back(Var); - } else { + } else if (!MI->getFlag(MachineInstr::FrameSetup) && + PrologEndLoc.isUnknown() && !MI->getDebugLoc().isUnknown()) { // First known non-DBG_VALUE and non-frame setup location marks // the beginning of the function body. - if (!MI->getFlag(MachineInstr::FrameSetup) && - (PrologEndLoc.isUnknown() && !MI->getDebugLoc().isUnknown())) - PrologEndLoc = MI->getDebugLoc(); + PrologEndLoc = MI->getDebugLoc(); } } } -- 2.34.1