Fixup OPTION_SET_P usage in finish_options

When some code was moved from process_options to finish_options,
uses of OPTION_SET_P were not replaced with references to the
opts_set option set.  The following fixes this.

2022-05-03  Richard Biener  <rguenther@suse.de>

	* opts.cc: #undef OPTIONS_SET_P.
	(finish_options): Use opts_set instead of OPTIONS_SET_P.

(cherry picked from commit 99f55024b0609e0d85f6c58828faad3c51a49749)

diff --git a/gcc/opts.cc b/gcc/opts.cc
index e5e3119a98057a66f143c6b2aa8b212f77a062f6..1378ef781d089092adc5fcd7488027c582e43383 100644 (file)
--- a/gcc/opts.cc
+++ b/gcc/opts.cc
@@ -35,6 +35,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "version.h"
 #include "selftest.h"
 
+/* In this file all option sets are explicit.  */
+#undef OPTION_SET_P
+
 static void set_Wstrict_aliasing (struct gcc_options *opts, int onoff);
 
 /* Names of fundamental debug info formats indexed by enum
@@ -1317,7 +1320,7 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
        debug_info_level = DINFO_LEVEL_NONE;
     }
 
-  if (!OPTION_SET_P (debug_nonbind_markers_p))
+  if (!opts_set->x_debug_nonbind_markers_p)
     debug_nonbind_markers_p
       = (optimize
         && debug_info_level >= DINFO_LEVEL_NORMAL
@@ -1327,14 +1330,14 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set,
   /* Note -fvar-tracking is enabled automatically with OPT_LEVELS_1_PLUS and
      so we need to drop it if we are called from optimize attribute.  */
   if (debug_info_level == DINFO_LEVEL_NONE
-      && !OPTION_SET_P (flag_var_tracking))
+      && !opts_set->x_flag_var_tracking)
     flag_var_tracking = false;
 
   /* One could use EnabledBy, but it would lead to a circular dependency.  */
-  if (!OPTION_SET_P (flag_var_tracking_uninit))
+  if (!opts_set->x_flag_var_tracking_uninit)
      flag_var_tracking_uninit = flag_var_tracking;
 
-  if (!OPTION_SET_P (flag_var_tracking_assignments))
+  if (!opts_set->x_flag_var_tracking_assignments)
     flag_var_tracking_assignments
       = (flag_var_tracking
         && !(flag_selective_scheduling || flag_selective_scheduling2));