[OpenMP][Tool] Fix memory leak and double-allocation

[protze.joachim]

Summary

Fix the memory leak pointed out in https://reviews.llvm.org/D70412.
And a second one due to double-allocation.

[Hahnfeld]

openmp/tools/archer/ompt-tsan.cpp

864–865

Why do we need tsan_flags globally? It's again deleted further below, you can just put it onto the stack.

[protze.joachim]

You are right, with the current usage a local variable works.

[Hahnfeld]

openmp/tools/archer/ompt-tsan.cpp

864–865

Why do we need to new this? Even though not really critical, it'll be leaked in all the error cases below.

It should be easier to do the following:

TsanFlags tsan_flags(options);

[protze.joachim]

Agreed

[Hahnfeld]

LG

[protze.joachim]

@hans please include to the 10.0 branch

[hans]

Cherry-picked to 10.x in a10f87d5695bdd4f1e366c82fd2869f0fe1d4cfe

openmp/tools/archer/ompt-tsan.cpp

 
 #if (LLVM_VERSION) >= 40
 extern "C" {
 int __attribute__((weak)) __archer_get_omp_status();
 void __attribute__((weak)) __tsan_flush_memory() {}
 }
 #endif
 ArcherFlags *archer_flags;
-TsanFlags *tsan_flags;
 
 // The following definitions are pasted from "llvm/Support/Compiler.h" to allow
 // the code
 // to be compiled with other compilers like gcc:
 
 #ifndef TsanHappensBefore
 // Thread Sanitizer is a tool that finds races in code.
 // See http://code.google.com/p/data-race-test/wiki/DynamicAnnotations .
do {                                                           \
     SET_OPTIONAL_CALLBACK_T(event, type, res, ompt_set_always);  \
   } while (0)
 
 #define SET_CALLBACK(event) SET_CALLBACK_T(event, event)
 
 static int ompt_tsan_initialize(ompt_function_lookup_t lookup,
                                 int device_num,
                                 ompt_data_t *tool_data) {
-  const char *options = getenv("ARCHER_OPTIONS");
-  archer_flags = new ArcherFlags(options);
-  options = getenv("TSAN_OPTIONS");
-  tsan_flags = new TsanFlags(options);
+  const char *options = getenv("TSAN_OPTIONS");
+  TsanFlags *tsan_flags = new TsanFlags(options);
 
   ompt_set_callback_t ompt_set_callback =
       (ompt_set_callback_t)lookup("ompt_set_callback");
   if (ompt_set_callback == NULL) {
     std::cerr << "Could not set callback, exiting..." << std::endl;
     std::exit(1);
   }
   ompt_get_parallel_info =
static int ompt_tsan_initialize(ompt_function_lookup_t lookup,
   SET_CALLBACK_T(mutex_released, mutex);
   SET_OPTIONAL_CALLBACK_T(reduction, sync_region, hasReductionCallback, ompt_set_never);
 
   if (!tsan_flags->ignore_noninstrumented_modules)
     fprintf(
         stderr,
         "Warning: please export TSAN_OPTIONS='ignore_noninstrumented_modules=1' "
         "to avoid false positive reports from the OpenMP runtime.!\n");
+  delete tsan_flags;
   return 1; // success
 }
 
 static void ompt_tsan_finalize(ompt_data_t *tool_data) {
   if (archer_flags->print_max_rss) {
     struct rusage end;
     getrusage(RUSAGE_SELF, &end);
     printf("MAX RSS[KBytes] during execution: %ld\n", end.ru_maxrss);