Cleanup: shorten prefix to consistent with other decls /NFC

llvm-svn: 257744
diff --git a/llvm/lib/ProfileData/CoverageMappingReader.cpp b/llvm/lib/ProfileData/CoverageMappingReader.cpp
index 4137b17..c8948d6 100644
--- a/llvm/lib/ProfileData/CoverageMappingReader.cpp
+++ b/llvm/lib/ProfileData/CoverageMappingReader.cpp
@@ -316,13 +316,13 @@
   virtual ~CovMapFuncRecordReader() {}
   template <class IntPtrT, support::endianness Endian>
   static std::unique_ptr<CovMapFuncRecordReader>
-  get(coverage::CoverageMappingVersion Version, InstrProfSymtab &P,
+  get(coverage::CovMapVersion Version, InstrProfSymtab &P,
       std::vector<BinaryCoverageReader::ProfileMappingRecord> &R,
       std::vector<StringRef> &F);
 };
 
 // A class for reading coverage mapping function records for a module.
-template <coverage::CoverageMappingVersion CovMapVersion, class IntPtrT,
+template <coverage::CovMapVersion CovMapVersion, class IntPtrT,
           support::endianness Endian>
 class VersionedCovMapFuncRecordReader : public CovMapFuncRecordReader {
   typedef typename coverage::CovMapTraits<
@@ -352,8 +352,7 @@
     uint32_t NRecords = CovHeader->getNRecords<Endian>();
     uint32_t FilenamesSize = CovHeader->getFilenamesSize<Endian>();
     uint32_t CoverageSize = CovHeader->getCoverageSize<Endian>();
-    assert((CoverageMappingVersion)CovHeader->getVersion<Endian>() ==
-           CovMapVersion);
+    assert((CovMapVersion)CovHeader->getVersion<Endian>() == CovMapVersion);
     Buf = reinterpret_cast<const char *>(CovHeader + 1);
 
     // Skip past the function records, saving the start and end for later.
@@ -415,14 +414,14 @@
 
 template <class IntPtrT, support::endianness Endian>
 std::unique_ptr<CovMapFuncRecordReader> CovMapFuncRecordReader::get(
-    coverage::CoverageMappingVersion Version, InstrProfSymtab &P,
+    coverage::CovMapVersion Version, InstrProfSymtab &P,
     std::vector<BinaryCoverageReader::ProfileMappingRecord> &R,
     std::vector<StringRef> &F) {
   using namespace coverage;
   switch (Version) {
-  case CoverageMappingVersion1:
+  case CovMapVersion::Version1:
     return llvm::make_unique<VersionedCovMapFuncRecordReader<
-        CoverageMappingVersion1, IntPtrT, Endian>>(P, R, F);
+        CovMapVersion::Version1, IntPtrT, Endian>>(P, R, F);
   }
   llvm_unreachable("Unsupported version");
 }
@@ -436,9 +435,8 @@
   // Read the records in the coverage data section.
   auto CovHeader =
       reinterpret_cast<const coverage::CovMapHeader *>(Data.data());
-  CoverageMappingVersion Version =
-      (CoverageMappingVersion)CovHeader->getVersion<Endian>();
-  if (Version > coverage::CoverageMappingCurrentVersion)
+  CovMapVersion Version = (CovMapVersion)CovHeader->getVersion<Endian>();
+  if (Version > coverage::CovMapVersion::CurrentVersion)
     return coveragemap_error::unsupported_version;
   std::unique_ptr<CovMapFuncRecordReader> Reader =
       CovMapFuncRecordReader::get<T, Endian>(Version, ProfileNames, Records,