From 88f89af4191242adcc38d19b01b88f2caafec5e4 Mon Sep 17 00:00:00 2001 From: Thomas Otto Date: Fri, 24 Jan 2020 20:01:03 +0100 Subject: [PATCH] Context: move profile_arcs --- src/ccache.cpp | 4 +--- src/legacy_globals.cpp | 3 --- src/legacy_globals.hpp | 2 -- unittest/test_argument_processing.cpp | 1 - 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/ccache.cpp b/src/ccache.cpp index 9d8e00799..97daf2209 100644 --- a/src/ccache.cpp +++ b/src/ccache.cpp @@ -1676,7 +1676,7 @@ hash_common_info(Context& ctx, } // Possibly hash the coverage data file path. - if (ctx.args_info.generating_coverage && profile_arcs) { + if (ctx.args_info.generating_coverage && ctx.args_info.profile_arcs) { char* dir = x_dirname(ctx.args_info.output_obj.c_str()); if (profile_dir) { dir = x_strdup(profile_dir); @@ -3565,7 +3565,6 @@ cc_reset(void) ignore_headers_len = 0; g_included_files.clear(); has_absolute_include_headers = false; - profile_arcs = false; i_tmpfile = NULL; direct_i_file = false; free_and_nullify(cpp_stderr); @@ -3705,7 +3704,6 @@ do_cache_compilation(Context& ctx, char* argv[]) failed(); // stats_update is called in cc_process_args. } - profile_arcs = ctx.args_info.profile_arcs; profile_dir = x_strdup(ctx.args_info.profile_dir.c_str()); direct_i_file = ctx.args_info.direct_i_file; diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp index af867bf97..58aa78298 100644 --- 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 coverage data (.gcda) at runtime? -bool profile_arcs; - // Name of the custom profile directory (default: object dirname). char* profile_dir; diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp index 351a09b4d..831f3c8ca 100644 --- 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 profile_arcs; - extern char* profile_dir; extern char* i_tmpfile; diff --git a/unittest/test_argument_processing.cpp b/unittest/test_argument_processing.cpp index 60d9636a4..f8b5fe318 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); - profile_arcs = ctx.args_info.profile_arcs; profile_dir = x_strdup(ctx.args_info.profile_dir.c_str()); direct_i_file = ctx.args_info.direct_i_file; -- 2.47.2