Index: test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov
+++ test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov
@@ -7,7 +7,7 @@
 // CHECK-NEXT:        -:    2:#include <stdio.h>
 // CHECK-NEXT:        -:    3:#include <stdlib.h>
 // CHECK-NEXT:        -:    4:
-// CHECK-NEXT:        -:    5:int main(int argc, char *argv[]) {
+// CHECK-NEXT:        1:    5:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        1:    6:  dlerror();
 // CHECK-NEXT:        1:    7:  void *f1_handle = dlopen("func.shared", RTLD_LAZY | RTLD_GLOBAL);
 // CHECK-NEXT:        1:    8:  if (f1_handle == NULL) {
Index: test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov
+++ test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov
@@ -7,7 +7,7 @@
 // CHECK-NEXT:        -:    2:#include <stdio.h>
 // CHECK-NEXT:        -:    3:#include <stdlib.h>
 // CHECK-NEXT:        -:    4:
-// CHECK-NEXT:        -:    5:int main(int argc, char *argv[]) {
+// CHECK-NEXT:        1:    5:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        1:    6:  dlerror();
 // CHECK-NEXT:        1:    7:  void *f1_handle = dlopen("func.shared", RTLD_LAZY | RTLD_GLOBAL);
 // CHECK-NEXT:        1:    8:  if (f1_handle == NULL) {
Index: test/profile/Inputs/instrprof-dlopen-func.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-dlopen-func.c.gcov
+++ test/profile/Inputs/instrprof-dlopen-func.c.gcov
@@ -3,4 +3,4 @@
 // CHECK-NEXT:        -:    0:Data:instrprof-dlopen-func.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
-// CHECK-NEXT:        1:    1:void func(int K) {}
+// CHECK-NEXT:        2:    1:void func(int K) {}
Index: test/profile/Inputs/instrprof-dlopen-func2.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-dlopen-func2.c.gcov
+++ test/profile/Inputs/instrprof-dlopen-func2.c.gcov
@@ -3,4 +3,4 @@
 // CHECK-NEXT:        -:    0:Data:instrprof-dlopen-func2.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
-// CHECK-NEXT:        1:    1:void func2(int K) {}
+// CHECK-NEXT:        2:    1:void func2(int K) {}
Index: test/profile/Inputs/instrprof-dlopen-func3.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-dlopen-func3.c.gcov
+++ test/profile/Inputs/instrprof-dlopen-func3.c.gcov
@@ -3,4 +3,4 @@
 // CHECK-NEXT:        -:    0:Data:instrprof-dlopen-func2.gcda
 // CHECK-NEXT:        -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
-// CHECK-NEXT:        1:    1:void func2(int K) {}
+// CHECK-NEXT:        2:    1:void func2(int K) {}
Index: test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
===================================================================
--- test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
+++ test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
@@ -5,10 +5,10 @@
 // CHECK-NEXT:        -:    0:Programs:1
 // CHECK-NEXT:        -:    1:#include <string>
 // CHECK-NEXT:        -:    2:
-// CHECK-NEXT:        -:    3:void asd(std::string i) {
+// CHECK-NEXT:        1:    3:void asd(std::string i) {
 // CHECK-NEXT:        2:    4:}
 // CHECK-NEXT:        -:    5:
-// CHECK-NEXT:        -:    6:int main(void)
+// CHECK-NEXT:        1:    6:int main(void)
 // CHECK-NEXT:        -:    7:{
 // CHECK-NEXT:        1:    8:  asd("22");
 // CHECK-NEXT:        -:    9:
Index: test/profile/Inputs/instrprof-shared-lib.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-lib.c.gcov
+++ test/profile/Inputs/instrprof-shared-lib.c.gcov
@@ -6,7 +6,7 @@
 // CHECK-NEXT:        -:    1:int g1 = 0;
 // CHECK-NEXT:        -:    2:int g2 = 1;
 // CHECK-NEXT:        -:    3:
-// CHECK-NEXT:        -:    4:void foo(int n) {
+// CHECK-NEXT:        1:    4:void foo(int n) {
 // CHECK-NEXT:        1:    5:  if (n % 5 == 0)
 // CHECK-NEXT:    #####:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
Index: test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov
+++ test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov
@@ -6,7 +6,7 @@
 // CHECK-NEXT:        -:    1:int g1 = 0;
 // CHECK-NEXT:        -:    2:int g2 = 1;
 // CHECK-NEXT:        -:    3:
-// CHECK-NEXT:        -:    4:void foo(int n) {
+// CHECK-NEXT:        2:    4:void foo(int n) {
 // CHECK-NEXT:        2:    5:  if (n % 5 == 0)
 // CHECK-NEXT:    #####:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
Index: test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov
+++ test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov
@@ -6,7 +6,7 @@
 // CHECK-NEXT:        -:    1:int g1 = 0;
 // CHECK-NEXT:        -:    2:int g2 = 1;
 // CHECK-NEXT:        -:    3:
-// CHECK-NEXT:        -:    4:void foo(int n) {
+// CHECK-NEXT:  1000000:    4:void foo(int n) {
 // CHECK-NEXT:  1000000:    5:  if (n % 5 == 0)
 // CHECK-NEXT:   360000:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
Index: test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov
+++ test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov
@@ -9,14 +9,14 @@
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
-// CHECK-NEXT:        -:    7:void bar(int n) {
+// CHECK-NEXT:        1:    7:void bar(int n) {
 // CHECK-NEXT:        1:    8:  if (n % 5 == 0)
 // CHECK-NEXT:        1:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
 // CHECK-NEXT:        1:   12:}
 // CHECK-NEXT:        -:   13:
-// CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
+// CHECK-NEXT:        1:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
 // CHECK-NEXT:        1:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
Index: test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov
+++ test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov
@@ -9,14 +9,14 @@
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
-// CHECK-NEXT:        -:    7:void bar(int n) {
+// CHECK-NEXT:        3:    7:void bar(int n) {
 // CHECK-NEXT:        3:    8:  if (n % 5 == 0)
 // CHECK-NEXT:        3:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
 // CHECK-NEXT:        3:   12:}
 // CHECK-NEXT:        -:   13:
-// CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
+// CHECK-NEXT:        1:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
 // CHECK-NEXT:        -:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
Index: test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov
+++ test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov
@@ -9,14 +9,14 @@
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
-// CHECK-NEXT:        -:    7:void bar(int n) {
+// CHECK-NEXT:        3:    7:void bar(int n) {
 // CHECK-NEXT:        3:    8:  if (n % 5 == 0)
 // CHECK-NEXT:        3:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
 // CHECK-NEXT:        3:   12:}
 // CHECK-NEXT:        -:   13:
-// CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
+// CHECK-NEXT:        1:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
 // CHECK-NEXT:        1:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
Index: test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov
+++ test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov
@@ -9,14 +9,14 @@
 // CHECK-NEXT:        -:    4:int bar1 = 0;
 // CHECK-NEXT:        -:    5:int bar2 = 1;
 // CHECK-NEXT:        -:    6:
-// CHECK-NEXT:        -:    7:void bar(int n) {
+// CHECK-NEXT:        3:    7:void bar(int n) {
 // CHECK-NEXT:        3:    8:  if (n % 5 == 0)
 // CHECK-NEXT:        3:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
 // CHECK-NEXT:        3:   12:}
 // CHECK-NEXT:        -:   13:
-// CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
+// CHECK-NEXT:        1:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
 // CHECK-NEXT:        1:   16:  foo(1);
 // CHECK-NEXT:        -:   17:#endif
Index: test/profile/Inputs/instrprof-shared-main.c.gcov
===================================================================
--- test/profile/Inputs/instrprof-shared-main.c.gcov
+++ test/profile/Inputs/instrprof-shared-main.c.gcov
@@ -6,7 +6,7 @@
 // CHECK-NEXT:        -:    1:extern int g1, g2;
 // CHECK-NEXT:        -:    2:extern void foo(int n);
 // CHECK-NEXT:        -:    3:
-// CHECK-NEXT:        -:    4:int main() {
+// CHECK-NEXT:        1:    4:int main() {
 // CHECK-NEXT:        -:    5:  int i, j;
 // CHECK-NEXT:     2002:    6:  for (i = 0; i < 1000; i++)
 // CHECK-NEXT:  2002000:    7:    for (j = 0; j < 1000; j++)