[gcc(refs/users/marxin/heads/option-tweaking)] opts: Remove AUTODETECT_VALUE usage.

[Martin Liska <marxin@gcc.gnu.org>]

https://gcc.gnu.org/g:4cd67443ddf0ee4da58b769fbbf5ed251bcf23af

commit 4cd67443ddf0ee4da58b769fbbf5ed251bcf23af
Author: Martin Liska <mliska@suse.cz>
Date:   Fri Oct 8 10:00:45 2021 +0200

    opts: Remove AUTODETECT_VALUE usage.
    
    gcc/ChangeLog:
    
            * common.opt: Remove Init(2) for some options.
            * toplev.c (process_options): Do not use AUTODETECT_VALUE, but
            use rather OPTION_SET_P.

Diff:
---
 gcc/common.opt | 6 +++---
 gcc/toplev.c   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/common.opt b/gcc/common.opt
index 90bf2fde514..52d09c084f6 100644
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -2399,7 +2399,7 @@ Common Var(flag_live_range_shrinkage) Init(0) Optimization
 Relief of register pressure through live range shrinkage.
 
 frename-registers
-Common Var(flag_rename_registers) Init(2) Optimization
+Common Var(flag_rename_registers) Optimization
 Perform a register renaming optimization pass.
 
 fschedule-fusion
@@ -2797,7 +2797,7 @@ Common Ignore
 Does nothing.  Preserved for backward compatibility.
 
 ftree-cselim
-Common Var(flag_tree_cselim) Init(2) Optimization
+Common Var(flag_tree_cselim) Optimization
 Transform condition stores into unconditional ones.
 
 ftree-switch-conversion
@@ -3158,7 +3158,7 @@ Common Var(flag_value_profile_transformations) Optimization
 Use expression value profiles in optimizations.
 
 fweb
-Common Var(flag_web) Init(2) Optimization
+Common Var(flag_web) Optimization
 Construct webs and split unrelated uses of single variable.
 
 ftree-builtin-call-dce
diff --git a/gcc/toplev.c b/gcc/toplev.c
index 7afed7cb3a6..b0b89cb1d91 100644
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -1332,10 +1332,10 @@ process_options (bool no_backend)
     }
 
   /* web and rename-registers help when run after loop unrolling.  */
-  if (flag_web == AUTODETECT_VALUE)
+  if (!OPTION_SET_P (flag_web))
     flag_web = flag_unroll_loops;
 
-  if (flag_rename_registers == AUTODETECT_VALUE)
+  if (!OPTION_SET_P (flag_rename_registers))
     flag_rename_registers = flag_unroll_loops;
 
   if (flag_non_call_exceptions)
@@ -1596,7 +1596,7 @@ process_options (bool no_backend)
       debug_inline_points = 0;
     }
 
-  if (flag_tree_cselim == AUTODETECT_VALUE)
+  if (!OPTION_SET_P (flag_tree_cselim))
     {
       if (HAVE_conditional_move)
 	flag_tree_cselim = 1;