maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

InstrProf: Update for the LLVM API change in r218879 

llvm-svn: 218880
This commit is contained in:
Justin Bogner 2014-10-02 16:04:18 +00:00
parent d6a9e4b3be
commit 94eabf58bd
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/lib/CodeGen/CodeGenPGO.cpp
View File

@ -908,8 +908,7 @@ void CodeGenPGO::emitCounterRegionMapping(const Decl *D) {
llvm::raw_string_ostream OS(CoverageMapping);
CoverageMappingGen MappingGen(*CGM.getCoverageMapping(),
CGM.getContext().getSourceManager(),
CGM.getLangOpts(), RegionCounterMap.get(),
NumRegionCounters);
CGM.getLangOpts(), RegionCounterMap.get());
MappingGen.emitCounterMapping(D, OS);
OS.flush();
}

9
clang/lib/CodeGen/CoverageMappingGen.cpp
View File

@ -581,11 +581,9 @@ struct CounterCoverageMappingBuilder
CounterCoverageMappingBuilder(
CoverageMappingModuleGen &CVM,
llvm::DenseMap<const Stmt *, unsigned> &CounterMap,
unsigned NumRegionCounters, SourceManager &SM,
llvm::DenseMap<const Stmt *, unsigned> &CounterMap, SourceManager &SM,
const LangOptions &LangOpts)
: CoverageMappingBuilder(CVM, SM, LangOpts), CounterMap(CounterMap),
Builder(NumRegionCounters) {}
: CoverageMappingBuilder(CVM, SM, LangOpts), CounterMap(CounterMap) {}
/// \brief Write the mapping data to the output stream
void write(llvm::raw_ostream &OS) {
@ -1213,8 +1211,7 @@ unsigned CoverageMappingModuleGen::getFileID(const FileEntry *File) {
void CoverageMappingGen::emitCounterMapping(const Decl *D,
llvm::raw_ostream &OS) {
assert(CounterMap);
CounterCoverageMappingBuilder Walker(CVM, *CounterMap, NumRegionCounters, SM,
LangOpts);
CounterCoverageMappingBuilder Walker(CVM, *CounterMap, SM, LangOpts);
Walker.VisitDecl(D);
Walker.write(OS);
}

10
clang/lib/CodeGen/CoverageMappingGen.h
View File

@ -87,20 +87,16 @@ class CoverageMappingGen {
SourceManager &SM;
const LangOptions &LangOpts;
llvm::DenseMap<const Stmt *, unsigned> *CounterMap;
unsigned NumRegionCounters;
public:
CoverageMappingGen(CoverageMappingModuleGen &CVM, SourceManager &SM,
const LangOptions &LangOpts)
: CVM(CVM), SM(SM), LangOpts(LangOpts), CounterMap(nullptr),
NumRegionCounters(0) {}
: CVM(CVM), SM(SM), LangOpts(LangOpts), CounterMap(nullptr) {}
CoverageMappingGen(CoverageMappingModuleGen &CVM, SourceManager &SM,
const LangOptions &LangOpts,
llvm::DenseMap<const Stmt *, unsigned> *CounterMap,
unsigned NumRegionCounters)
: CVM(CVM), SM(SM), LangOpts(LangOpts), CounterMap(CounterMap),
NumRegionCounters(NumRegionCounters) {}
llvm::DenseMap<const Stmt *, unsigned> *CounterMap)
: CVM(CVM), SM(SM), LangOpts(LangOpts), CounterMap(CounterMap) {}
/// \brief Emit the coverage mapping data which maps the regions of
/// code to counters that will be used to find the execution