Context: move generating_diagnostics

diff --git a/src/ccache.cpp b/src/ccache.cpp
index e35a04b24744694c57146cfbed2ca9602553a39c..807ddbe586040bd3f459602bf5d189db17982dd7 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1151,7 +1151,7 @@ to_cache(Context& ctx,
     x_unlink(ctx.args_info.output_obj.c_str());
   }
 
-  if (generating_diagnostics) {
+  if (ctx.args_info.generating_diagnostics) {
     args_add(args, "--serialize-diagnostics");
     args_add(args, ctx.args_info.output_dia.c_str());
   }
@@ -1350,7 +1350,7 @@ to_cache(Context& ctx,
   if (ctx.args_info.generating_stackusage) {
     result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
-  if (generating_diagnostics) {
+  if (ctx.args_info.generating_diagnostics) {
     result_file_map.emplace(FileType::diagnostic, ctx.args_info.output_dia);
   }
   if (seen_split_dwarf && Stat::stat(ctx.args_info.output_dwo)) {
@@ -2095,7 +2095,7 @@ from_cache(Context& ctx,
   if (ctx.args_info.generating_stackusage) {
     result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
-  if (generating_diagnostics) {
+  if (ctx.args_info.generating_diagnostics) {
     result_file_map.emplace(FileType::diagnostic, ctx.args_info.output_dia);
   }
   bool ok = result_get(cached_result_path, result_file_map);
@@ -3707,7 +3707,6 @@ do_cache_compilation(Context& ctx, char* argv[])
     failed(); // stats_update is called in cc_process_args.
   }
 
-  generating_diagnostics = ctx.args_info.generating_diagnostics;
   seen_split_dwarf = ctx.args_info.seen_split_dwarf;
   profile_arcs = ctx.args_info.profile_arcs;
   profile_dir = x_strdup(ctx.args_info.profile_dir.c_str());
@@ -3743,7 +3742,7 @@ do_cache_compilation(Context& ctx, char* argv[])
   if (ctx.args_info.generating_stackusage) {
     cc_log("Stack usage file: %s", ctx.args_info.output_su.c_str());
   }
-  if (generating_diagnostics) {
+  if (ctx.args_info.generating_diagnostics) {
     cc_log("Diagnostics file: %s", ctx.args_info.output_dia.c_str());
   }
   if (!ctx.args_info.output_dwo.empty()) {

diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp
index 4df0433f781caecff658ed53d1f8d750707cbdcd..d86fb63b1c8e82095acc9d2ad409ecb289fd92ed 100644 (file)
--- a/src/legacy_globals.cpp
+++ b/src/legacy_globals.cpp
@@ -58,10 +58,6 @@ char** ignore_headers;
 // Size of headers to ignore list.
 size_t ignore_headers_len;
 
-// Us the compiler being asked to generate diagnostics
-// (--serialize-diagnostics)?
-bool generating_diagnostics;
-
 // Have we seen -gsplit-dwarf?
 bool seen_split_dwarf;
 

diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp
index 82cce017dcc2c87ef7ed505958eccfb6c0701b38..1da4b01c791654a7cd3d1195e5a4ad493fb1944d 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_diagnostics;
-
 extern bool seen_split_dwarf;
 
 extern bool profile_arcs;

diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp
index c6da691c319452df73ff243e8a894ad083765788..9fd5f48068b490be8836725b8e7efd972ad85403 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_diagnostics = ctx.args_info.generating_diagnostics;
   seen_split_dwarf = ctx.args_info.seen_split_dwarf;
   profile_arcs = ctx.args_info.profile_arcs;
   profile_dir = x_strdup(ctx.args_info.profile_dir.c_str());