Merge pull request #5340 from akyrtzi/pr/stable/redact-date-time-for-testing

[stable][clang-cache] Introduce `CLANG_CACHE_REDACT_TIME_MACROS` environment variable

Author: akyrtzi

clang/test/CAS/test-for-deterministic-outputs.c

@@ -2,9 +2,15 @@
 
 // This compiles twice with replay disabled, ensuring that we get the same outputs for the same key.
 
-// RUN: env LLVM_CACHE_CAS_PATH=%t/cas CLANG_CACHE_TEST_DETERMINISTIC_OUTPUTS=1 %clang-cache \
+// RUN: env LLVM_CACHE_CAS_PATH=%t/cas CLANG_CACHE_TEST_DETERMINISTIC_OUTPUTS=1 CLANG_CACHE_REDACT_TIME_MACROS=1 %clang-cache \
 // RUN:   %clang -target x86_64-apple-macos11 -c %s -o %t/t.o -Rcompile-job-cache 2> %t/out.txt
 // RUN: FileCheck %s --check-prefix=CACHE-MISS --input-file=%t/out.txt
 
 // CACHE-MISS: remark: compile job cache miss
 // CACHE-MISS: remark: compile job cache miss
+
+void getit(const char **p1, const char **p2, const char **p3) {
+  *p1 = __DATE__;
+  *p2 = __TIMESTAMP__;
+  *p3 = __TIME__;
+}

clang/tools/driver/CacheLauncherMode.cpp

@@ -171,6 +171,13 @@ clang::handleClangCacheInvocation(SmallVectorImpl<const char *> &Args,
     }
     Args.append({"-greproducible"});
 
+    if (llvm::sys::Process::GetEnv("CLANG_CACHE_REDACT_TIME_MACROS")) {
+      // Remove use of these macros to get reproducible outputs. This can
+      // accompany CLANG_CACHE_TEST_DETERMINISTIC_OUTPUTS to avoid fatal errors
+      // when the source uses these macros.
+      Args.append({"-Wno-builtin-macro-redefined", "-D__DATE__=\"redacted\"",
+                   "-D__TIMESTAMP__=\"redacted\"", "-D__TIME__=\"redacted\""});
+    }
     if (llvm::sys::Process::GetEnv("CLANG_CACHE_TEST_DETERMINISTIC_OUTPUTS")) {
       // Run the compilation twice, without replaying, to check that we get the
       // same compilation artifacts for the same key. If they are not the same