From 45c7205b617895a96073da30aabfdbae2bb8651c Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Mon, 30 Apr 2018 19:04:04 +0000 Subject: [PATCH] clang-cl: Expose -fmerge-all-constants Now that constant merging is off by default, we'd like a way to enable it on Windows. llvm-svn: 331214 --- clang/include/clang/Driver/Options.td | 2 +- clang/test/Driver/cl-options.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index 3a5d58a8ee7d..80facb79a48a 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -1176,7 +1176,7 @@ def fthinlto_index_EQ : Joined<["-"], "fthinlto-index=">, def fmacro_backtrace_limit_EQ : Joined<["-"], "fmacro-backtrace-limit=">, Group, Flags<[DriverOption, CoreOption]>; def fmerge_all_constants : Flag<["-"], "fmerge-all-constants">, Group, - Flags<[CC1Option]>, HelpText<"Allow merging of constants">; + Flags<[CC1Option, CoreOption]>, HelpText<"Allow merging of constants">; def fmessage_length_EQ : Joined<["-"], "fmessage-length=">, Group; def fms_extensions : Flag<["-"], "fms-extensions">, Group, Flags<[CC1Option, CoreOption]>, HelpText<"Accept some non-standard constructs supported by the Microsoft compiler">; diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c index 4b4e2f0883cd..37c2fa5b690b 100644 --- a/clang/test/Driver/cl-options.c +++ b/clang/test/Driver/cl-options.c @@ -590,6 +590,7 @@ // RUN: -fstandalone-debug \ // RUN: -flimit-debug-info \ // RUN: -flto \ +// RUN: -fmerge-all-constants \ // RUN: --version \ // RUN: -Werror /Zs -- %s 2>&1