[gcc/devel/c++-modules] Exclude CL_WARNING and CL_PARAM from --help=optimize.

[Nathan Sidwell]

https://gcc.gnu.org/g:5ab08934e5f44dbdd5b0e4226755b46bf4e2e1af

commit 5ab08934e5f44dbdd5b0e4226755b46bf4e2e1af
Author: Martin Liska <mliska@suse.cz>
Date:   Mon Jan 13 14:27:09 2020 +0100

    Exclude CL_WARNING and CL_PARAM from --help=optimize.
    
    2020-01-13  Martin Liska  <mliska@suse.cz>
    
    	* opts.c (print_help): Do not print CL_PARAM
    	and CL_WARNING for CL_OPTIMIZATION.

Diff:
---
 gcc/ChangeLog | 5 +++++
 gcc/opts.c    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b2d12f4..fc25469 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-13  Martin Liska  <mliska@suse.cz>
+
+	* opts.c (print_help): Do not print CL_PARAM
+	and CL_WARNING for CL_OPTIMIZATION.
+
 2020-01-13  Jonathan Wakely  <jwakely@redhat.com>
 
 	PR driver/92757
diff --git a/gcc/opts.c b/gcc/opts.c
index fa4804c..33a662b 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -2137,6 +2137,11 @@ print_help (struct gcc_options *opts, unsigned int lang_mask,
       a = comma + 1;
     }
 
+  /* We started using PerFunction/Optimization for parameters and
+     a warning.  We should exclude these from optimization options.  */
+  if (include_flags & CL_OPTIMIZATION)
+    exclude_flags |= CL_WARNING | CL_PARAMS;
+
   if (include_flags)
     print_specific_help (include_flags, exclude_flags, 0, opts,
 			 lang_mask);