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>
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index da712a3..aa52dfd 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -182,6 +182,9 @@
 		processSysrootFlag(builder)
 	}
 	builder.addPreUserArgs(builder.cfg.clangFlags...)
+	if builder.cfg.crashArtifactsDir != "" {
+		builder.addPreUserArgs("-fcrash-diagnostics-dir=" + builder.cfg.crashArtifactsDir)
+	}
 	builder.addPostUserArgs(builder.cfg.clangPostFlags...)
 	calcCommonPreUserArgs(builder)
 	return processClangFlags(builder)
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index e87c7ba..10a6967 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -137,7 +137,6 @@
 		"-fuse-ld=lld",
 		"-Wno-final-dtor-non-final-class",
 		"-Werror=poison-system-directories",
-		"-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
 		"-fexperimental-new-pass-manager",
 	},
 	clangPostFlags: []string{
@@ -145,7 +144,6 @@
 	},
 	newWarningsDir: "/tmp/fatal_clang_warnings",
 	triciumNitsDir: "/tmp/linting_output/clang-tidy",
-	// FIXME(gbiv): apply -fcrash-diagnostics-dir based on this.
 	crashArtifactsDir: "/tmp/clang_crash_diagnostics",
 }
 
@@ -171,7 +169,6 @@
 		"-static-libgcc",
 		"-Wno-final-dtor-non-final-class",
 		"-Werror=poison-system-directories",
-		"-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
 		"-fexperimental-new-pass-manager",
 	},
 	clangPostFlags: []string{
@@ -210,7 +207,6 @@
 		"-Wno-final-dtor-non-final-class",
 		"-Werror=poison-system-directories",
 		"-Wno-unknown-warning-option",
-		"-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
 		"-fexperimental-new-pass-manager",
 	},
 	clangPostFlags: []string{
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index c40faf6..cc55bc4 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -35,8 +35,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ],
@@ -84,8 +84,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ],
@@ -136,8 +136,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ],
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
index 2870f96..5a59277 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
@@ -26,8 +26,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -62,8 +62,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -98,8 +98,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -134,8 +134,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -170,8 +170,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -206,8 +206,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -242,8 +242,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -278,8 +278,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -314,8 +314,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
index 3bae070..44b2fb9 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
@@ -25,8 +25,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
index b804802..0b951f3 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
@@ -25,8 +25,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -60,8 +60,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -95,8 +95,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -130,8 +130,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -165,8 +165,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -200,8 +200,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -235,8 +235,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -270,8 +270,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -305,8 +305,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
index 8eb8d5a..69fb441 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -25,8 +25,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -63,8 +63,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -101,8 +101,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -139,8 +139,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -184,8 +184,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -234,8 +234,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -284,8 +284,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -324,8 +324,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -359,8 +359,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -394,8 +394,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -429,8 +429,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -467,8 +467,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
index 8dc90e2..93e566f 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
@@ -27,8 +27,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -65,8 +65,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -103,8 +103,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -141,8 +141,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -178,8 +178,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=fuzzer",
             "main.cc",
@@ -217,8 +217,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=address",
             "-fprofile-instr-generate",
@@ -256,8 +256,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fsanitize=address",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -293,8 +293,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fprofile-instr-generate",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
index 02e3cec..06030a0 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
@@ -36,8 +36,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -72,8 +72,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-Wno-#warnings",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -109,8 +109,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-Wno-error=uninitialized",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -146,8 +146,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-Wno-error=unused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -183,8 +183,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-Wno-unused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -220,8 +220,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-Wunused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
@@ -257,8 +257,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-someflag",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index 44c58f8..c4f86b0 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -41,8 +41,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -63,8 +63,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -115,8 +115,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -137,8 +137,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -191,8 +191,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -216,8 +216,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -271,8 +271,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -293,8 +293,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
index fb85401..272b422 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
@@ -28,8 +28,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -66,8 +66,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -90,8 +90,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-error",
@@ -132,8 +132,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion"
           ]
@@ -156,8 +156,8 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
-            "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
             "-fexperimental-new-pass-manager",
+            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-error",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 2302669..97f5b1c 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 49ac564..7d5a38c 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 6fc2b8e..c7b278a 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 6ba05ab..1e0e548 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 a9bd08c..c47b0bb 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 0535df1..859597d 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 306873c..5f3e3a6 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 5964245..b526ec7 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 23cb8f5..f4bbf66 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 9cf7ab2..024ac23 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",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index 2302669..97f5b1c 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index 6ba05ab..1e0e548 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index 5964245..b526ec7 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
index 23cb8f5..f4bbf66 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
index 9cf7ab2..024ac23 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_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",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index 48b2852..dfbbbfe 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -36,8 +36,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",
@@ -94,8 +94,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",
@@ -155,8 +155,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_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index e5c37c8..8637b8e 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -26,8 +26,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",
@@ -120,8 +120,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",
@@ -167,8 +167,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",
@@ -221,8 +221,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",
@@ -281,8 +281,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",
@@ -389,8 +389,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",
@@ -433,8 +433,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",
@@ -477,8 +477,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",
@@ -521,8 +521,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",
@@ -568,8 +568,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_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index 5964245..b526ec7 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_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_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
index 9510bfc..a84e7ba 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.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",
@@ -76,8 +76,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",
@@ -109,8 +109,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",
@@ -160,8 +160,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",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
index 723c03c..b18c608 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_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",
@@ -96,8 +96,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",
@@ -165,8 +165,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_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 06f5420..bd3696c 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -34,8 +34,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -88,8 +88,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -145,8 +145,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
index bf851e4..c81f633 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -25,8 +25,8 @@
             "-static-libgcc",
             "-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",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -69,8 +69,8 @@
             "-static-libgcc",
             "-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",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -113,8 +113,8 @@
             "-static-libgcc",
             "-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",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -157,8 +157,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "-ftrapv",
             "main.cc",
@@ -202,8 +202,8 @@
             "-static-libgcc",
             "-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",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -246,8 +246,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "-ftrapv",
             "main.cc",
@@ -291,8 +291,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "-ftrapv",
             "main.cc",
@@ -336,8 +336,8 @@
             "-static-libgcc",
             "-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",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -380,8 +380,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "-ftrapv",
             "main.cc",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
index 06abf6e..6b7b80f 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
@@ -24,8 +24,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -66,8 +66,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -108,8 +108,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -150,8 +150,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -193,8 +193,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -235,8 +235,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -278,8 +278,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -321,8 +321,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -363,8 +363,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index ce07111..b237e78 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -24,8 +24,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -69,8 +69,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -114,8 +114,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -159,8 +159,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -211,8 +211,8 @@
             "-static-libgcc",
             "-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",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -268,8 +268,8 @@
             "-static-libgcc",
             "-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",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -320,8 +320,8 @@
             "-static-libgcc",
             "-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",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -367,8 +367,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -409,8 +409,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
@@ -451,8 +451,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
@@ -493,8 +493,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -538,8 +538,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
index 3a29fb7..7e2f61e 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -26,8 +26,8 @@
             "-static-libgcc",
             "-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",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -71,8 +71,8 @@
             "-static-libgcc",
             "-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",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -116,8 +116,8 @@
             "-static-libgcc",
             "-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",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -161,8 +161,8 @@
             "-static-libgcc",
             "-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",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -205,8 +205,8 @@
             "-static-libgcc",
             "-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",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=fuzzer",
             "main.cc",
@@ -251,8 +251,8 @@
             "-static-libgcc",
             "-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",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=address",
             "-fprofile-instr-generate",
@@ -297,8 +297,8 @@
             "-static-libgcc",
             "-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",
             "-fsanitize=address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -341,8 +341,8 @@
             "-static-libgcc",
             "-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",
             "-fprofile-instr-generate",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
index dc5b53a..b82782e 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -35,8 +35,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -78,8 +78,8 @@
             "-static-libgcc",
             "-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",
             "-Wno-#warnings",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -122,8 +122,8 @@
             "-static-libgcc",
             "-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",
             "-Wno-error=uninitialized",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -166,8 +166,8 @@
             "-static-libgcc",
             "-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",
             "-Wno-error=unused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -210,8 +210,8 @@
             "-static-libgcc",
             "-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",
             "-Wno-unused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -254,8 +254,8 @@
             "-static-libgcc",
             "-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",
             "-Wunused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -298,8 +298,8 @@
             "-static-libgcc",
             "-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",
             "-someflag",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
index a2ac55b..82b0efd 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
@@ -55,8 +55,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -100,8 +100,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -138,8 +138,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -181,8 +181,8 @@
             "-static-libgcc",
             "-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",
             "-fno-stack-protector",
             "-D__KERNEL__",
             "main.cc",
@@ -226,8 +226,8 @@
             "-static-libgcc",
             "-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",
             "-mthumb",
             "-fno-stack-protector",
             "-D__KERNEL__",
@@ -271,8 +271,8 @@
             "-static-libgcc",
             "-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",
             "--sysroot=xyz",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index 2e73f74..5ea4c76 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -39,8 +39,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -62,8 +62,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -115,8 +115,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -139,8 +139,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -194,8 +194,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -221,8 +221,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -277,8 +277,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -301,8 +301,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
index e4bc550..9e979d6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -27,8 +27,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -72,8 +72,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -103,8 +103,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -152,8 +152,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -183,8 +183,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
index a3cabd8..ca16f41 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -24,8 +24,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -86,8 +86,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -143,8 +143,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -188,8 +188,8 @@
             "-static-libgcc",
             "-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",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",