compiler_wrapper: use crashArtifactsDir to apply clang opts

Since we now have crashArtifactsDir as a more abstract concept, it seems
good to apply '-fcrash-diagnostics-dir=' based on that, rather than
having it as an explicit clang flag.

BUG=chromium:1113442
TEST=FIXME

Change-Id: I147779d7cf8806b3bc712c2998446158e87ec967
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2343975
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>

10 files changed, 71 insertions, 71 deletions

diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 2302669a..97f5b1cf 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -37,8 +37,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -99,8 +99,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -164,8 +164,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
index 49ac5646..7d5a38cb 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -28,8 +28,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -80,8 +80,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -132,8 +132,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -184,8 +184,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -236,8 +236,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -288,8 +288,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -340,8 +340,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -392,8 +392,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -444,8 +444,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
index 6fc2b8e7..c7b278ae 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
@@ -27,8 +27,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -77,8 +77,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -127,8 +127,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -177,8 +177,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -227,8 +227,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -277,8 +277,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -327,8 +327,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -377,8 +377,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -427,8 +427,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 6ba05ab1..1e0e5480 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -27,8 +27,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -80,8 +80,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -133,8 +133,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -186,8 +186,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -246,8 +246,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -311,8 +311,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -371,8 +371,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -426,8 +426,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -476,8 +476,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -526,8 +526,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -576,8 +576,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -629,8 +629,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
index a9bd08c4..c47b0bb8 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -29,8 +29,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -81,8 +81,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -133,8 +133,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -185,8 +185,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -236,8 +236,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -289,8 +289,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -342,8 +342,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -393,8 +393,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
index 0535df12..859597d7 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -38,8 +38,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -89,8 +89,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -141,8 +141,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -193,8 +193,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -245,8 +245,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -297,8 +297,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -349,8 +349,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
index 306873c9..5f3e3a65 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
@@ -62,8 +62,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -115,8 +115,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -161,8 +161,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
@@ -210,8 +210,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-fno-stack-protector",
@@ -260,8 +260,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "-fno-stack-protector",
@@ -309,8 +309,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index 59642459..b526ec7c 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -42,8 +42,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -73,8 +73,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -134,8 +134,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -166,8 +166,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -229,8 +229,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -264,8 +264,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -328,8 +328,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -360,8 +360,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
index 23cb8f59..f4bbf664 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -30,8 +30,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -83,8 +83,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -122,8 +122,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -179,8 +179,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -218,8 +218,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
index 9cf7ab2f..024ac23a 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -27,8 +27,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -101,8 +101,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -170,8 +170,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -223,8 +223,8 @@
             "-fuse-ld=lld",
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",