From: Zinovy Nis Date: Tue, 20 May 2014 08:26:20 +0000 (+0000) Subject: [LV][REFACTOR] One more tiny fix for printing debug locations in loop vectorizer... X-Git-Tag: android-x86-7.1-r4~61499 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f242c93ec57db744194ae3052fa59db71716ffe;p=android-x86%2Fexternal-llvm.git [LV][REFACTOR] One more tiny fix for printing debug locations in loop vectorizer. Now consistent with the remarks emitter. Differential Revision: http://reviews.llvm.org/D3821 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@209197 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Vectorize/LoopVectorize.cpp b/lib/Transforms/Vectorize/LoopVectorize.cpp index 63548643b41..d57fae34dd6 100644 --- a/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -477,18 +477,17 @@ static void setDebugLocFromInst(IRBuilder<> &B, const Value *Ptr) { } #ifndef NDEBUG -/// \return string containing a file name and a line # for the given -/// instruction. -static std::string getDebugLocString(const Instruction *I) { +/// \return string containing a file name and a line # for the given loop. +static std::string getDebugLocString(const Loop *L) { std::string Result; - if (I) { + if (L) { raw_string_ostream OS(Result); - const DebugLoc &InstrDebugLoc = I->getDebugLoc(); - if (!InstrDebugLoc.isUnknown()) - InstrDebugLoc.print(I->getContext(), OS); + const DebugLoc LoopDbgLoc = L->getStartLoc(); + if (!LoopDbgLoc.isUnknown()) + LoopDbgLoc.print(L->getHeader()->getContext(), OS); else // Just print the module name. - OS << I->getParent()->getParent()->getParent()->getModuleIdentifier(); + OS << L->getHeader()->getParent()->getParent()->getModuleIdentifier(); OS.flush(); } return Result; @@ -1107,8 +1106,7 @@ struct LoopVectorize : public FunctionPass { assert(L->empty() && "Only process inner loops."); #ifndef NDEBUG - const std::string DebugLocStr = - getDebugLocString(L->getHeader()->getFirstNonPHIOrDbgOrLifetime()); + const std::string DebugLocStr = getDebugLocString(L); #endif /* NDEBUG */ DEBUG(dbgs() << "\nLV: Checking a loop in \""