[profile] Revert commit https://reviews.llvm.org/rL342718

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@342913 91177308-0d34-0410-b5e6-96231b3b80d8

16 files changed, 20 insertions, 19 deletions

diff --git a/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov b/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov
index 71ffe373e..acb2076fd 100644
--- a/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov
+++ b/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov
@@ -87,5 +87,5 @@
 // CHECK-NEXT:    #####:   82:    g2++;
 // CHECK-NEXT:        -:   83:
 // CHECK-NEXT:        1:   84:  return EXIT_SUCCESS;
-// CHECK-NEXT:        -:   85:}
+// CHECK-NEXT:        1:   85:}
 // CHECK-NEXT:        -:   86:
diff --git a/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov b/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov
index fe997743e..97eef4c3b 100644
--- a/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov
+++ b/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov
@@ -87,5 +87,5 @@
 // CHECK-NEXT:    #####:   82:    g2++;
 // CHECK-NEXT:        -:   83:
 // CHECK-NEXT:        1:   84:  return EXIT_SUCCESS;
-// CHECK-NEXT:        -:   85:}
+// CHECK-NEXT:        1:   85:}
 // CHECK-NEXT:        -:   86:
diff --git a/test/profile/Inputs/instrprof-dlopen-func.c.gcov b/test/profile/Inputs/instrprof-dlopen-func.c.gcov
index 6eff91852..3af4ec94a 100644
--- a/test/profile/Inputs/instrprof-dlopen-func.c.gcov
+++ b/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:void func(int K) {}
+// CHECK-NEXT:        1:    1:void func(int K) {}
diff --git a/test/profile/Inputs/instrprof-dlopen-func2.c.gcov b/test/profile/Inputs/instrprof-dlopen-func2.c.gcov
index 3fc16b126..7101f74b9 100644
--- a/test/profile/Inputs/instrprof-dlopen-func2.c.gcov
+++ b/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:void func2(int K) {}
+// CHECK-NEXT:        1:    1:void func2(int K) {}
diff --git a/test/profile/Inputs/instrprof-dlopen-func3.c.gcov b/test/profile/Inputs/instrprof-dlopen-func3.c.gcov
index 3fc16b126..7101f74b9 100644
--- a/test/profile/Inputs/instrprof-dlopen-func3.c.gcov
+++ b/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:void func2(int K) {}
+// CHECK-NEXT:        1:    1:void func2(int K) {}
diff --git a/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov b/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
index 7e5e3fc0e..2a7b72488 100644
--- a/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
+++ b/test/profile/Inputs/instrprof-gcov-exceptions.cpp.gcov
@@ -6,7 +6,7 @@
 // CHECK-NEXT:        -:    1:#include <string>
 // CHECK-NEXT:        -:    2:
 // CHECK-NEXT:        -:    3:void asd(std::string i) {
-// CHECK-NEXT:        -:    4:}
+// CHECK-NEXT:        1:    4:}
 // CHECK-NEXT:        -:    5:
 // CHECK-NEXT:        -:    6:int main(void)
 // CHECK-NEXT:        -:    7:{
diff --git a/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov b/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov
index c173d6d7b..92532af30 100644
--- a/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov
+++ b/test/profile/Inputs/instrprof-gcov-multiple-bbs-single-line.c.gcov
@@ -13,7 +13,7 @@
 // CHECK-NEXT:branch  0 taken 1
 // CHECK-NEXT:branch  1 taken 0
 // CHECK-NEXT:        1:    7:    var++;
-// CHECK-NEXT:        -:    8:  }
+// CHECK-NEXT:        1:    8:  }
 // CHECK-NEXT:        -:    9:
 // CHECK-NEXT:        1:   10:  if (a) {}
 // CHECK-NEXT:branch  0 taken 1
@@ -24,7 +24,7 @@
 // CHECK-NEXT:branch  0 taken 0
 // CHECK-NEXT:branch  1 taken 1
 // CHECK-NEXT:    #####:   14:    var++;
-// CHECK-NEXT:        -:   15:  }
+// CHECK-NEXT:    #####:   15:  }
 // CHECK-NEXT:        -:   16:
 // CHECK-NEXT:        1:   17:  if (b) {}
 // CHECK-NEXT:branch  0 taken 0
diff --git a/test/profile/Inputs/instrprof-shared-lib.c.gcov b/test/profile/Inputs/instrprof-shared-lib.c.gcov
index 6e11c717d..fbc43d5f7 100644
--- a/test/profile/Inputs/instrprof-shared-lib.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-lib.c.gcov
@@ -11,4 +11,4 @@
 // CHECK-NEXT:    #####:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
 // CHECK-NEXT:        1:    8:    g2++;
-// CHECK-NEXT:        -:    9:}
+// CHECK-NEXT:        1:    9:}
diff --git a/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov b/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov
index a0bb1f885..779c885d8 100644
--- a/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-lib_called-twice.c.gcov
@@ -11,4 +11,4 @@
 // CHECK-NEXT:    #####:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
 // CHECK-NEXT:        2:    8:    g2++;
-// CHECK-NEXT:        -:    9:}
+// CHECK-NEXT:        2:    9:}
diff --git a/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov b/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov
index 84da7c97e..76503d914 100644
--- a/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-lib_in-loop.c.gcov
@@ -11,4 +11,4 @@
 // CHECK-NEXT:   360000:    6:    g1++;
 // CHECK-NEXT:        -:    7:  else
 // CHECK-NEXT:   640000:    8:    g2++;
-// CHECK-NEXT:        -:    9:}
+// CHECK-NEXT:  1000000:    9:}
diff --git a/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov b/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov
index 49c1fc7bb..b2dfe2acd 100644
--- a/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-main-gcov-flush_no-writeout.c.gcov
@@ -14,7 +14,7 @@
 // CHECK-NEXT:        1:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
-// CHECK-NEXT:        -:   12:}
+// CHECK-NEXT:        1:   12:}
 // CHECK-NEXT:        -:   13:
 // CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
@@ -38,4 +38,4 @@
 // CHECK-NEXT:        -:   33:  bar(5);
 // CHECK-NEXT:        -:   34:
 // CHECK-NEXT:        -:   35:  return 0;
-// CHECK-NEXT:        -:   36:}
+// CHECK-NEXT:    #####:   36:}
diff --git a/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov b/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov
index d8003cede..f70e34e52 100644
--- a/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-after.c.gcov
@@ -14,7 +14,7 @@
 // CHECK-NEXT:        3:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
-// CHECK-NEXT:        -:   12:}
+// CHECK-NEXT:        3:   12:}
 // CHECK-NEXT:        -:   13:
 // CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
diff --git a/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov b/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov
index 7f103cf97..b9ecff698 100644
--- a/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before-after.c.gcov
@@ -14,7 +14,7 @@
 // CHECK-NEXT:        3:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
-// CHECK-NEXT:        -:   12:}
+// CHECK-NEXT:        3:   12:}
 // CHECK-NEXT:        -:   13:
 // CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
diff --git a/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov b/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov
index c893d7c1f..7c9e0afa1 100644
--- a/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-main-gcov-flush_shared-call-before.c.gcov
@@ -14,7 +14,7 @@
 // CHECK-NEXT:        3:    9:    bar1++;
 // CHECK-NEXT:        -:   10:  else
 // CHECK-NEXT:    #####:   11:    bar2++;
-// CHECK-NEXT:        -:   12:}
+// CHECK-NEXT:        3:   12:}
 // CHECK-NEXT:        -:   13:
 // CHECK-NEXT:        -:   14:int main(int argc, char *argv[]) {
 // CHECK-NEXT:        -:   15:#ifdef SHARED_CALL_BEFORE_GCOV_FLUSH
diff --git a/test/profile/Inputs/instrprof-shared-main.c.gcov b/test/profile/Inputs/instrprof-shared-main.c.gcov
index 9694acc1a..1636ca635 100644
--- a/test/profile/Inputs/instrprof-shared-main.c.gcov
+++ b/test/profile/Inputs/instrprof-shared-main.c.gcov
@@ -10,9 +10,9 @@
 // CHECK-NEXT:        -:    5:  int i, j;
 // CHECK-NEXT:     1001:    6:  for (i = 0; i < 1000; i++)
 // CHECK-NEXT:  1001000:    7:    for (j = 0; j < 1000; j++)
-// CHECK-NEXT:  1000000:    8:      foo(i * j);
+// CHECK-NEXT:  1001000:    8:      foo(i * j);
 // CHECK-NEXT:        -:    9:
 // CHECK-NEXT:        1:   10:  if (g2 - g1 == 280001)
 // CHECK-NEXT:        1:   11:    return 0;
 // CHECK-NEXT:    #####:   12:  return 1;
-// CHECK-NEXT:        -:   13:}
+// CHECK-NEXT:        1:   13:}
diff --git a/test/profile/instrprof-gcov-exceptions.test b/test/profile/instrprof-gcov-exceptions.test
index 073200e6c..20ca47a95 100644
--- a/test/profile/instrprof-gcov-exceptions.test
+++ b/test/profile/instrprof-gcov-exceptions.test
@@ -17,4 +17,5 @@ RUN: test -f instrprof-gcov-exceptions.gcno
 RUN: rm -f instrprof-gcov-exceptions.gcda
 RUN: %run %t
 RUN: llvm-cov gcov instrprof-gcov-exceptions.gcda
-RUN: FileCheck --match-full-lines --strict-whitespace --input-file instrprof-gcov-exceptions.cpp.gcov %S/Inputs/instrprof-gcov-exceptions.cpp.gcov
+# The result should be the same, not using XFAIL as only this part of the test is failing.
+RUN: not FileCheck --match-full-lines --strict-whitespace --input-file instrprof-gcov-exceptions.cpp.gcov %S/Inputs/instrprof-gcov-exceptions.cpp.gcov