From patchwork Wed Apr 6 12:33:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xi Ruoyao X-Patchwork-Id: 52671 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 2D66C385E019 for ; Wed, 6 Apr 2022 12:34:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2D66C385E019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649248461; bh=PAKFEB8XHEJPIb3wyP4jcFuqnaCGHrwvpDFXJQZ27Ak=; h=Subject:To:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=urRA80dTJ/M2CcXeXisBoI0T3yF7usDUnsJIkJnGVnaWoOunVa4OqpyrnAUjFM4Si QWaM8nxpHfNyG/7XrRxQKlI6CeX1LbITHsfKtF/LJOaFj9QdvBBznEYHzwCax2OVdH sQpGYaVVnwgTfrGsAVcrTWOFp+UTo6gvmLBSK3K8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mengyan1223.wang (mengyan1223.wang [89.208.246.23]) by sourceware.org (Postfix) with ESMTPS id D719E385840F; Wed, 6 Apr 2022 12:33:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D719E385840F Received: from [IPv6:240e:358:1198:7700:dc73:854d:832e:4] (unknown [IPv6:240e:358:1198:7700:dc73:854d:832e:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) (Authenticated sender: xry111@mengyan1223.wang) by mengyan1223.wang (Postfix) with ESMTPSA id 93658661E3; Wed, 6 Apr 2022 08:33:47 -0400 (EDT) Message-ID: <4a202164da6a53b1f892dedb3e2d42ecd612e379.camel@mengyan1223.wang> Subject: [PATCH] mips: Fix C++14 vs. C++17 ABI incompatibility on mips64 To: gcc-patches@gcc.gnu.org Date: Wed, 06 Apr 2022 20:33:40 +0800 User-Agent: Evolution 3.44.0 MIME-Version: 1.0 X-Spam-Status: No, score=-3037.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_NUMSUBJECT, SPF_HELO_PASS, 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: Xi Ruoyao via Gcc-patches From: Xi Ruoyao Reply-To: Xi Ruoyao Cc: Richard Sandiford , Jakub Jelinek , YunQiang Su Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Another MIPS function return ABI fix. Ok for trunk? --- This fixes tmpdir-g++.dg-struct-layout-1/{t032,t059} failure. Clang++ ignores C++17 empty bases in return values as well. gcc/ * config/mips/mips.cc (mips_fpr_return_fields): Ignore cxx17_empty_base_field_p fields. --- gcc/config/mips/mips.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc/config/mips/mips.cc b/gcc/config/mips/mips.cc index 0f2492219f3..5010f99f761 100644 --- a/gcc/config/mips/mips.cc +++ b/gcc/config/mips/mips.cc @@ -6337,7 +6337,8 @@ mips_fpr_return_fields (const_tree valtype, tree *fields, i = 0; for (field = TYPE_FIELDS (valtype); field != 0; field = DECL_CHAIN (field)) { - if (TREE_CODE (field) != FIELD_DECL) + if (TREE_CODE (field) != FIELD_DECL + || cxx17_empty_base_field_p (field)) continue; if (DECL_FIELD_CXX_ZERO_WIDTH_BIT_FIELD (field))