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

Context: move output_cu
---

diff --git a/src/ccache.cpp b/src/ccache.cpp
index 49f1338d3..dfaa65993 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1344,7 +1344,7 @@ to_cache(Context& ctx,
     result_file_map.emplace(FileType::coverage, ctx.args_info.output_cov);
   }
   if (generating_stackusage) {
-    result_file_map.emplace(FileType::stackusage, output_su);
+    result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
   if (generating_diagnostics) {
     result_file_map.emplace(FileType::diagnostic, output_dia);
@@ -2088,7 +2088,7 @@ from_cache(Context& ctx,
     result_file_map.emplace(FileType::coverage, ctx.args_info.output_cov);
   }
   if (generating_stackusage) {
-    result_file_map.emplace(FileType::stackusage, output_su);
+    result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
   if (generating_diagnostics) {
     result_file_map.emplace(FileType::diagnostic, output_dia);
@@ -3549,7 +3549,6 @@ cc_reset(void)
   free_and_nullify(included_pch_file);
   args_free(orig_args);
   orig_args = NULL;
-  free_and_nullify(output_su);
   free_and_nullify(output_dia);
   free_and_nullify(output_dwo);
   free_and_nullify(cached_result_name);
@@ -3708,7 +3707,6 @@ do_cache_compilation(Context& ctx, char* argv[])
     failed(); // stats_update is called in cc_process_args.
   }
 
-  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());
 
@@ -3750,7 +3748,7 @@ do_cache_compilation(Context& ctx, char* argv[])
     cc_log("Coverage file: %s", ctx.args_info.output_cov.c_str());
   }
   if (generating_stackusage) {
-    cc_log("Stack usage file: %s", output_su);
+    cc_log("Stack usage file: %s", ctx.args_info.output_su.c_str());
   }
   if (generating_diagnostics) {
     cc_log("Diagnostics file: %s", output_dia);
diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp
index 72aca0cbd..b3a46d620 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 stack usage (implicit when using -fstack-usage).
-char* output_su;
-
 // Diagnostic generation information (clang). Contains pathname if not nullptr.
 char* output_dia;
 
diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp
index f46062f72..89797cec3 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_su;
-
 extern char* output_dia;
 
 extern char* output_dwo;
diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp
index b050de674..a0c31caef 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_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());