Context: move generating_stackusage

diff --git a/src/ccache.cpp b/src/ccache.cpp
index d0afb826d2691ca1a00fa83f5e5395832b098fbc..e35a04b24744694c57146cfbed2ca9602553a39c 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1347,7 +1347,7 @@ to_cache(Context& ctx,
   if (ctx.args_info.generating_coverage) {
     result_file_map.emplace(FileType::coverage, ctx.args_info.output_cov);
   }
-  if (generating_stackusage) {
+  if (ctx.args_info.generating_stackusage) {
     result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
   if (generating_diagnostics) {
@@ -2092,7 +2092,7 @@ from_cache(Context& ctx,
   if (ctx.args_info.generating_coverage) {
     result_file_map.emplace(FileType::coverage, ctx.args_info.output_cov);
   }
-  if (generating_stackusage) {
+  if (ctx.args_info.generating_stackusage) {
     result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
   if (generating_diagnostics) {
@@ -3565,7 +3565,6 @@ cc_reset(void)
   ignore_headers_len = 0;
   g_included_files.clear();
   has_absolute_include_headers = false;
-  generating_stackusage = false;
   profile_arcs = false;
   i_tmpfile = NULL;
   direct_i_file = false;
@@ -3708,7 +3707,6 @@ do_cache_compilation(Context& ctx, char* argv[])
     failed(); // stats_update is called in cc_process_args.
   }
 
-  generating_stackusage = ctx.args_info.generating_stackusage;
   generating_diagnostics = ctx.args_info.generating_diagnostics;
   seen_split_dwarf = ctx.args_info.seen_split_dwarf;
   profile_arcs = ctx.args_info.profile_arcs;
@@ -3742,7 +3740,7 @@ do_cache_compilation(Context& ctx, char* argv[])
   if (ctx.args_info.generating_coverage) {
     cc_log("Coverage file: %s", ctx.args_info.output_cov.c_str());
   }
-  if (generating_stackusage) {
+  if (ctx.args_info.generating_stackusage) {
     cc_log("Stack usage file: %s", ctx.args_info.output_su.c_str());
   }
   if (generating_diagnostics) {

diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp
index f7db270d8f15b69ba95b450826db92adb51a973b..4df0433f781caecff658ed53d1f8d750707cbdcd 100644 (file)
--- a/src/legacy_globals.cpp
+++ b/src/legacy_globals.cpp
@@ -58,9 +58,6 @@ char** ignore_headers;
 // Size of headers to ignore list.
 size_t ignore_headers_len;
 
-// Is the compiler being asked to output stack usage?
-bool generating_stackusage;
-
 // Us the compiler being asked to generate diagnostics
 // (--serialize-diagnostics)?
 bool generating_diagnostics;

diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp
index 2bba7140af3d1c6e83a269b03332165d58f4ac40..82cce017dcc2c87ef7ed505958eccfb6c0701b38 100644 (file)
--- a/src/legacy_globals.hpp
+++ b/src/legacy_globals.hpp
@@ -54,8 +54,6 @@ extern char** ignore_headers;
 
 extern size_t ignore_headers_len;
 
-extern bool generating_stackusage;
-
 extern bool generating_diagnostics;
 
 extern bool seen_split_dwarf;

diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp
index 6de515245fe80ecab0610a81c4ef4cfa542f4a00..c6da691c319452df73ff243e8a894ad083765788 100644 (file)
--- 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);
 
-  generating_stackusage = ctx.args_info.generating_stackusage;
   generating_diagnostics = ctx.args_info.generating_diagnostics;
   seen_split_dwarf = ctx.args_info.seen_split_dwarf;
   profile_arcs = ctx.args_info.profile_arcs;