From b4dc783f23010e3eb76fa2cff99b37d30231bc2b Mon Sep 17 00:00:00 2001 From: Thomas Otto Date: Fri, 24 Jan 2020 19:23:17 +0100 Subject: [PATCH] Context: move output_dia --- src/ccache.cpp | 10 ++++------ src/legacy_globals.cpp | 3 --- src/legacy_globals.hpp | 2 -- unittest/test_argument_processing.cpp | 1 - 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/ccache.cpp b/src/ccache.cpp index dfaa65993..070a0ff4b 100644 --- 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 b3a46d620..f97ec0f16 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; -// 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 89797cec3..fac854a69 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_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 a0c31caef..0f09dc04a 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_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()); -- 2.47.3