From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 76F713858400; Fri, 4 Feb 2022 14:50:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 76F713858400 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/PR104381-fix-fvar-tracking-auto)] Fix it. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/PR104381-fix-fvar-tracking-auto X-Git-Oldrev: 9d3236ff3791ea74e1bc1c293d82fee11b1a5e24 X-Git-Newrev: bc35b6add5d15dceff8475d360f710134cd93155 Message-Id: <20220204145033.76F713858400@sourceware.org> Date: Fri, 4 Feb 2022 14:50:33 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Feb 2022 14:50:33 -0000 https://gcc.gnu.org/g:bc35b6add5d15dceff8475d360f710134cd93155 commit bc35b6add5d15dceff8475d360f710134cd93155 Author: Martin Liska Date: Fri Feb 4 15:50:17 2022 +0100 Fix it. Diff: --- gcc/opts.cc | 49 ++++++++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/gcc/opts.cc b/gcc/opts.cc index 6e2ee821c44..b4daa33a258 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -1302,6 +1302,34 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set, SET_OPTION_IF_UNSET (opts, opts_set, flag_vect_cost_model, VECT_COST_MODEL_CHEAP); + if (flag_gtoggle) + { + /* Make sure to process -gtoggle only once. */ + flag_gtoggle = false; + if (debug_info_level == DINFO_LEVEL_NONE) + { + debug_info_level = DINFO_LEVEL_NORMAL; + + if (write_symbols == NO_DEBUG) + write_symbols = PREFERRED_DEBUGGING_TYPE; + } + else + debug_info_level = DINFO_LEVEL_NONE; + } + + if (!OPTION_SET_P (debug_nonbind_markers_p)) + debug_nonbind_markers_p + = (optimize + && debug_info_level >= DINFO_LEVEL_NORMAL + && dwarf_debuginfo_p () + && !(flag_selective_scheduling || flag_selective_scheduling2)); + + /* 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_NORMAL + && !OPTION_SET_P (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)) flag_var_tracking_uninit = flag_var_tracking; @@ -1328,27 +1356,6 @@ finish_options (struct gcc_options *opts, struct gcc_options *opts_set, profile_flag = 0; } - if (flag_gtoggle) - { - /* Make sure to process -gtoggle only once. */ - flag_gtoggle = false; - if (debug_info_level == DINFO_LEVEL_NONE) - { - debug_info_level = DINFO_LEVEL_NORMAL; - - if (write_symbols == NO_DEBUG) - write_symbols = PREFERRED_DEBUGGING_TYPE; - } - else - debug_info_level = DINFO_LEVEL_NONE; - } - - if (!OPTION_SET_P (debug_nonbind_markers_p)) - debug_nonbind_markers_p - = (optimize - && debug_info_level >= DINFO_LEVEL_NORMAL - && dwarf_debuginfo_p () - && !(flag_selective_scheduling || flag_selective_scheduling2)); diagnose_options (opts, opts_set, loc); }