compiler_wrapper: add -fexperimental-new-pass-manager

LLVM is currently build with DENABLE_EXPERIMENTAL_NEW_PASS_MANAGER=ON on
Chrome OS. This is however not reflected in clang crash diagnoses.
Adding -fexperimental-new-pass-manager to help with reproducibility on
4c.

BUG=chromium:1111103

TEST=CQ tests.

Change-Id: Ie01431dff397e982469e29c9132e21374354762d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2327414
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Tested-by: Jian Cai <jiancai@google.com>

10 files changed, 71 insertions, 0 deletions

diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 4002d2f7..06f5420c 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -35,6 +35,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -88,6 +89,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -144,6 +146,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "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 3946b2b1..bf851e46 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
@@ -26,6 +26,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -69,6 +70,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -112,6 +114,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -155,6 +158,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-mthumb",
             "-ftrapv",
             "main.cc",
@@ -199,6 +203,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -242,6 +247,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-mthumb",
             "-ftrapv",
             "main.cc",
@@ -286,6 +292,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-mthumb",
             "-ftrapv",
             "main.cc",
@@ -330,6 +337,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-ftrapv",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -373,6 +381,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-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 d0e8c521..06abf6e4 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
@@ -25,6 +25,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -66,6 +67,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -107,6 +109,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -148,6 +151,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-mthumb",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -190,6 +194,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -231,6 +236,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-mthumb",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -273,6 +279,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-mthumb",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -315,6 +322,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -356,6 +364,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-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 b224b952..ce071110 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -25,6 +25,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -69,6 +70,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -113,6 +115,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -157,6 +160,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -208,6 +212,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -264,6 +269,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -315,6 +321,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
@@ -361,6 +368,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -402,6 +410,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
@@ -443,6 +452,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
@@ -484,6 +494,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -528,6 +539,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "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 609bec35..3a29fb7f 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -27,6 +27,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -71,6 +72,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -115,6 +117,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -159,6 +162,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fsanitize=kernel-address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -202,6 +206,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=fuzzer",
             "main.cc",
@@ -247,6 +252,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=address",
             "-fprofile-instr-generate",
@@ -292,6 +298,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fsanitize=address",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -335,6 +342,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-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 e84e1491..dc5b53a1 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -36,6 +36,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -78,6 +79,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-Wno-#warnings",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -121,6 +123,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-Wno-error=uninitialized",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -164,6 +167,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-Wno-error=unused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -207,6 +211,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-Wno-unused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -250,6 +255,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-Wunused-variable",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
@@ -293,6 +299,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-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 9c90d35b..a2ac55b4 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
@@ -56,6 +56,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -100,6 +101,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -137,6 +139,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -179,6 +182,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-fno-stack-protector",
             "-D__KERNEL__",
             "main.cc",
@@ -223,6 +227,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "-mthumb",
             "-fno-stack-protector",
             "-D__KERNEL__",
@@ -267,6 +272,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "--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 c340e895..2e73f74e 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -40,6 +40,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -62,6 +63,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -114,6 +116,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -137,6 +140,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -191,6 +195,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -217,6 +222,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -272,6 +278,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -295,6 +302,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "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 2ddb3514..e4bc550c 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -28,6 +28,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -72,6 +73,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -102,6 +104,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -150,6 +153,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -180,6 +184,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "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 d21d2179..a3cabd88 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -25,6 +25,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -86,6 +87,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -142,6 +144,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",
@@ -186,6 +189,7 @@
             "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
             "-fcrash-diagnostics-dir=/tmp/clang_crash_diagnostics",
+            "-fexperimental-new-pass-manager",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-B../../bin",