Index: include/llvm/ProfileData/SampleProf.h =================================================================== --- include/llvm/ProfileData/SampleProf.h +++ include/llvm/ProfileData/SampleProf.h @@ -222,6 +222,21 @@ return ret->second.getSamples(); } + /// Return the total number of call target samples collected at a given + /// location. Each location is specified by \p LineOffset and + /// \p Discriminator. If the location is not found in profile, return error. + ErrorOr findCallSamplesAt(uint32_t LineOffset, + uint32_t Discriminator) const { + const auto &ret = BodySamples.find(LineLocation(LineOffset, Discriminator)); + if (ret == BodySamples.end()) + return std::error_code(); + uint64_t T = 0; + for (const auto &t_c : ret->second.getCallTargets()) { + T += t_c.second; + } + return T; + } + /// Return the function samples at the given callsite location. FunctionSamples &functionSamplesAt(const LineLocation &Loc) { return CallsiteSamples[Loc]; Index: lib/Transforms/IPO/SampleProfile.cpp =================================================================== --- lib/Transforms/IPO/SampleProfile.cpp +++ lib/Transforms/IPO/SampleProfile.cpp @@ -479,7 +479,8 @@ uint32_t LineOffset = getOffset(Lineno, HeaderLineno); uint32_t Discriminator = DIL->getDiscriminator(); - ErrorOr R = FS->findSamplesAt(LineOffset, Discriminator); + ErrorOr R = CI ? FS->findCallSamplesAt(LineOffset, Discriminator): + FS->findSamplesAt(LineOffset, Discriminator); if (R) { bool FirstMark = CoverageTracker.markSamplesUsed(FS, LineOffset, Discriminator, R.get()); Index: test/Transforms/SampleProfile/Inputs/inline-coverage.prof =================================================================== --- test/Transforms/SampleProfile/Inputs/inline-coverage.prof +++ test/Transforms/SampleProfile/Inputs/inline-coverage.prof @@ -4,4 +4,4 @@ 4: 0 0: 0 3: _Z3fool:172746 - 1: 31878 + 1: 31878 rand:31878