compiler_wrapper: Stop disabling two warnings.

Chrome OS code now is clean of following warnings:
"-Wreorder-init-list" and "-return-stack-address" so
stop disabling them.

BUG=chromium:1057384
TEST=warnings tested by CL:1898670

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

9 files changed, 0 insertions, 124 deletions

diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index 437cae52..e29d77e0 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -32,9 +32,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -81,9 +79,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -133,9 +129,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
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 b52f0c85..5036312d 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
@@ -23,9 +23,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -59,9 +57,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -95,9 +91,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -131,9 +125,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -167,9 +159,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -203,9 +193,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -239,9 +227,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -275,9 +261,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -311,9 +295,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
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 251694e8..6e897172 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
@@ -22,9 +22,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
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 e5a8afa7..ab3ce44c 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
@@ -22,9 +22,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -57,9 +55,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -92,9 +88,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -127,9 +121,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -162,9 +154,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -197,9 +187,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -232,9 +220,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -267,9 +253,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -302,9 +286,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
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 cb175e05..b2de2870 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -22,9 +22,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -60,9 +58,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -98,9 +94,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -136,9 +130,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -181,9 +173,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-resource-dir=someResourceDir",
@@ -231,9 +221,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-resource-dir=someResourceDir",
@@ -281,9 +269,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-resource-dir=someResourceDir",
@@ -321,9 +307,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -356,9 +340,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -391,9 +373,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -426,9 +406,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -464,9 +442,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
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 3df459fa..fff7d0fd 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
@@ -24,9 +24,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fsanitize=kernel-address",
@@ -62,9 +60,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fsanitize=kernel-address",
@@ -100,9 +96,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fsanitize=kernel-address",
@@ -138,9 +132,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fsanitize=kernel-address",
@@ -175,9 +167,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fno-experimental-new-pass-manager",
@@ -214,9 +204,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fno-experimental-new-pass-manager",
@@ -253,9 +241,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fsanitize=address",
@@ -290,9 +276,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-fprofile-instr-generate",
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 40427b96..568ab6eb 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
@@ -33,9 +33,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -69,9 +67,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-Wno-#warnings",
@@ -106,9 +102,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-Wno-error=uninitialized",
@@ -143,9 +137,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-Wno-error=unused-variable",
@@ -180,9 +172,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-Wno-unused-variable",
@@ -217,9 +207,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-Wunused-variable",
@@ -254,9 +242,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "-someflag",
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index eebda022..266771a1 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -38,9 +38,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -60,9 +58,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -112,9 +108,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -134,9 +128,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -188,9 +180,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -213,9 +203,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -268,9 +256,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -290,9 +276,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
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 2393e71a..f1de9518 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
@@ -25,9 +25,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -63,9 +61,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -87,9 +83,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -129,9 +123,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",
@@ -153,9 +145,7 @@
             "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
-            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
             "-Wno-unknown-warning-option",
             "main.cc",