Context: move output_dia

diff --git a/src/ccache.cpp b/src/ccache.cpp
index dfaa6599387c9c7d52f9c0e13304c886ab545076..070a0ff4ba81d8d354fa83c0eff1c7450e480365 100644 (file)
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1151,7 +1151,7 @@ to_cache(Context& ctx,
 
   if (generating_diagnostics) {
     args_add(args, "--serialize-diagnostics");
-    args_add(args, output_dia);
+    args_add(args, ctx.args_info.output_dia.c_str());
   }
 
   // Turn off DEPENDENCIES_OUTPUT when running cc1, because otherwise it will
@@ -1347,7 +1347,7 @@ to_cache(Context& ctx,
     result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
   if (generating_diagnostics) {
-    result_file_map.emplace(FileType::diagnostic, output_dia);
+    result_file_map.emplace(FileType::diagnostic, ctx.args_info.output_dia);
   }
   if (seen_split_dwarf && Stat::stat(output_dwo)) {
     // Only copy .dwo file if it was created by the compiler (GCC and Clang
@@ -2091,7 +2091,7 @@ from_cache(Context& ctx,
     result_file_map.emplace(FileType::stackusage, ctx.args_info.output_su);
   }
   if (generating_diagnostics) {
-    result_file_map.emplace(FileType::diagnostic, output_dia);
+    result_file_map.emplace(FileType::diagnostic, ctx.args_info.output_dia);
   }
   bool ok = result_get(cached_result_path, result_file_map);
   if (!ok) {
@@ -3549,7 +3549,6 @@ cc_reset(void)
   free_and_nullify(included_pch_file);
   args_free(orig_args);
   orig_args = NULL;
-  free_and_nullify(output_dia);
   free_and_nullify(output_dwo);
   free_and_nullify(cached_result_name);
   free_and_nullify(cached_result_path);
@@ -3707,7 +3706,6 @@ do_cache_compilation(Context& ctx, char* argv[])
     failed(); // stats_update is called in cc_process_args.
   }
 
-  output_dia = x_strdup(ctx.args_info.output_dia.c_str());
   output_dwo = x_strdup(ctx.args_info.output_dwo.c_str());
 
   actual_language = x_strdup(ctx.args_info.actual_language.c_str());
@@ -3751,7 +3749,7 @@ do_cache_compilation(Context& ctx, char* argv[])
     cc_log("Stack usage file: %s", ctx.args_info.output_su.c_str());
   }
   if (generating_diagnostics) {
-    cc_log("Diagnostics file: %s", output_dia);
+    cc_log("Diagnostics file: %s", ctx.args_info.output_dia.c_str());
   }
   if (output_dwo) {
     cc_log("Split dwarf file: %s", output_dwo);

diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp
index b3a46d62066fc91f96edeaab3098606b7a2e60b1..f97ec0f16550bf755263efd3c0f9f2a10a9d477c 100644 (file)
--- 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;
 
-// Diagnostic generation information (clang). Contains pathname if not nullptr.
-char* output_dia;
-
 // Split dwarf information (GCC 4.8 and up). Contains pathname if not nullptr.
 char* output_dwo;
 

diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp
index 89797cec3baaab3949390d5107f6812be3912fd1..fac854a69a49e406a9bc20925598adcf9422d9ee 100644 (file)
--- 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_dia;
-
 extern char* output_dwo;
 
 extern const char* actual_language;

diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp
index a0c31caef1a9ec14b20c08a6101df7afb0f084b5..0f09dc04a92bf8d883ffe1ee5a82e22b6f883ab1 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);
 
-  output_dia = x_strdup(ctx.args_info.output_dia.c_str());
   output_dwo = x_strdup(ctx.args_info.output_dwo.c_str());
 
   actual_language = x_strdup(ctx.args_info.actual_language.c_str());