[gcov] Add __gcov_dump/__gcov_reset and delete __gcov_flush

[MaskRay]

Summary

GCC r187297 (2012-05) introduced __gcov_dump and __gcov_reset.

`__gcov_flush = __gcov_dump + __gcov_reset`

https://gcc.gnu.org/PR93623 (target GCC 11.0) removed the unuseful and undocumented __gcov_flush.

[serge-sans-paille]

Some nit-picking, lgtm otherwise. Please wait for @calixte review though :-)

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c

49

Do we also need to test gcov_flush symbol here too?

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov

56

Same question here, what about gcov_flush symbol?

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov

55

And here.

[MaskRay]

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c

49

__gcov_flush is deleted. We don't need to test it.

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov

56

__gcov_flush is deleted. We don't need to test it.

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov

55

__gcov_flush is deleted. We don't need to test it.

[serge-sans-paille]

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c

49

Sorry, I meant __gcov_dump

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov

56

Sorry, I meant __gcov_dump

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov

55

Sorry, I meant __gcov_dump

[MaskRay]

Test __gcov_dump

[MaskRay]

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov is clumsy to update. The filename is also wrong: gcov has nothing to do with instrprof.

I'll update the tests separately like my fba8523fb55c8e3bc853df7a250845cf51e5fc99

[MaskRay]

Ping:)

[serge-sans-paille]

LGTM, I still would appreciate @calixte feedback here.

[calixte]

LGTM

clang/lib/Driver/ToolChains/Darwin.cpp

void Darwin::addProfileRTLibs(const ArgList &Args,
 
   bool ForGCOV = needsGCovInstrumentation(Args);
 
   // If we have a symbol export directive and we're linking in the profile
   // runtime, automatically export symbols necessary to implement some of the
   // runtime's functionality.
   if (hasExportSymbolDirective(Args)) {
     if (ForGCOV) {
-      addExportedSymbol(CmdArgs, "___gcov_flush");
+      addExportedSymbol(CmdArgs, "___gcov_dump");
+      addExportedSymbol(CmdArgs, "___gcov_reset");
       addExportedSymbol(CmdArgs, "_flush_fn_list");
       addExportedSymbol(CmdArgs, "_writeout_fn_list");
       addExportedSymbol(CmdArgs, "_reset_fn_list");
     } else {
       addExportedSymbol(CmdArgs, "___llvm_profile_filename");
       addExportedSymbol(CmdArgs, "___llvm_profile_raw_version");
     }
     addExportedSymbol(CmdArgs, "_lprofDirMode");

clang/test/Driver/darwin-ld.c

 // RUN: %clang -target x86_64-apple-darwin12 -fprofile-arcs -Wl,-exported_symbols_list,/dev/null -### %t.o 2> %t.log
 // RUN: FileCheck -check-prefix=GCOV_EXPORT %s < %t.log
 // RUN: %clang -target x86_64-apple-darwin12 -fprofile-arcs -Wl,-exported_symbol,foo -### %t.o 2> %t.log
 // RUN: FileCheck -check-prefix=GCOV_EXPORT %s < %t.log
 // RUN: %clang -target x86_64-apple-darwin12 -fprofile-arcs -Xlinker -exported_symbol -Xlinker foo -### %t.o 2> %t.log
 // RUN: FileCheck -check-prefix=GCOV_EXPORT %s < %t.log
 // RUN: %clang -target x86_64-apple-darwin12 -fprofile-arcs -Xlinker -exported_symbols_list -Xlinker /dev/null -### %t.o 2> %t.log
 // RUN: FileCheck -check-prefix=GCOV_EXPORT %s < %t.log
-// GCOV_EXPORT: "-exported_symbol" "___gcov_flush"
+// GCOV_EXPORT: "-exported_symbol" "___gcov_dump"
+// GCOV_EXPORT: "-exported_symbol" "___gcov_reset"
 //
 // Check that we can pass the outliner down to the linker.
 // RUN: env IPHONEOS_DEPLOYMENT_TARGET=7.0 \
 // RUN:   %clang -target arm64-apple-darwin -moutline -### %t.o 2> %t.log
 // RUN: FileCheck -check-prefix=MOUTLINE %s < %t.log
 // MOUTLINE: {{ld(.exe)?"}}
 // MOUTLINE-SAME: "-mllvm" "-enable-machine-outliner" "-mllvm" "-enable-linkonceodr-outlining"
 // RUN: env IPHONEOS_DEPLOYMENT_TARGET=7.0 \
 // RUN:   %clang -target arm64-apple-darwin -mno-outline -### %t.o 2> %t.log
 // RUN: FileCheck -check-prefix=MNO_OUTLINE %s < %t.log
 // MNO_OUTLINE: {{ld(.exe)?"}}
 // MNO_OUTLINE-SAME: "-mllvm" "-enable-machine-outliner=never"

compiler-rt/lib/profile/GCDAProfiling.c

 __attribute__((destructor(100)))
 #endif
 static void llvm_writeout_and_clear(void) {
   llvm_writeout_files();
   fn_list_remove(&writeout_fn_list);
 }
 
 COMPILER_RT_VISIBILITY
-void llvm_register_flush_function(fn_ptr fn) {
-  fn_list_insert(&flush_fn_list, fn);
-}
-
-void __gcov_flush() {
-  struct fn_node* curr = flush_fn_list.head;
-
-  while (curr) {
-    curr->fn();
-    curr = curr->next;
-  }
-}
-
-COMPILER_RT_VISIBILITY
-void llvm_delete_flush_function_list(void) {
-  fn_list_remove(&flush_fn_list);
-}
-
-COMPILER_RT_VISIBILITY
 void llvm_register_reset_function(fn_ptr fn) {
   fn_list_insert(&reset_fn_list, fn);
 }
 
 COMPILER_RT_VISIBILITY
 void llvm_delete_reset_function_list(void) { fn_list_remove(&reset_fn_list); }
 
 COMPILER_RT_VISIBILITY
if (child_pid != parent_pid) {
       llvm_reset_counters();
     }
   }
   return pid;
 }
 #endif
 
 COMPILER_RT_VISIBILITY
-void llvm_gcov_init(fn_ptr wfn, fn_ptr ffn, fn_ptr rfn) {
+void llvm_gcov_init(fn_ptr wfn, fn_ptr rfn) {
   static int atexit_ran = 0;
 
   if (wfn)
     llvm_register_writeout_function(wfn);
 
-  if (ffn)
-    llvm_register_flush_function(ffn);
-
   if (rfn)
     llvm_register_reset_function(rfn);
 
   if (atexit_ran == 0) {
     atexit_ran = 1;
 
     /* Make sure we write out the data and delete the data structures. */
     atexit(llvm_delete_reset_function_list);
-    atexit(llvm_delete_flush_function_list);
 #ifdef _WIN32
     atexit(llvm_writeout_and_clear);
 #endif
   }
 }
 
+void __gcov_dump(void) {
+  for (struct fn_node *f = writeout_fn_list.head; f; f = f->next)
+    f->fn();
+}
+
+void __gcov_reset(void) {
+  for (struct fn_node *f = reset_fn_list.head; f; f = f->next)
+    f->fn();
+}
+
 #endif

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c

#ifdef USE_LIB3
   if (func3 == NULL) {
     fprintf(stderr, "unable to lookup symbol 'func3': %s\n", dlerror());
     return EXIT_FAILURE;
   }
   func3();
 #endif
 
   dlerror();
-  void (*gcov_flush1)() = (void (*)())dlsym(f1_handle, "__gcov_flush");
-  if (gcov_flush1 == NULL) {
-    fprintf(stderr, "unable to find __gcov_flush in func.shared': %s\n", dlerror());
+  void (*gcov_reset1)() = (void (*)())dlsym(f1_handle, "__gcov_reset");
+  if (gcov_reset1 == NULL) {
+    fprintf(stderr, "unable to find __gcov_reset in func.shared': %s\n", dlerror());
     return EXIT_FAILURE;
   }
 
   dlerror();
-  void (*gcov_flush2)() = (void (*)())dlsym(f2_handle, "__gcov_flush");
-  if (gcov_flush2 == NULL) {
-    fprintf(stderr, "unable to find __gcov_flush in func2.shared': %s\n", dlerror());
+  void (*gcov_reset2)() = (void (*)())dlsym(f2_handle, "__gcov_reset");
+  if (gcov_reset2 == NULL) {
+    fprintf(stderr, "unable to find __gcov_reset in func2.shared': %s\n", dlerror());
     return EXIT_FAILURE;
   }
 
-  if (gcov_flush1 == gcov_flush2) {
-    fprintf(stderr, "Same __gcov_flush found in func.shared and func2.shared\n");
+  if (gcov_reset1 == gcov_reset2) {
+    fprintf(stderr, "Same __gcov_reset found in func.shared and func2.shared\n");
     return EXIT_FAILURE;
   }
 
   dlerror();
   if (dlclose(f2_handle) != 0) {
     fprintf(stderr, "unable to close 'func2.shared': %s\n", dlerror());
     return EXIT_FAILURE;
   }

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main.c.gcov

 // CHECK-NEXT:        -:   41:  if (func3 == NULL) {
 // CHECK-NEXT:        -:   42:    fprintf(stderr, "unable to lookup symbol 'func3': %s\n", dlerror());
 // CHECK-NEXT:        -:   43:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   44:  }
 // CHECK-NEXT:        -:   45:  func3();
 // CHECK-NEXT:        -:   46:#endif
 // CHECK-NEXT:        -:   47:
 // CHECK-NEXT:        1:   48:  dlerror();
-// CHECK-NEXT:        1:   49:  void (*gcov_flush1)() = (void (*)())dlsym(f1_handle, "__gcov_flush");
-// CHECK-NEXT:        1:   50:  if (gcov_flush1 == NULL) {
-// CHECK-NEXT:    #####:   51:    fprintf(stderr, "unable to find __gcov_flush in func.shared': %s\n", dlerror());
+// CHECK-NEXT:        1:   49:  void (*gcov_reset1)() = (void (*)())dlsym(f1_handle, "__gcov_reset");
+// CHECK-NEXT:        1:   50:  if (gcov_reset1 == NULL) {
+// CHECK-NEXT:    #####:   51:    fprintf(stderr, "unable to find __gcov_reset in func.shared': %s\n", dlerror());
 // CHECK-NEXT:    #####:   52:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   53:  }
 // CHECK-NEXT:        -:   54:
 // CHECK-NEXT:        1:   55:  dlerror();
-// CHECK-NEXT:        1:   56:  void (*gcov_flush2)() = (void (*)())dlsym(f2_handle, "__gcov_flush");
-// CHECK-NEXT:        1:   57:  if (gcov_flush2 == NULL) {
-// CHECK-NEXT:    #####:   58:    fprintf(stderr, "unable to find __gcov_flush in func2.shared': %s\n", dlerror());
+// CHECK-NEXT:        1:   56:  void (*gcov_reset2)() = (void (*)())dlsym(f2_handle, "__gcov_reset");
+// CHECK-NEXT:        1:   57:  if (gcov_reset2 == NULL) {
+// CHECK-NEXT:    #####:   58:    fprintf(stderr, "unable to find __gcov_reset in func2.shared': %s\n", dlerror());
 // CHECK-NEXT:    #####:   59:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   60:  }
 // CHECK-NEXT:        -:   61:
-// CHECK-NEXT:        1:   62:  if (gcov_flush1 == gcov_flush2) {
-// CHECK-NEXT:    #####:   63:    fprintf(stderr, "Same __gcov_flush found in func.shared and func2.shared\n");
+// CHECK-NEXT:        1:   62:  if (gcov_reset1 == gcov_reset2) {
+// CHECK-NEXT:    #####:   63:    fprintf(stderr, "Same __gcov_reset found in func.shared and func2.shared\n");
 // CHECK-NEXT:    #####:   64:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   65:  }
 // CHECK-NEXT:        -:   66:
 // CHECK-NEXT:        1:   67:  dlerror();
 // CHECK-NEXT:        1:   68:  if (dlclose(f2_handle) != 0) {
 // CHECK-NEXT:    #####:   69:    fprintf(stderr, "unable to close 'func2.shared': %s\n", dlerror());
 // CHECK-NEXT:    #####:   70:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   71:  }

compiler-rt/test/profile/Inputs/instrprof-dlopen-dlclose-main_three-libs.c.gcov

 // CHECK-NEXT:        1:   41:  if (func3 == NULL) {
 // CHECK-NEXT:    #####:   42:    fprintf(stderr, "unable to lookup symbol 'func3': %s\n", dlerror());
 // CHECK-NEXT:    #####:   43:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   44:  }
 // CHECK-NEXT:        1:   45:  func3();
 // CHECK-NEXT:        -:   46:#endif
 // CHECK-NEXT:        -:   47:
 // CHECK-NEXT:        1:   48:  dlerror();
-// CHECK-NEXT:        1:   49:  void (*gcov_flush1)() = (void (*)())dlsym(f1_handle, "__gcov_flush");
-// CHECK-NEXT:        1:   50:  if (gcov_flush1 == NULL) {
-// CHECK-NEXT:    #####:   51:    fprintf(stderr, "unable to find __gcov_flush in func.shared': %s\n", dlerror());
+// CHECK-NEXT:        1:   49:  void (*gcov_reset1)() = (void (*)())dlsym(f1_handle, "__gcov_reset");
+// CHECK-NEXT:        1:   50:  if (gcov_reset1 == NULL) {
+// CHECK-NEXT:    #####:   51:    fprintf(stderr, "unable to find __gcov_reset in func.shared': %s\n", dlerror());
 // CHECK-NEXT:    #####:   52:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   53:  }
 // CHECK-NEXT:        -:   54:
 // CHECK-NEXT:        1:   55:  dlerror();
-// CHECK-NEXT:        1:   56:  void (*gcov_flush2)() = (void (*)())dlsym(f2_handle, "__gcov_flush");
-// CHECK-NEXT:        1:   57:  if (gcov_flush2 == NULL) {
-// CHECK-NEXT:    #####:   58:    fprintf(stderr, "unable to find __gcov_flush in func2.shared': %s\n", dlerror());
+// CHECK-NEXT:        1:   56:  void (*gcov_reset2)() = (void (*)())dlsym(f2_handle, "__gcov_reset");
+// CHECK-NEXT:        1:   57:  if (gcov_reset2 == NULL) {
+// CHECK-NEXT:    #####:   58:    fprintf(stderr, "unable to find __gcov_reset in func2.shared': %s\n", dlerror());
 // CHECK-NEXT:    #####:   59:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   60:  }
 // CHECK-NEXT:        -:   61:
-// CHECK-NEXT:        1:   62:  if (gcov_flush1 == gcov_flush2) {
-// CHECK-NEXT:    #####:   63:    fprintf(stderr, "Same __gcov_flush found in func.shared and func2.shared\n");
+// CHECK-NEXT:        1:   62:  if (gcov_reset1 == gcov_reset2) {
+// CHECK-NEXT:    #####:   63:    fprintf(stderr, "Same __gcov_reset found in func.shared and func2.shared\n");
 // CHECK-NEXT:    #####:   64:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   65:  }
 // CHECK-NEXT:        -:   66:
 // CHECK-NEXT:        1:   67:  dlerror();
 // CHECK-NEXT:        1:   68:  if (dlclose(f2_handle) != 0) {
 // CHECK-NEXT:    #####:   69:    fprintf(stderr, "unable to close 'func2.shared': %s\n", dlerror());
 // CHECK-NEXT:    #####:   70:    return EXIT_FAILURE;
 // CHECK-NEXT:        -:   71:  }

compiler-rt/test/profile/Posix/gcov-shared-flush.c

 /// This test fails on Mac (https://bugs.llvm.org/show_bug.cgi?id=38134)
 // XFAIL: darwin
 
 // RUN: mkdir -p %t.d && cd %t.d
 
 // RUN: %clang -E -DSHARED %s -o shared.c
 // RUN: %clang --coverage -fPIC -shared shared.c -o libfunc.so
 // RUN: test -f shared.gcno
 
-/// Test the case where we exit abruptly after calling __gcov_flush, which means we don't write out the counters at exit.
+/// Test the case where we exit abruptly after calling __gcov_dump, which means we don't write out the counters at exit.
 // RUN: %clang -DEXIT_ABRUPTLY -DSHARED_CALL_BEFORE_FLUSH -DSHARED_CALL_AFTER_FLUSH --coverage %s -L%t.d -rpath %t.d -lfunc -o %t
 // RUN: test -f gcov-shared-flush.gcno
 
 // RUN: rm -f gcov-shared-flush.gcda shared.gcda
 // RUN: %run %t
 // RUN: llvm-cov gcov -t gcov-shared-flush.gcda | FileCheck %s --check-prefix=NO_WRITEOUT
 // RUN: llvm-cov gcov -t shared.gcda | FileCheck %s --check-prefix=SHARED
 
 // NO_WRITEOUT:      -: [[#%u,L:]]:#ifdef EXIT_ABRUPTLY
 // NO_WRITEOUT-NEXT: 1: [[#%u,L+1]]: _exit(0);
 
 // SHARED: 1: {{[[0-9]+}}:void foo(int n)
 
-/// Test the case where we exit normally and we have a call to the shared library function before __gcov_flush.
+/// Test the case where we exit normally and we have a call to the shared library function before __gcov_dump.
 // RUN: %clang -DSHARED_CALL_BEFORE_FLUSH --coverage %s -L%t.d -rpath %t.d -lfunc -o %t
 // RUN: test -f gcov-shared-flush.gcno
 
 // RUN: rm -f gcov-shared-flush.gcda shared.gcda
 // RUN: %run %t
 // RUN: llvm-cov gcov -t gcov-shared-flush.gcda | FileCheck %s --check-prefix=BEFORE
 // RUN: llvm-cov gcov -t shared.gcda | FileCheck %s --check-prefix=SHARED_ONCE
 
 // BEFORE:      -: {{[0-9]+}}:#ifdef SHARED_CALL_BEFORE_FLUSH
 // BEFORE-NEXT: 1: {{[0-9]+}}:  foo(1);
-// BEFORE:      1: {{[0-9]+}}:  __gcov_flush();
+// BEFORE:      1: {{[0-9]+}}:  __gcov_dump();
+// BEFORE-NEXT: 1: {{[0-9]+}}:  __gcov_reset();
 // BEFORE:      -: {{[0-9]+}}:#ifdef SHARED_CALL_AFTER_FLUSH
 // BEFORE-NEXT: -: {{[0-9]+}}:  foo(1);
 // BEFORE:      1: {{[0-9]+}}:  bar(5);
 
 // SHARED_ONCE: 1: {{[0-9]+}}:void foo(int n)
 
-// # Test the case where we exit normally and we have a call to the shared library function after __gcov_flush.
+// # Test the case where we exit normally and we have a call to the shared library function after __gcov_dump.
 // RUN: %clang -DSHARED_CALL_AFTER_FLUSH --coverage %s -L%t.d -rpath %t.d -lfunc -o %t
 // RUN: test -f gcov-shared-flush.gcno
 
 // RUN: rm -f gcov-shared-flush.gcda shared.gcda
 // RUN: %run %t
 // RUN: llvm-cov gcov -t gcov-shared-flush.gcda | FileCheck %s --check-prefix=AFTER
 // RUN: llvm-cov gcov -t shared.gcda > 2s.txt
 
 // AFTER:      -: {{[0-9]+}}:#ifdef SHARED_CALL_BEFORE_FLUSH
 // AFTER-NEXT: -: {{[0-9]+}}:  foo(1);
-// AFTER:      1: {{[0-9]+}}:  __gcov_flush();
+// AFTER:      1: {{[0-9]+}}:  __gcov_dump();
+// AFTER-NEXT: 1: {{[0-9]+}}:  __gcov_reset();
 // AFTER:      -: {{[0-9]+}}:#ifdef SHARED_CALL_AFTER_FLUSH
 // AFTER-NEXT: 1: {{[0-9]+}}:  foo(1);
 // AFTER:      1: {{[0-9]+}}:  bar(5);
 
-// # Test the case where we exit normally and we have calls to the shared library function before and after __gcov_flush.
+// # Test the case where we exit normally and we have calls to the shared library function before and after __gcov_dump.
 // RUN: %clang -DSHARED_CALL_BEFORE_FLUSH -DSHARED_CALL_AFTER_FLUSH --coverage %s -L%t.d -rpath %t.d -lfunc -o %t
 // RUN: test -f gcov-shared-flush.gcno
 
 // RUN: rm -f gcov-shared-flush.gcda shared.gcda
 // RUN: %run %t
 // RUN: llvm-cov gcov -t gcov-shared-flush.gcda | FileCheck %s --check-prefix=BEFORE_AFTER
 // RUN: llvm-cov gcov -t shared.gcda | FileCheck %s --check-prefix=SHARED_TWICE
 
 // BEFORE_AFTER:      -: {{[0-9]+}}:#ifdef SHARED_CALL_BEFORE_FLUSH
 // BEFORE_AFTER-NEXT: 1: {{[0-9]+}}:  foo(1);
-// BEFORE_AFTER:      1: {{[0-9]+}}:  __gcov_flush();
+// BEFORE_AFTER:      1: {{[0-9]+}}:  __gcov_dump();
+// BEFORE_AFTER-NEXT: 1: {{[0-9]+}}:  __gcov_reset();
 // BEFORE_AFTER:      -: {{[0-9]+}}:#ifdef SHARED_CALL_AFTER_FLUSH
 // BEFORE_AFTER-NEXT: 1: {{[0-9]+}}:  foo(1);
 // BEFORE_AFTER:      1: {{[0-9]+}}:  bar(5);
 
 // SHARED_TWICE: 2: {{[0-9]+}}:void foo(int n)
 
 #ifdef SHARED
 void foo(int n) {
 }
 #else
 extern void foo(int n);
-extern void __gcov_flush(void);
+extern void __gcov_dump(void);
+extern void __gcov_reset(void);
 
 int bar1 = 0;
 int bar2 = 1;
 
 void bar(int n) {
   if (n % 5 == 0)
     bar1++;
   else
     bar2++;
 }
 
 int main(int argc, char *argv[]) {
 #ifdef SHARED_CALL_BEFORE_FLUSH
   foo(1);
 #endif
 
   bar(5);
-  __gcov_flush();
+  __gcov_dump();
+  __gcov_reset();
   bar(5);
 
 #ifdef SHARED_CALL_AFTER_FLUSH
   foo(1);
 #endif
 
 #ifdef EXIT_ABRUPTLY
   _exit(0);
 #endif
 
   bar(5);
   return 0;
 }
 #endif

compiler-rt/test/profile/gcov-__gcov_flush-terminate.c

 /// https://bugs.llvm.org/show_bug.cgi?id=38067
 /// An abnormal exit does not clear execution counts of subsequent instructions.
 // RUN: mkdir -p %t.dir && cd %t.dir
 // RUN: %clang --coverage %s -o %t
 // RUN: test -f gcov-__gcov_flush-terminate.gcno
 
 // RUN: rm -f gcov-__gcov_flush-terminate.gcda && %expect_crash %run %t
 // RUN: llvm-cov gcov -t gcov-__gcov_flush-terminate.gcda | FileCheck %s
 
 // CHECK:             -:    0:Runs:1
 // CHECK-NEXT:        -:    0:Programs:1
 
-void __gcov_flush(void);
+void __gcov_dump(void);
+void __gcov_reset(void);
 
 int main(void) {                   // CHECK:      1: [[#@LINE]]:int main(void)
   int i = 22;                      // CHECK-NEXT: 1: [[#@LINE]]:
-  __gcov_flush();                  // CHECK-NEXT: 1: [[#@LINE]]:
+  __gcov_dump();                   // CHECK-NEXT: 1: [[#@LINE]]:
+  __gcov_reset();                  // CHECK-NEXT: 1: [[#@LINE]]:
   i = 42;                          // CHECK-NEXT: 1: [[#@LINE]]:
   __builtin_trap();                // CHECK-NEXT: 1: [[#@LINE]]:
   i = 84;                          // CHECK-NEXT: 1: [[#@LINE]]:
   return 0;                        // CHECK-NEXT: 1: [[#@LINE]]:
 }

compiler-rt/test/profile/gcov-dump-and-remove.c

 /// Test we close file handle on flush, so the .gcda file can be deleted on
 /// Windows while the process is still running. In addition, test we create
 /// a new .gcda on flush, so there is a file when the process exists.
 // RUN: mkdir -p %t.d && cd %t.d
 // RUN: %clang --coverage -o %t %s
 // RUN: test -f gcov-dump-and-remove.gcno
 
 // RUN: rm -f gcov-dump-and-remove.gcda && %run %t
 // RUN: llvm-cov gcov -t gcov-dump-and-remove.gcda | FileCheck %s
 
-extern void __gcov_flush(void);
+extern void __gcov_dump(void);
+extern void __gcov_reset(void);
 extern int remove(const char *);   // CHECK:          -: [[#@LINE]]:extern int remove
 int main(void) {                   // CHECK-NEXT: #####: [[#@LINE]]:
-  __gcov_flush();                  // CHECK-NEXT: #####: [[#@LINE]]:
+  __gcov_dump();                   // CHECK-NEXT: #####: [[#@LINE]]:
+  __gcov_reset();                  // CHECK-NEXT: #####: [[#@LINE]]:
   if (remove("gcov-dump-and-remove.gcda") != 0) // CHECK-NEXT: #####: [[#@LINE]]:
     return 1;                      // CHECK-NEXT: #####: [[#@LINE]]: return 1;
                                    // CHECK-NEXT:     -: [[#@LINE]]:
-  __gcov_flush();                  // CHECK-NEXT: #####: [[#@LINE]]:
-  __gcov_flush();                  // CHECK-NEXT: #####: [[#@LINE]]:
-  if (remove("gcov-dump-and-remove.gcda") != 0) // CHECK-NEXT: #####: [[#@LINE]]:
+  __gcov_dump();                   // CHECK-NEXT:     1: [[#@LINE]]:
+  __gcov_reset();                  // CHECK-NEXT:     1: [[#@LINE]]:
+  __gcov_dump();                   // CHECK-NEXT:     1: [[#@LINE]]:
+  if (remove("gcov-dump-and-remove.gcda") != 0) // CHECK-NEXT:     1: [[#@LINE]]:
     return 1;                      // CHECK-NEXT: #####: [[#@LINE]]: return 1;
 
   return 0;
 }

llvm/lib/Transforms/Instrumentation/GCOVProfiling.cpp

private:
   FunctionCallee getSummaryInfoFunc();
   FunctionCallee getEndFileFunc();
 
   // Add the function to write out all our counters to the global destructor
   // list.
   Function *
   insertCounterWriteout(ArrayRef<std::pair<GlobalVariable *, MDNode *>>);
   Function *insertReset(ArrayRef<std::pair<GlobalVariable *, MDNode *>>);
-  Function *insertFlush(Function *ResetF);
 
   bool AddFlushBeforeForkAndExec();
 
   enum class GCovFileType { GCNO, GCDA };
   std::string mangleName(const DICompileUnit *CU, GCovFileType FileType);
 
   GCOVOptions Options;
   support::endianness Endian;
for (auto &F : M->functions()) {
             Builder.CreateStore(Count, Counter);
           }
         }
       }
     }
 
     Function *WriteoutF = insertCounterWriteout(CountersBySP);
     Function *ResetF = insertReset(CountersBySP);
-    Function *FlushF = insertFlush(ResetF);
 
     // Create a small bit of code that registers the "__llvm_gcov_writeout" to
     // be executed at exit and the "__llvm_gcov_flush" function to be executed
     // when "__gcov_flush" is called.
     FunctionType *FTy = FunctionType::get(Type::getVoidTy(*Ctx), false);
     Function *F = Function::Create(FTy, GlobalValue::InternalLinkage,
                                    "__llvm_gcov_init", M);
     F->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
     F->setLinkage(GlobalValue::InternalLinkage);
     F->addFnAttr(Attribute::NoInline);
     if (Options.NoRedZone)
       F->addFnAttr(Attribute::NoRedZone);
 
     BasicBlock *BB = BasicBlock::Create(*Ctx, "entry", F);
     IRBuilder<> Builder(BB);
 
     FTy = FunctionType::get(Type::getVoidTy(*Ctx), false);
-    Type *Params[] = {PointerType::get(FTy, 0), PointerType::get(FTy, 0),
-                      PointerType::get(FTy, 0)};
-    FTy = FunctionType::get(Builder.getVoidTy(), Params, false);
+    auto *PFTy = PointerType::get(FTy, 0);
+    FTy = FunctionType::get(Builder.getVoidTy(), {PFTy, PFTy}, false);
 
     // Initialize the environment and register the local writeout, flush and
     // reset functions.
     FunctionCallee GCOVInit = M->getOrInsertFunction("llvm_gcov_init", FTy);
-    Builder.CreateCall(GCOVInit, {WriteoutF, FlushF, ResetF});
+    Builder.CreateCall(GCOVInit, {WriteoutF, ResetF});
     Builder.CreateRetVoid();
 
     appendToGlobalCtors(*M, F, 0);
     Result = true;
   }
 
   return Result;
 }
Function *GCOVProfiler::insertReset(
   else if (RetTy->isIntegerTy())
     // Used if __llvm_gcov_reset was implicitly declared.
     Builder.CreateRet(ConstantInt::get(RetTy, 0));
   else
     report_fatal_error("invalid return type for __llvm_gcov_reset");
 
   return ResetF;
 }
-
-Function *GCOVProfiler::insertFlush(Function *ResetF) {
-  FunctionType *FTy = FunctionType::get(Type::getVoidTy(*Ctx), false);
-  Function *FlushF = M->getFunction("__llvm_gcov_flush");
-  if (!FlushF)
-    FlushF = Function::Create(FTy, GlobalValue::InternalLinkage,
-                              "__llvm_gcov_flush", M);
-  FlushF->setUnnamedAddr(GlobalValue::UnnamedAddr::Global);
-  FlushF->addFnAttr(Attribute::NoInline);
-  if (Options.NoRedZone)
-    FlushF->addFnAttr(Attribute::NoRedZone);
-
-  BasicBlock *Entry = BasicBlock::Create(*Ctx, "entry", FlushF);
-
-  // Write out the current counters.
-  Function *WriteoutF = M->getFunction("__llvm_gcov_writeout");
-  assert(WriteoutF && "Need to create the writeout function first!");
-
-  IRBuilder<> Builder(Entry);
-  Builder.CreateCall(WriteoutF, {});
-  Builder.CreateCall(ResetF, {});
-
-  Type *RetTy = FlushF->getReturnType();
-  if (RetTy->isVoidTy())
-    Builder.CreateRetVoid();
-  else if (RetTy->isIntegerTy())
-    // Used if __llvm_gcov_flush was implicitly declared.
-    Builder.CreateRet(ConstantInt::get(RetTy, 0));
-  else
-    report_fatal_error("invalid return type for __llvm_gcov_flush");
-
-  return FlushF;
-}