Revert "InstrProf: Update for the LLVM API change in r218879"

r218879 has been reverted for now, this needs to go to match.

This reverts commit r218880.

llvm-svn: 218882

1 files changed, 6 insertions, 3 deletions

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