From: Thomas Otto <thomas.otto@pdv-fs.de>
Date: Fri, 24 Jan 2020 18:17:54 +0000 (+0100)
Subject: Context: move output_cov
X-Git-Tag: v4.0~628^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=19b7034cf371d0691e5ffb3218f69833f3542151;p=thirdparty%2Fccache.git

Context: move output_cov
---

diff --git a/src/ccache.cpp b/src/ccache.cpp
index c583a27aa..49f1338d3 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1341,7 +1341,7 @@ to_cache(Context& ctx,
     result_file_map.emplace(FileType::dependency, ctx.args_info.output_dep);
   }
   if (generating_coverage) {
-    result_file_map.emplace(FileType::coverage, output_cov);
+    result_file_map.emplace(FileType::coverage, ctx.args_info.output_cov);
   }
   if (generating_stackusage) {
     result_file_map.emplace(FileType::stackusage, output_su);
@@ -2085,7 +2085,7 @@ from_cache(Context& ctx,
     result_file_map.emplace(FileType::dependency, ctx.args_info.output_dep);
   }
   if (generating_coverage) {
-    result_file_map.emplace(FileType::coverage, output_cov);
+    result_file_map.emplace(FileType::coverage, ctx.args_info.output_cov);
   }
   if (generating_stackusage) {
     result_file_map.emplace(FileType::stackusage, output_su);
@@ -3549,7 +3549,6 @@ cc_reset(void)
   free_and_nullify(included_pch_file);
   args_free(orig_args);
   orig_args = NULL;
-  free_and_nullify(output_cov);
   free_and_nullify(output_su);
   free_and_nullify(output_dia);
   free_and_nullify(output_dwo);
@@ -3709,7 +3708,6 @@ do_cache_compilation(Context& ctx, char* argv[])
     failed(); // stats_update is called in cc_process_args.
   }
 
-  output_cov = x_strdup(ctx.args_info.output_cov.c_str());
   output_su = x_strdup(ctx.args_info.output_su.c_str());
   output_dia = x_strdup(ctx.args_info.output_dia.c_str());
   output_dwo = x_strdup(ctx.args_info.output_dwo.c_str());
@@ -3749,7 +3747,7 @@ do_cache_compilation(Context& ctx, char* argv[])
     cc_log("Dependency file: %s", ctx.args_info.output_dep.c_str());
   }
   if (generating_coverage) {
-    cc_log("Coverage file: %s", output_cov);
+    cc_log("Coverage file: %s", ctx.args_info.output_cov.c_str());
   }
   if (generating_stackusage) {
     cc_log("Stack usage file: %s", output_su);
diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp
index 3bf956864..72aca0cbd 100644
--- a/src/legacy_globals.cpp
+++ b/src/legacy_globals.cpp
@@ -25,9 +25,6 @@ char* current_working_dir = nullptr;
 extern struct args* orig_args;
 struct args* orig_args = nullptr;
 
-// The path to the coverage file (implicit when using -ftest-coverage).
-char* output_cov;
-
 // The path to the stack usage (implicit when using -fstack-usage).
 char* output_su;
 
diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp
index 2218fcc50..f46062f72 100644
--- a/src/legacy_globals.hpp
+++ b/src/legacy_globals.hpp
@@ -34,8 +34,6 @@ extern unsigned lock_staleness_limit;
 
 extern struct args* orig_args;
 
-extern char* output_cov;
-
 extern char* output_su;
 
 extern char* output_dia;
diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp
index 7f6231426..b050de674 100644
--- a/unittest/test_argument_processing.cpp
+++ b/unittest/test_argument_processing.cpp
@@ -84,7 +84,6 @@ cc_process_args(Context& ctx,
                                  extra_args_to_hash,
                                  compiler_args);
 
-  output_cov = x_strdup(ctx.args_info.output_cov.c_str());
   output_su = x_strdup(ctx.args_info.output_su.c_str());
   output_dia = x_strdup(ctx.args_info.output_dia.c_str());
   output_dwo = x_strdup(ctx.args_info.output_dwo.c_str());