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

Reapplying now that r218887 is in.

This reverts commit r218882, reapplying r218880.

llvm-svn: 218888
diff --git a/clang/lib/CodeGen/CoverageMappingGen.h b/clang/lib/CodeGen/CoverageMappingGen.h
index 45e0db8..e4c6412 100644
--- a/clang/lib/CodeGen/CoverageMappingGen.h
+++ b/clang/lib/CodeGen/CoverageMappingGen.h
@@ -87,20 +87,16 @@
   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