From patchwork Thu Feb 16 13:44:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Palka X-Patchwork-Id: 1743667 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.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=ncvJV4J3; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PHbmG1RXbz23r4 for ; Fri, 17 Feb 2023 00:44:58 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id EACC0385828E for ; Thu, 16 Feb 2023 13:44:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EACC0385828E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676555097; bh=mFOUuM5GL3Psnp1PQKH4KEF1qnuaiTuDaDVpSexfLjc=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=ncvJV4J3aRvZBm7VmMxujcbOs8tV+jipacvr9iEFtd1iLnLsfEVChTBh2Sdash6hR ADTzANxe6nui8ngF8qKUwrJGG3eAfXvASPsYOu37J37puSELJiCbHfSWX/BH0ph+Gi vR6FisJOHC9ZyLyraSIp5RRZ3TQN1ylRTabavmhY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 37BE93857437 for ; Thu, 16 Feb 2023 13:44:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 37BE93857437 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-78-gbW-L1kdOE2-jJgbA1AzDw-1; Thu, 16 Feb 2023 08:44:34 -0500 X-MC-Unique: gbW-L1kdOE2-jJgbA1AzDw-1 Received: by mail-qt1-f197.google.com with SMTP id cd3-20020a05622a418300b003b9bd2a2284so1217527qtb.4 for ; Thu, 16 Feb 2023 05:44:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mFOUuM5GL3Psnp1PQKH4KEF1qnuaiTuDaDVpSexfLjc=; b=RJMb/iWLPS4jAyUy80BcoLY0eoyZfDV42RaSIwC0CSS6YlHnB8BxfW9JIcKwILuaKe 8zO+AAID5p35mMnIkSxd9p8wnABzXs4jxL34GmR9P5bFjxUK49FEkr5wsDLsMHKLHy21 GO3V82LEU4fjJgUn7Bxw9joPtKF3id2Lz0eArqzE0a1eVCkl84IulhW0NoEJ1xGu7y4h WXxTI3kIum65CnONRwU93TEAtG+hz/D8Mo6NJa0EszbTzKHqs2wULj9LThNxVm3i7biy SXBTglJaWosKh9mKIg0ZnCvGYcYmQDtXTkiPikkVQhDW2k4DlmGuz4VuTfMsPH4XIvgn UmbQ== X-Gm-Message-State: AO0yUKVF7eXCOnw1Sgx2Xitkb4XftQL/6dnNK7YIMQcmFpgrM8ykO+73 dKWQqlpwA/xyimib7IeSeya7GtbHMZY18XFDsUOCqne5sQmXzJXB4+lwPetAYM7BxoeZphUQD8C nzkkLLlu5A8obkQjNujcso8yL7taeCSp51j5I2ZiWjjrislSRRS+wM53xr/dpnI9XCJMCl3Gf X-Received: by 2002:ac8:57cf:0:b0:3ac:fba0:cde with SMTP id w15-20020ac857cf000000b003acfba00cdemr9042113qta.22.1676555073818; Thu, 16 Feb 2023 05:44:33 -0800 (PST) X-Google-Smtp-Source: AK7set+mz/oam5utUNNpUnqERt9BncqRTAAvGwovyHu6+4mCDXxBA/THWVgVPKx7XhZ37CDq+bFc7Q== X-Received: by 2002:ac8:57cf:0:b0:3ac:fba0:cde with SMTP id w15-20020ac857cf000000b003acfba00cdemr9042090qta.22.1676555073456; Thu, 16 Feb 2023 05:44:33 -0800 (PST) Received: from localhost.localdomain (ool-457670bb.dyn.optonline.net. [69.118.112.187]) by smtp.gmail.com with ESMTPSA id 7-20020a05620a040700b006fbb4b98a25sm1168128qkp.109.2023.02.16.05.44.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Feb 2023 05:44:32 -0800 (PST) To: gcc-patches@gcc.gnu.org Cc: Patrick Palka Subject: [PATCH] don't declare header-defined functions both static and inline, pt 2 Date: Thu, 16 Feb 2023 08:44:31 -0500 Message-Id: <20230216134431.1600922-1-ppalka@redhat.com> X-Mailer: git-send-email 2.39.2.422.gc867e4fa18 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Patrick Palka via Gcc-patches From: Patrick Palka Reply-To: Patrick Palka Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" This fixes some header-defined functions that are undesirably declared static and weren't caught by the "^static inline" pattern used in the previous patch. gcc/ChangeLog: * hash-table.h (gt_pch_nx): Remove static. * lra-int.h (lra_change_class): Likewise. * recog.h (which_op_alt): Likewise. * sel-sched-ir.h (sel_bb_empty_or_nop_p): Replace static with inline. --- gcc/hash-table.h | 2 +- gcc/lra-int.h | 2 +- gcc/recog.h | 2 +- gcc/sel-sched-ir.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 3f87ec06f37..c0c6e1cd83d 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -1275,7 +1275,7 @@ hashtab_entry_note_pointers (void *obj, void *h, gt_pointer_operator op, } template -static void +void gt_pch_nx (hash_table *h) { h->check_complete_insertion (); diff --git a/gcc/lra-int.h b/gcc/lra-int.h index 73f8eb004b0..a400a0f85e2 100644 --- a/gcc/lra-int.h +++ b/gcc/lra-int.h @@ -428,7 +428,7 @@ lra_get_regno_hard_regno (int regno) /* Change class of pseudo REGNO to NEW_CLASS. Print info about it using TITLE. Output a new line if NL_P. */ -static void inline +inline void lra_change_class (int regno, enum reg_class new_class, const char *title, bool nl_p) { diff --git a/gcc/recog.h b/gcc/recog.h index 764fa90afde..539a27c3edf 100644 --- a/gcc/recog.h +++ b/gcc/recog.h @@ -382,7 +382,7 @@ extern const operand_alternative *recog_op_alt; on operand OP of the current instruction alternative (which_alternative). Only valid after calling preprocess_constraints and constrain_operands. */ -inline static const operand_alternative * +inline const operand_alternative * which_op_alt () { gcc_checking_assert (IN_RANGE (which_alternative, 0, diff --git a/gcc/sel-sched-ir.h b/gcc/sel-sched-ir.h index 7034a1ab06c..0e87134c6db 100644 --- a/gcc/sel-sched-ir.h +++ b/gcc/sel-sched-ir.h @@ -1096,7 +1096,7 @@ get_loop_exit_edges_unique_dests (const class loop *loop) return edges; } -static bool +inline bool sel_bb_empty_or_nop_p (basic_block bb) { insn_t first = sel_bb_head (bb), last;