From 412d6685daaeb848b32d1fc00b1d147247558817 Mon Sep 17 00:00:00 2001 From: Dehao Chen Date: Fri, 9 Oct 2015 16:50:16 +0000 Subject: [PATCH] Make HeaderLineno a local variable. http://reviews.llvm.org/D13576 As we are using hierarchical profile, there is no need to keep HeaderLineno a member variable. This is because each level of the inline stack will have its own header lineno. One should use the head lineno of its own inline stack level instead of the actual symbol. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@249848 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/SampleProfile.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/Transforms/IPO/SampleProfile.cpp b/lib/Transforms/IPO/SampleProfile.cpp index a4ce65fd4ab..cb4dad2f7eb 100644 --- a/lib/Transforms/IPO/SampleProfile.cpp +++ b/lib/Transforms/IPO/SampleProfile.cpp @@ -123,10 +123,6 @@ protected: bool propagateThroughEdges(Function &F); void computeDominanceAndLoopInfo(Function &F); - /// \brief Line number for the function header. Used to compute absolute - /// line numbers from the relative line numbers found in the profile. - unsigned HeaderLineno; - /// \brief Map basic blocks to their computed weights. /// /// The weight of a basic block is defined to be the maximum @@ -226,14 +222,16 @@ SampleProfileLoader::getInstWeight(const Instruction &Inst) const { if (!DLoc) return std::error_code(); - unsigned Lineno = DLoc.getLine(); - if (Lineno < HeaderLineno) + const FunctionSamples *FS = findFunctionSamples(Inst); + if (!FS) return std::error_code(); const DILocation *DIL = DLoc; - const FunctionSamples *FS = findFunctionSamples(Inst); - if (!FS) + unsigned Lineno = DLoc.getLine(); + unsigned HeaderLineno = DIL->getScope()->getSubprogram()->getLine(); + if (Lineno < HeaderLineno) return std::error_code(); + ErrorOr R = FS->findSamplesAt(Lineno - HeaderLineno, DIL->getDiscriminator()); if (R) @@ -837,13 +835,11 @@ void SampleProfileLoader::computeDominanceAndLoopInfo(Function &F) { bool SampleProfileLoader::emitAnnotations(Function &F) { bool Changed = false; - // Initialize invariants used during computation and propagation. - HeaderLineno = getFunctionLoc(F); - if (HeaderLineno == 0) + if (getFunctionLoc(F) == 0) return false; DEBUG(dbgs() << "Line number for the first instruction in " << F.getName() - << ": " << HeaderLineno << "\n"); + << ": " << getFunctionLoc(F) << "\n"); Changed |= inlineHotFunctions(F); -- 2.34.1