From: Thomas Otto <thomas.otto@pdv-fs.de>
Date: Sun, 26 Jan 2020 20:14:34 +0000 (+0100)
Subject: Context: move guessed_compiler
X-Git-Tag: v4.0~613^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e9eb4c9dfe4ac2005153e5deeda8da8884b7cb3;p=thirdparty%2Fccache.git

Context: move guessed_compiler
---

diff --git a/src/Context.hpp b/src/Context.hpp
index 7af2ec4e4..19098a6e8 100644
--- a/src/Context.hpp
+++ b/src/Context.hpp
@@ -23,6 +23,7 @@
 #include "ArgsInfo.hpp"
 #include "Config.hpp"
 #include "NonCopyable.hpp"
+#include "ccache.hpp"
 #include "hash.hpp"
 
 #include <unordered_map>
@@ -81,4 +82,8 @@ struct Context : NonCopyable
 
   // The stats file to use for the manifest.
   std::string manifest_stats_file;
+
+  // Compiler guessing is currently only based on the compiler name, so nothing
+  // should hard-depend on it if possible.
+  GuessedCompiler guessed_compiler = GuessedCompiler::unknown;
 };
diff --git a/src/ccache.cpp b/src/ccache.cpp
index d4912479a..e4181f5f8 100644
--- a/src/ccache.cpp
+++ b/src/ccache.cpp
@@ -1211,7 +1211,7 @@ to_cache(Context& ctx,
 
   // distcc-pump outputs lines like this:
   // __________Using # distcc servers in pump mode
-  if (st.size() != 0 && guessed_compiler != GuessedCompiler::pump) {
+  if (st.size() != 0 && ctx.guessed_compiler != GuessedCompiler::pump) {
     cc_log("Compiler produced stdout");
     stats_update(STATS_STDOUT);
     tmp_unlink(tmp_stdout);
@@ -1442,8 +1442,11 @@ get_result_name_from_cpp(Context& ctx, struct args* args, struct hash* hash)
   }
 
   hash_delimiter(hash, "cpp");
-  if (!process_preprocessed_file(
-        ctx, hash, path_stdout, guessed_compiler == GuessedCompiler::pump)) {
+  if (!process_preprocessed_file(ctx,
+                                 hash,
+                                 path_stdout,
+                                 ctx.guessed_compiler
+                                   == GuessedCompiler::pump)) {
     stats_update(STATS_ERROR);
     failed();
   }
@@ -1701,7 +1704,7 @@ hash_common_info(Context& ctx,
   }
 
   // Possibly hash GCC_COLORS (for color diagnostics).
-  if (guessed_compiler == GuessedCompiler::gcc) {
+  if (ctx.guessed_compiler == GuessedCompiler::gcc) {
     const char* gcc_colors = getenv("GCC_COLORS");
     if (gcc_colors) {
       hash_delimiter(hash, "gcccolors");
@@ -1732,8 +1735,8 @@ calculate_result_name(Context& ctx,
 
   // clang will emit warnings for unused linker flags, so we shouldn't skip
   // those arguments.
-  int is_clang = guessed_compiler == GuessedCompiler::clang
-                 || guessed_compiler == GuessedCompiler::unknown;
+  int is_clang = ctx.guessed_compiler == GuessedCompiler::clang
+                 || ctx.guessed_compiler == GuessedCompiler::unknown;
 
   // First the arguments.
   for (int i = 1; i < args->argc; i++) {
@@ -2037,8 +2040,8 @@ from_cache(Context& ctx,
   //
   //     file 'foo.h' has been modified since the precompiled header 'foo.pch'
   //     was built
-  if ((guessed_compiler == GuessedCompiler::clang
-       || guessed_compiler == GuessedCompiler::unknown)
+  if ((ctx.guessed_compiler == GuessedCompiler::clang
+       || ctx.guessed_compiler == GuessedCompiler::unknown)
       && ctx.args_info.output_is_precompiled_header
       && mode == FROMCACHE_CPP_MODE) {
     cc_log("Not considering cached precompiled header in preprocessor mode");
@@ -2343,7 +2346,7 @@ cc_process_args(Context& ctx,
     }
 
     // Handle cuda "-optf" and "--options-file" argument.
-    if (guessed_compiler == GuessedCompiler::nvcc
+    if (ctx.guessed_compiler == GuessedCompiler::nvcc
         && (str_eq(argv[i], "-optf") || str_eq(argv[i], "--options-file"))) {
       if (i == argc - 1) {
         cc_log("Expected argument after %s", argv[i]);
@@ -2477,7 +2480,7 @@ cc_process_args(Context& ctx,
 
     // when using nvcc with separable compilation, -dc implies -c
     if ((str_eq(argv[i], "-dc") || str_eq(argv[i], "--device-c"))
-        && guessed_compiler == GuessedCompiler::nvcc) {
+        && ctx.guessed_compiler == GuessedCompiler::nvcc) {
       found_dc_opt = true;
       continue;
     }
@@ -2524,8 +2527,8 @@ cc_process_args(Context& ctx,
 
     // Alternate form of -o with no space. Nvcc does not support this.
     if (str_startswith(argv[i], "-o")
-        && guessed_compiler != GuessedCompiler::nvcc) {
-      args_info.output_obj = make_relative_path(ctx, &argv[i][2]);
+        && ctx.guessed_compiler != GuessedCompiler::nvcc) {
+      ctx.args_info.output_obj = make_relative_path(ctx, &argv[i][2]);
       continue;
     }
 
@@ -3213,13 +3216,13 @@ cc_process_args(Context& ctx,
   // Since output is redirected, compilers will not color their output by
   // default, so force it explicitly if it would be otherwise done.
   if (!found_color_diagnostics && color_output_possible()) {
-    if (guessed_compiler == GuessedCompiler::clang) {
-      if (args_info.actual_language != "assembler") {
+    if (ctx.guessed_compiler == GuessedCompiler::clang) {
+      if (ctx.args_info.actual_language != "assembler") {
         args_add(common_args, "-fcolor-diagnostics");
         add_extra_arg("-fcolor-diagnostics");
         cc_log("Automatically enabling colors");
       }
-    } else if (guessed_compiler == GuessedCompiler::gcc) {
+    } else if (ctx.guessed_compiler == GuessedCompiler::gcc) {
       // GCC has it since 4.9, but that'd require detecting what GCC version is
       // used for the actual compile. However it requires also GCC_COLORS to be
       // set (and not empty), so use that for detecting if GCC would use
@@ -3656,7 +3659,7 @@ do_cache_compilation(Context& ctx, char* argv[])
     std::min(std::max(ctx.config.limit_multiple(), 0.0), 1.0));
 
   MTR_BEGIN("main", "guess_compiler");
-  guessed_compiler = guess_compiler(ctx.orig_args->argv[0]);
+  ctx.guessed_compiler = guess_compiler(ctx.orig_args->argv[0]);
   MTR_END("main", "guess_compiler");
 
   // Arguments (except -E) to send to the preprocessor.
diff --git a/src/legacy_globals.cpp b/src/legacy_globals.cpp
index 760af6f93..19375da7f 100644
--- a/src/legacy_globals.cpp
+++ b/src/legacy_globals.cpp
@@ -24,10 +24,6 @@ char** ignore_headers;
 // Size of headers to ignore list.
 size_t ignore_headers_len;
 
-// Compiler guessing is currently only based on the compiler name, so nothing
-// should hard-depend on it if possible.
-GuessedCompiler guessed_compiler = GuessedCompiler::unknown;
-
 // The .gch/.pch/.pth file used for compilation.
 char* included_pch_file = nullptr;
 
diff --git a/src/legacy_globals.hpp b/src/legacy_globals.hpp
index 7dbf34b3f..5f5e9a350 100644
--- a/src/legacy_globals.hpp
+++ b/src/legacy_globals.hpp
@@ -34,6 +34,4 @@ extern char** ignore_headers;
 
 extern size_t ignore_headers_len;
 
-extern GuessedCompiler guessed_compiler;
-
 extern char* included_pch_file;
diff --git a/src/manifest.cpp b/src/manifest.cpp
index a770d8182..ccdee31df 100644
--- a/src/manifest.cpp
+++ b/src/manifest.cpp
@@ -417,8 +417,8 @@ verify_result(const Context& ctx,
 
     // Clang stores the mtime of the included files in the precompiled header,
     // and will error out if that header is later used without rebuilding.
-    if ((guessed_compiler == GuessedCompiler::clang
-         || guessed_compiler == GuessedCompiler::unknown)
+    if ((ctx.guessed_compiler == GuessedCompiler::clang
+         || ctx.guessed_compiler == GuessedCompiler::unknown)
         && ctx.args_info.output_is_precompiled_header && fi.mtime != fs.mtime) {
       cc_log("Precompiled header includes %s, which has a new mtime",
              path.c_str());