From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id C0DBE3858D37 for ; Tue, 19 Mar 2024 07:42:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C0DBE3858D37 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org C0DBE3858D37 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710834166; cv=none; b=iOtI1go3E2OPdV7Dzrb856eUmGy23asYV46kQRK21bqWIWP8h3vU+tvSXv1TWNphHsB6sn0HrT1t7N2PcrxIlltkqDErTDUjUwvCGKAVGU1z85/FB5DZ6SjvXR3NvHVzuuSeONg3MermIzcYbOzBUYSkJgl/2iUUA33e4P0swtM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1710834166; c=relaxed/simple; bh=62tU/hkw1E7n0XhQCnj8zWSSO/RMZTxLsVRe7Q2WMnM=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=SGvsrysug7YYU5JcxO0aLCsCeCnirNd/TrVnfGinN00F5QaFoN0xsVcu8+aP1h9S/H+kF5atCvBez7J+1f2drksRWblthPlf+yeWJTuK9jvOnvQbCnTqRmppKRjK4deqrVF7lriad70htsuPlP1c6yurSNP/dr0Lgxnex97tMb0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353726.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 42J6DYW7028225; Tue, 19 Mar 2024 07:42:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=sCxyI5+/3+/Q6Mz57MVv82lLhs+7iUB5riRDYuJ2UfI=; b=gF/BdQoiMDK0XNMgB2ObKvFV9eKtY61dY/stjEzq2WwavmHibZE0Qbn6+S71ugbp9Cuz 5rOtmRSb9hAHbzvsfFWiwA/DgtzamsTOt1KwJlvmmtCPCaN1S1bTuICCwhWqHArvFaN8 8z8KuZKoeGgu0OvBgA9bKjwon8vHrvXGmOAqdTVRISiZJ6GwpJOVAQ6dnhfFbrnemj+I sV+boAJZRvztaRLH9wjYUWG2GXWvRnh6PZ+MHveJJKvk7wtpzFfZ1pjQgUFbfZwylvjM WCXi4F9pO9QllAJGsEvcEtv2S1M3bCxJJMsyKDL/LohMJhLvcUSn3lLoRBSeYTOE/CIT IA== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3wy50srkhy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Mar 2024 07:42:43 +0000 Received: from m0353726.ppops.net (m0353726.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 42J7Xjub031860; Tue, 19 Mar 2024 07:42:42 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3wy50srkhs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Mar 2024 07:42:42 +0000 Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 42J6Gq6t002815; Tue, 19 Mar 2024 07:42:41 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 3wwrf2dga5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 19 Mar 2024 07:42:41 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 42J7gbIU38338924 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Mar 2024 07:42:40 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B35CD2004E; Tue, 19 Mar 2024 07:42:37 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9C3DC20040; Tue, 19 Mar 2024 07:42:35 +0000 (GMT) Received: from [9.197.237.136] (unknown [9.197.237.136]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 19 Mar 2024 07:42:35 +0000 (GMT) Message-ID: Date: Tue, 19 Mar 2024 15:42:33 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Subject: Re: [PATCH] rs6000: Fix up setup_incoming_varargs [PR114175] Content-Language: en-US To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org, David Edelsohn , Segher Boessenkool , "Joseph S. Myers" References: From: "Kewen.Lin" In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: BQITyxvG54dkIA4rhktTRDl7OkzIMkYR X-Proofpoint-GUID: 6MOknWruAq7dCEUzR9tRBIMxgyfiXDNc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-18_12,2024-03-18_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 spamscore=0 mlxscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 clxscore=1015 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2403140000 definitions=main-2403190058 X-Spam-Status: No, score=-5.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hi Jakub, on 2024/3/19 01:21, Jakub Jelinek wrote: > Hi! > > The c23-stdarg-8.c test (as well as the new test below added to cover even > more cases) FAIL on powerpc64le-linux and presumably other powerpc* targets > as well. > Like in the r14-9503-g218d174961 change on x86-64 we need to advance > next_cum after the hidden return pointer argument even in case where > there are no user arguments before ... in C23. > The following patch does that. > > There is another TYPE_NO_NAMED_ARGS_STDARG_P use later on: > if (!TYPE_NO_NAMED_ARGS_STDARG_P (TREE_TYPE (current_function_decl)) > && targetm.calls.must_pass_in_stack (arg)) > first_reg_offset += rs6000_arg_size (TYPE_MODE (arg.type), arg.type); > but I believe it was added there in r13-3549-g4fe34cdc unnecessarily, > when there is no hidden return pointer argument, arg.type is NULL and > must_pass_in_stack_var_size as well as must_pass_in_stack_var_size_or_pad > return false in that case, and for the TYPE_NO_NAMED_ARGS_STDARG_P > case with hidden return pointer argument that argument should have pointer > type and it is the first argument, so must_pass_in_stack shouldn't be true > for it either. > > Bootstrapped/regtested on powerpc64le-linux, bootstrap/regtest on > powerpc64-linux running, ok for trunk? Okay for trunk (I guess all testings should go well), thanks for taking care of this! FWIW, I also tested c23-stdarg-* test cases on aix with this patch, all of them worked well. BR, Kewen > > 2024-03-18 Jakub Jelinek > > PR target/114175 > * config/rs6000/rs6000-call.cc (setup_incoming_varargs): Only skip > rs6000_function_arg_advance_1 for TYPE_NO_NAMED_ARGS_STDARG_P functions > if arg.type is NULL. > > * gcc.dg/c23-stdarg-9.c: New test. > > --- gcc/config/rs6000/rs6000-call.cc.jj 2024-01-03 12:01:19.645532834 +0100 > +++ gcc/config/rs6000/rs6000-call.cc 2024-03-18 11:36:02.376846802 +0100 > @@ -2253,7 +2253,8 @@ setup_incoming_varargs (cumulative_args_ > > /* Skip the last named argument. */ > next_cum = *get_cumulative_args (cum); > - if (!TYPE_NO_NAMED_ARGS_STDARG_P (TREE_TYPE (current_function_decl))) > + if (!TYPE_NO_NAMED_ARGS_STDARG_P (TREE_TYPE (current_function_decl)) > + || arg.type != NULL_TREE) > rs6000_function_arg_advance_1 (&next_cum, arg.mode, arg.type, arg.named, > 0); > > --- gcc/testsuite/gcc.dg/c23-stdarg-9.c.jj 2024-03-18 11:46:17.281200214 +0100 > +++ gcc/testsuite/gcc.dg/c23-stdarg-9.c 2024-03-18 11:46:26.826065998 +0100 > @@ -0,0 +1,284 @@ > +/* Test C23 variadic functions with no named parameters, or last named > + parameter with a declaration not allowed in C17. Execution tests. */ > +/* { dg-do run } */ > +/* { dg-options "-O2 -std=c23 -pedantic-errors" } */ > + > +#include > + > +struct S { int a[1024]; }; > + > +int > +f1 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +int > +f2 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +int > +f3 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +int > +f4 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +int > +f5 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +int > +f6 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +int > +f7 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +int > +f8 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + return r; > +} > + > +struct S > +s1 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +struct S > +s2 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +struct S > +s3 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +struct S > +s4 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +struct S > +s5 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +struct S > +s6 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +struct S > +s7 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +struct S > +s8 (...) > +{ > + int r = 0; > + va_list ap; > + va_start (ap); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + r += va_arg (ap, int); > + va_end (ap); > + struct S s = {}; > + s.a[0] = r; > + return s; > +} > + > +int > +b1 (void) > +{ > + return f8 (1, 2, 3, 4, 5, 6, 7, 8); > +} > + > +int > +b2 (void) > +{ > + return s8 (1, 2, 3, 4, 5, 6, 7, 8).a[0]; > +} > + > +int > +main () > +{ > + if (f1 (1) != 1 || f2 (1, 2) != 3 || f3 (1, 2, 3) != 6 > + || f4 (1, 2, 3, 4) != 10 || f5 (1, 2, 3, 4, 5) != 15 > + || f6 (1, 2, 3, 4, 5, 6) != 21 || f7 (1, 2, 3, 4, 5, 6, 7) != 28 > + || f8 (1, 2, 3, 4, 5, 6, 7, 8) != 36) > + __builtin_abort (); > + if (s1 (1).a[0] != 1 || s2 (1, 2).a[0] != 3 || s3 (1, 2, 3).a[0] != 6 > + || s4 (1, 2, 3, 4).a[0] != 10 || s5 (1, 2, 3, 4, 5).a[0] != 15 > + || s6 (1, 2, 3, 4, 5, 6).a[0] != 21 > + || s7 (1, 2, 3, 4, 5, 6, 7).a[0] != 28 > + || s8 (1, 2, 3, 4, 5, 6, 7, 8).a[0] != 36) > + __builtin_abort (); > +} > > Jakub >