From 014435e79e7f9d475b3eb3b84e9c12ec4f0e5ad5 Mon Sep 17 00:00:00 2001 From: Justin Bogner Date: Tue, 3 Feb 2015 23:59:48 +0000 Subject: [PATCH] InstrProf: Update for LLVM API change Update for the API change in r228075 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@228076 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CoverageMappingGen.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/CodeGen/CoverageMappingGen.cpp b/lib/CodeGen/CoverageMappingGen.cpp index e85fa114fa..748b50da9e 100644 --- a/lib/CodeGen/CoverageMappingGen.cpp +++ b/lib/CodeGen/CoverageMappingGen.cpp @@ -246,9 +246,8 @@ public: unsigned ColumnStart = SM.getSpellingColumnNumber(LocStart); unsigned LineEnd = SM.getSpellingLineNumber(LocEnd); unsigned ColumnEnd = SM.getSpellingColumnNumber(LocEnd); - CounterMappingRegion Region(Counter(), *CovFileID, LineStart, ColumnStart, - LineEnd, ColumnEnd, - CounterMappingRegion::SkippedRegion); + auto Region = CounterMappingRegion::makeSkipped( + *CovFileID, LineStart, ColumnStart, LineEnd, ColumnEnd); // Make sure that we only collect the regions that are inside // the souce code of this function. if (Region.LineStart >= FileLineRanges[*CovFileID].first && @@ -284,10 +283,9 @@ public: ColumnStart + Lexer::MeasureTokenLength(SM.getSpellingLoc(LocStart), SM, LangOpts); - MappingRegions.push_back(CounterMappingRegion( - Counter(), *CovFileID, LineStart, ColumnStart, LineEnd, ColumnEnd, - CounterMappingRegion::ExpansionRegion)); - MappingRegions.back().ExpandedFileID = *ExpandedFileID; + MappingRegions.push_back(CounterMappingRegion::makeExpansion( + *CovFileID, *ExpandedFileID, LineStart, ColumnStart, LineEnd, + ColumnEnd)); } /// \brief Enter a source region group that is identified by the given @@ -375,9 +373,9 @@ public: continue; assert(LineStart <= LineEnd); - MappingRegions.push_back(CounterMappingRegion( + MappingRegions.push_back(CounterMappingRegion::makeRegion( I->getCounter(), *CovFileID, LineStart, ColumnStart, LineEnd, - ColumnEnd, CounterMappingRegion::CodeRegion)); + ColumnEnd)); } } }; -- 2.50.1