From patchwork Tue May 3 09:07:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 1625440 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=h0Z9rC/o; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KsvJK2NlXz9sFr for ; Tue, 3 May 2022 19:08:16 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E547C3857355 for ; Tue, 3 May 2022 09:08:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E547C3857355 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1651568893; bh=OQgzuAFwBoLEUywZWVmVxs5pCh4lmvPdpRPe4LeLpFA=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=h0Z9rC/oAHSdkA6xCDJq1z4cv7qYFHpC86iTknu/mrOI3O1JmDaGdP6HIYePcQ3/a vDFIOurNBElMuwMTT40RvWFSoN1q4fak10z7/ECDLb1JXvIUAHyKwYESHae5PTaole akLZuc4wrbI1CJi5RhRjDwy71kFv3fnSu8o5LoDM= 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 A4DB13858C2D for ; Tue, 3 May 2022 09:07:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A4DB13858C2D 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 8E7F4210EA for ; Tue, 3 May 2022 09:07:31 +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 7C9BF13AA3 for ; Tue, 3 May 2022 09:07:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id XKRiHdPwcGI2TQAAMHmgww (envelope-from ) for ; Tue, 03 May 2022 09:07:31 +0000 Date: Tue, 3 May 2022 11:07:31 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [PATCH] Fixup OPTION_SET_P usage in finish_options MIME-Version: 1.0 Message-Id: <20220503090731.7C9BF13AA3@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+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" 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. Bootstrapped on x86_64-unknown-linux-gnu, testing in progress. 2022-05-03 Richard Biener * opts.cc: #undef OPTIONS_SET_P. (finish_options): Use opts_set instead of OPTIONS_SET_P. --- gcc/opts.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gcc/opts.cc b/gcc/opts.cc index e5e3119a980..1378ef781d0 100644 --- 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));