Address comments

Author: int-zjt

compiler-rt/test/profile/Posix/gcov-file-change.cpp

@@ -32,8 +32,8 @@ int main(int argc, char *argv[]) { // CHECK:      1: [[#]]:int main
 //--- a.h
 /// Apple targets doesn't enable -mconstructor-aliases by default and the count may be 4.
 struct A { A() { } };              // CHECK:      {{[24]}}: [[#]]:struct A
-inline auto *const inl_var_a =     // CHECK:      1: [[#]]:
-    new A;                         // CHECK:      1: [[#]]:
+inline auto *const inl_var_a =     // CHECK-NEXT: 1: [[#]]:
+    new A;                         // CHECK-NEXT: 1: [[#]]:
 
 //--- a.inc
 puts(""); // CHECK:      1: [[#]]:puts

llvm/include/llvm/ProfileData/GCOV.h

@@ -271,12 +271,10 @@ class GCOVFunction {
   DenseSet<const GCOVBlock *> visited;
 };
 
-/// GCOVLocation - Represent file of lines same with block_location_info in gcc.
-class GCOVLocation {
-public:
-  GCOVLocation(unsigned idx) : srcIdx(idx) {}
+/// Represent file of lines same with block_location_info in gcc.
+struct GCOVBlockLocation {
+  GCOVBlockLocation(unsigned idx) : srcIdx(idx) {}
 
-public:
   unsigned srcIdx;
   SmallVector<uint32_t, 4> lines;
 };
@@ -326,7 +324,7 @@ class GCOVBlock {
   uint64_t count = 0;
   SmallVector<GCOVArc *, 2> pred;
   SmallVector<GCOVArc *, 2> succ;
-  SmallVector<GCOVLocation, 4> locations;
+  SmallVector<GCOVBlockLocation> locations;
   uint32_t lastLine;
   bool traversable = false;
   GCOVArc *incoming = nullptr;

llvm/lib/ProfileData/GCOV.cpp

@@ -457,7 +457,7 @@ void GCOVBlock::print(raw_ostream &OS) const {
     OS << "\n";
   }
   if (!locations.empty()) {
-    for (const GCOVLocation &loc : locations) {
+    for (const GCOVBlockLocation &loc : locations) {
       OS << "\tFile: " << loc.srcIdx << ": ";
       for (uint32_t N : loc.lines)
         OS << (N) << ",";
@@ -705,7 +705,7 @@ void Context::collectFunction(GCOVFunction &f, Summary &summary) {
   for (const GCOVBlock &b : f.blocksRange()) {
     if (b.locations.empty())
       continue;
-    for (const GCOVLocation &loc : b.locations) {
+    for (const GCOVBlockLocation &loc : b.locations) {
       SourceInfo &locSource = sources[loc.srcIdx];
       uint32_t maxLineNum = *llvm::max_element(loc.lines);
       if (maxLineNum >= locSource.lines.size())

llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp

@@ -320,7 +320,7 @@ namespace {
     GCOVBlock(GCOVProfiler *P, uint32_t Number)
         : GCOVRecord(P), Number(Number) {}
 
-    SmallVector<GCOVLines, 4> Lines;
+    SmallVector<GCOVLines> Lines;
   };
 
   // A function has a unique identifier, a checksum (we leave as zero) and a