From patchwork Tue May 10 09:40:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 53730 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 3EEEE3954C79 for ; Tue, 10 May 2022 09:50:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3EEEE3954C79 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1652176220; bh=mjLaX9v6kld3gcpdWa8O7/CSpOnNEMm62oOYcBxiFCU=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=BKjR4lh/FSxVEX2/JAV95IZ7WLHg6KToi0iyEbrLTmwiRRd1BQp8Iot0eHLJYYXys C0YR4+uJk6pdlxZKuu1iFp7i8+qUwcP4cSFlIEgAnc7BEn8LwKDPBIQFYLn2GDu6J2 mt4ulPN+xrBmjdAD38+zMf/X89dUpUi4KqMapF3I= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id DC7BD3954444 for ; Tue, 10 May 2022 09:40:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org DC7BD3954444 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DE5AD21ADC for ; Tue, 10 May 2022 09:40:42 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C12CF13AA5 for ; Tue, 10 May 2022 09:40:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id foolLhozemJjNwAAMHmgww (envelope-from ) for ; Tue, 10 May 2022 09:40:42 +0000 Date: Tue, 10 May 2022 11:40:42 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Properly use opts in finish_options MIME-Version: 1.0 Message-Id: <20220510094042.C12CF13AA5@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" When code was moved from process_options to finish_options it was not properly adjusted to look at and alter the opts set passed to the function but continued to modify the global options set. The following rectifies this and makes sure the same mistake isn't repeated by poisoning global_options{,_set}. Bootstrapped and tested on x86_64-unknown-linux-gnu, pushed. 2022-05-10 Richard Biener * flags.h (dwarf_debuginfo_p): Add opts argument, guard API with !GENERATOR_FILE. * opts.cc (global_options): Poison. (global_options_set): Likewise. (finish_options): Refer to options via opts. --- gcc/flags.h | 4 +++- gcc/opts.cc | 67 ++++++++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 30 deletions(-) diff --git a/gcc/flags.h b/gcc/flags.h index a9381cf93f2..212e357a0fd 100644 --- a/gcc/flags.h +++ b/gcc/flags.h @@ -40,6 +40,7 @@ unsigned int debug_set_count (uint32_t w_symbols); const char * debug_set_names (uint32_t w_symbols); +#ifndef GENERATOR_FILE /* Return true iff BTF debug info is enabled. */ extern bool btf_debuginfo_p (); @@ -54,12 +55,13 @@ extern bool ctf_debuginfo_p (); /* Return true iff DWARF2 debug info is enabled. */ -extern bool dwarf_debuginfo_p (); +extern bool dwarf_debuginfo_p (struct gcc_options *opts = &global_options); /* Return true iff the debug info format is to be generated based on DWARF DIEs (like CTF and BTF debug info formats). */ extern bool dwarf_based_debuginfo_p (); +#endif extern void strip_off_ending (char *, int); extern int base_of_path (const char *path, const char **base_out); diff --git a/gcc/opts.cc b/gcc/opts.cc index 2ffbf429b7b..a0baec98092 100644 --- a/gcc/opts.cc +++ b/gcc/opts.cc @@ -157,9 +157,9 @@ ctf_debuginfo_p () /* Return TRUE iff dwarf2 debug info is enabled. */ bool -dwarf_debuginfo_p () +dwarf_debuginfo_p (struct gcc_options *opts) { - return (write_symbols & DWARF2_DEBUG); + return (opts->x_write_symbols & DWARF2_DEBUG); } /* Return true iff the debug info format is to be generated based on DWARF @@ -171,6 +171,11 @@ bool dwarf_based_debuginfo_p () || (write_symbols & BTF_DEBUG)); } +/* All flag uses below need to explicitely reference the option sets + to operate on. */ +#define global_options DO_NOT_USE +#define global_options_set DO_NOT_USE + /* Parse the -femit-struct-debug-detailed option value and set the flag variables. */ @@ -1305,57 +1310,61 @@ 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) + if (opts->x_flag_gtoggle) { /* Make sure to process -gtoggle only once. */ - flag_gtoggle = false; - if (debug_info_level == DINFO_LEVEL_NONE) + opts->x_flag_gtoggle = false; + if (opts->x_debug_info_level == DINFO_LEVEL_NONE) { - debug_info_level = DINFO_LEVEL_NORMAL; + opts->x_debug_info_level = DINFO_LEVEL_NORMAL; - if (write_symbols == NO_DEBUG) - write_symbols = PREFERRED_DEBUGGING_TYPE; + if (opts->x_write_symbols == NO_DEBUG) + opts->x_write_symbols = PREFERRED_DEBUGGING_TYPE; } else - debug_info_level = DINFO_LEVEL_NONE; + opts->x_debug_info_level = DINFO_LEVEL_NONE; } if (!opts_set->x_debug_nonbind_markers_p) - debug_nonbind_markers_p - = (optimize - && debug_info_level >= DINFO_LEVEL_NORMAL - && dwarf_debuginfo_p () - && !(flag_selective_scheduling || flag_selective_scheduling2)); + opts->x_debug_nonbind_markers_p + = (opts->x_optimize + && opts->x_debug_info_level >= DINFO_LEVEL_NORMAL + && dwarf_debuginfo_p (opts) + && !(opts->x_flag_selective_scheduling + || opts->x_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) - flag_var_tracking = false; + if (opts->x_debug_info_level < DINFO_LEVEL_NORMAL) + opts->x_flag_var_tracking = false; /* One could use EnabledBy, but it would lead to a circular dependency. */ if (!opts_set->x_flag_var_tracking_uninit) - flag_var_tracking_uninit = flag_var_tracking; + opts->x_flag_var_tracking_uninit = opts->x_flag_var_tracking; if (!opts_set->x_flag_var_tracking_assignments) - flag_var_tracking_assignments - = (flag_var_tracking - && !(flag_selective_scheduling || flag_selective_scheduling2)); + opts->x_flag_var_tracking_assignments + = (opts->x_flag_var_tracking + && !(opts->x_flag_selective_scheduling + || opts->x_flag_selective_scheduling2)); - if (flag_var_tracking_assignments_toggle) - flag_var_tracking_assignments = !flag_var_tracking_assignments; + if (opts->x_flag_var_tracking_assignments_toggle) + opts->x_flag_var_tracking_assignments + = !opts->x_flag_var_tracking_assignments; - if (flag_var_tracking_assignments && !flag_var_tracking) - flag_var_tracking = flag_var_tracking_assignments = -1; + if (opts->x_flag_var_tracking_assignments && !opts->x_flag_var_tracking) + opts->x_flag_var_tracking = opts->x_flag_var_tracking_assignments = -1; - if (flag_var_tracking_assignments - && (flag_selective_scheduling || flag_selective_scheduling2)) + if (opts->x_flag_var_tracking_assignments + && (opts->x_flag_selective_scheduling + || opts->x_flag_selective_scheduling2)) warning_at (loc, 0, "var-tracking-assignments changes selective scheduling"); - if (flag_syntax_only) + if (opts->x_flag_syntax_only) { - write_symbols = NO_DEBUG; - profile_flag = 0; + opts->x_write_symbols = NO_DEBUG; + opts->x_profile_flag = 0; }