gcc.dg/memchr-3.c: fix for LLP64

Message ID de0cc9e3-5c41-2bc4-64fb-37e6902d9ef5@gmail.com
State Unresolved
Headers
Series gcc.dg/memchr-3.c: fix for LLP64 |

Checks

Context Check Description
snail/gcc-patch-check warning Git am fail log

Commit Message

Jonathan Yong Feb. 27, 2023, 10:09 a.m. UTC
  Attached patch OK?

     gcc.dg/memchr-3.c: fix for LLP64

             gcc/testsuite/ChangeLog:

             PR middle-end/97956
             * gcc.dg/memchr-3.c (memchr): fix long to size_t in
             prototype.
  

Comments

Richard Sandiford Feb. 27, 2023, 4:55 p.m. UTC | #1
Jonathan Yong via Gcc-patches <gcc-patches@gcc.gnu.org> writes:
> Attached patch OK?
>
>      gcc.dg/memchr-3.c: fix for LLP64
>
>              gcc/testsuite/ChangeLog:
>
>              PR middle-end/97956
>              * gcc.dg/memchr-3.c (memchr): fix long to size_t in
>              prototype.
>
> From 194eb3d43964276beeaea14ebee4b241799cd966 Mon Sep 17 00:00:00 2001
> From: Jonathan Yong <10walls@gmail.com>
> Date: Mon, 27 Feb 2023 10:02:32 +0000
> Subject: [PATCH] gcc.dg/memchr-3.c: fix for LLP64
>
> 	gcc/testsuite/ChangeLog:
>
> 	PR middle-end/97956
> 	* gcc.dg/memchr-3.c (memchr): fix long to size_t in
> 	prototype.

It looks like the current type signature could have been a deliberate
part of the test.  I think we should just skip it for LLP64 instead.
Preapproved if you agree.

Thanks,
Richard

>
> Signed-off-by: Jonathan Yong <10walls@gmail.com>
> ---
>  gcc/testsuite/gcc.dg/memchr-3.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/gcc/testsuite/gcc.dg/memchr-3.c b/gcc/testsuite/gcc.dg/memchr-3.c
> index c38d9cf3349..c1f4e9e10dc 100644
> --- a/gcc/testsuite/gcc.dg/memchr-3.c
> +++ b/gcc/testsuite/gcc.dg/memchr-3.c
> @@ -5,8 +5,9 @@
>  
>  typedef __INT8_TYPE__  int8_t;
>  typedef __INT32_TYPE__ int32_t;
> +typedef __SIZE_TYPE__  size_t;
>  
> -extern void* memchr (const void*, int, long);
> +extern void* memchr (const void*, int, size_t);
>  
>  struct SX
>  {
  
Jonathan Yong March 1, 2023, 1:41 p.m. UTC | #2
On 2/27/23 16:55, Richard Sandiford wrote:
> Jonathan Yong via Gcc-patches <gcc-patches@gcc.gnu.org> writes:
>> Attached patch OK?
>>
>>       gcc.dg/memchr-3.c: fix for LLP64
>>
>>               gcc/testsuite/ChangeLog:
>>
>>               PR middle-end/97956
>>               * gcc.dg/memchr-3.c (memchr): fix long to size_t in
>>               prototype.
>>
>>  From 194eb3d43964276beeaea14ebee4b241799cd966 Mon Sep 17 00:00:00 2001
>> From: Jonathan Yong <10walls@gmail.com>
>> Date: Mon, 27 Feb 2023 10:02:32 +0000
>> Subject: [PATCH] gcc.dg/memchr-3.c: fix for LLP64
>>
>> 	gcc/testsuite/ChangeLog:
>>
>> 	PR middle-end/97956
>> 	* gcc.dg/memchr-3.c (memchr): fix long to size_t in
>> 	prototype.
> 
> It looks like the current type signature could have been a deliberate
> part of the test.  I think we should just skip it for LLP64 instead.
> Preapproved if you agree.
> 
> Thanks,
> Richard
> 

Revised, account for the warning in LLP64.
  
Richard Sandiford March 2, 2023, 10:46 a.m. UTC | #3
Jonathan Yong <10walls@gmail.com> writes:
> On 2/27/23 16:55, Richard Sandiford wrote:
>> Jonathan Yong via Gcc-patches <gcc-patches@gcc.gnu.org> writes:
>>> Attached patch OK?
>>>
>>>       gcc.dg/memchr-3.c: fix for LLP64
>>>
>>>               gcc/testsuite/ChangeLog:
>>>
>>>               PR middle-end/97956
>>>               * gcc.dg/memchr-3.c (memchr): fix long to size_t in
>>>               prototype.
>>>
>>>  From 194eb3d43964276beeaea14ebee4b241799cd966 Mon Sep 17 00:00:00 2001
>>> From: Jonathan Yong <10walls@gmail.com>
>>> Date: Mon, 27 Feb 2023 10:02:32 +0000
>>> Subject: [PATCH] gcc.dg/memchr-3.c: fix for LLP64
>>>
>>> 	gcc/testsuite/ChangeLog:
>>>
>>> 	PR middle-end/97956
>>> 	* gcc.dg/memchr-3.c (memchr): fix long to size_t in
>>> 	prototype.
>> 
>> It looks like the current type signature could have been a deliberate
>> part of the test.  I think we should just skip it for LLP64 instead.
>> Preapproved if you agree.
>> 
>> Thanks,
>> Richard
>> 
>
> Revised, account for the warning in LLP64.
>
>
> From 2dbfa538fe11c65914b28f94d066daee789f881a Mon Sep 17 00:00:00 2001
> From: Jonathan Yong <10walls@gmail.com>
> Date: Mon, 27 Feb 2023 10:02:32 +0000
> Subject: [PATCH 6/7] gcc.dg/memchr-3.c: Account for LLP64 warnings
>
> 	gcc/testsuite/ChangeLog:
>
> 	PR middle-end/97956
> 	* gcc.dg/memchr-3.c (memchr): Account for LLP64 warnings.
>
> Signed-off-by: Jonathan Yong <10walls@gmail.com>
> ---
>  gcc/testsuite/gcc.dg/memchr-3.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gcc/testsuite/gcc.dg/memchr-3.c b/gcc/testsuite/gcc.dg/memchr-3.c
> index c38d9cf3349..af1b26ef3ae 100644
> --- a/gcc/testsuite/gcc.dg/memchr-3.c
> +++ b/gcc/testsuite/gcc.dg/memchr-3.c
> @@ -6,7 +6,7 @@
>  typedef __INT8_TYPE__  int8_t;
>  typedef __INT32_TYPE__ int32_t;
>  
> -extern void* memchr (const void*, int, long);
> +extern void* memchr (const void*, int, long); /* { dg-warning "-Wbuiltin-declaration-mismatch" { target llp64 } } */
>  
>  struct SX
>  {

OK, thanks.

Richard
  
Jonathan Yong March 2, 2023, 1:43 p.m. UTC | #4
On 3/2/23 10:46, Richard Sandiford wrote:
>> diff --git a/gcc/testsuite/gcc.dg/memchr-3.c b/gcc/testsuite/gcc.dg/memchr-3.c
>> index c38d9cf3349..af1b26ef3ae 100644
>> --- a/gcc/testsuite/gcc.dg/memchr-3.c
>> +++ b/gcc/testsuite/gcc.dg/memchr-3.c
>> @@ -6,7 +6,7 @@
>>   typedef __INT8_TYPE__  int8_t;
>>   typedef __INT32_TYPE__ int32_t;
>>   
>> -extern void* memchr (const void*, int, long);
>> +extern void* memchr (const void*, int, long); /* { dg-warning "-Wbuiltin-declaration-mismatch" { target llp64 } } */
>>   
>>   struct SX
>>   {
> 
> OK, thanks.
> 
> Richard

Thanks, pushed to master branch.
  

Patch

From 194eb3d43964276beeaea14ebee4b241799cd966 Mon Sep 17 00:00:00 2001
From: Jonathan Yong <10walls@gmail.com>
Date: Mon, 27 Feb 2023 10:02:32 +0000
Subject: [PATCH] gcc.dg/memchr-3.c: fix for LLP64

	gcc/testsuite/ChangeLog:

	PR middle-end/97956
	* gcc.dg/memchr-3.c (memchr): fix long to size_t in
	prototype.

Signed-off-by: Jonathan Yong <10walls@gmail.com>
---
 gcc/testsuite/gcc.dg/memchr-3.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/gcc.dg/memchr-3.c b/gcc/testsuite/gcc.dg/memchr-3.c
index c38d9cf3349..c1f4e9e10dc 100644
--- a/gcc/testsuite/gcc.dg/memchr-3.c
+++ b/gcc/testsuite/gcc.dg/memchr-3.c
@@ -5,8 +5,9 @@ 
 
 typedef __INT8_TYPE__  int8_t;
 typedef __INT32_TYPE__ int32_t;
+typedef __SIZE_TYPE__  size_t;
 
-extern void* memchr (const void*, int, long);
+extern void* memchr (const void*, int, size_t);
 
 struct SX
 {
-- 
2.39.2