This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[Patch, testsuite] Fix bogus Wlogical-op-1.c test failure for avr
- From: Senthil Kumar Selvaraj <senthil_kumar dot selvaraj at atmel dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Wed, 16 Nov 2016 15:03:13 +0530
- Subject: [Patch, testsuite] Fix bogus Wlogical-op-1.c test failure for avr
- Authentication-results: sourceware.org; auth=none
Hi,
The below patch fixes c-c++-common/Wlogical-op-1.c for avr by
explicitly typedef'ing __INT32_TYPE for int and __INT16_TYPE__ for short
if the target's int size is less than 4 bytes.
The test assumes short is always smaller than int, and therefore does not
expect a warning when the logical operands are of type short and int.
This isn't true for the avr - shorts and ints are of the same size, and
therefore the warning triggers for the above case also.
Committed to trunk as obvious.
Regards
Senthil
gcc/testsuite/ChangeLog
2016-11-16 Senthil Kumar Selvaraj <senthil_kumar.selvaraj@atmel.com>
* c-c++-common/Wlogical-op-1.c: Use __INT{16,32}_TYPE__ instead
of {short,int} if __SIZEOF_INT__ is less than 4 bytes.
Index: c-c++-common/Wlogical-op-1.c
===================================================================
--- c-c++-common/Wlogical-op-1.c (revision 242471)
+++ c-c++-common/Wlogical-op-1.c (working copy)
@@ -8,12 +8,22 @@
# define false 0
#endif
-extern int bar (void);
-extern int *p;
-struct R { int a, b; } S;
+#if __SIZEOF_INT__ < 4
+ __extension__ typedef __INT32_TYPE__ int32_t;
+ __extension__ typedef __UINT32_TYPE__ uint32_t;
+ __extension__ typedef __INT16_TYPE__ int16_t;
+#else
+ typedef int int32_t;
+ typedef unsigned int uint32_t;
+ typedef short int16_t;
+#endif
+extern int32_t bar (void);
+extern int32_t *p;
+struct R { int32_t a, b; } S;
+
void
-andfn (int a, int b)
+andfn (int32_t a, int32_t b)
{
if (a && a) {} /* { dg-warning "logical .and. of equal expressions" } */
if (!a && !a) {} /* { dg-warning "logical .and. of equal expressions" } */
@@ -34,7 +44,7 @@
if (p[0] && p[0]) {} /* { dg-warning "logical .and. of equal expressions" } */
if (S.a && S.a) {} /* { dg-warning "logical .and. of equal expressions" } */
if ((bool) a && (bool) a) {} /* { dg-warning "logical .and. of equal expressions" } */
- if ((unsigned) a && a) {} /* { dg-warning "logical .and. of equal expressions" } */
+ if ((uint32_t) a && a) {} /* { dg-warning "logical .and. of equal expressions" } */
/* Stay quiet here. */
if (a && b) {}
@@ -48,7 +58,7 @@
if (a > 0 && a > 1) {}
if (a > -2 && a > 1) {}
- if (a && (short) a) {}
+ if (a && (int16_t) a) {}
if ((char) a && a) {}
if (++a && a) {}
if (++a && ++a) {}
@@ -61,7 +71,7 @@
}
void
-orfn (int a, int b)
+orfn (int32_t a, int32_t b)
{
if (a || a) {} /* { dg-warning "logical .or. of equal expressions" } */
if (!a || !a) {} /* { dg-warning "logical .or. of equal expressions" } */
@@ -82,7 +92,7 @@
if (p[0] || p[0]) {} /* { dg-warning "logical .or. of equal expressions" } */
if (S.a || S.a) {} /* { dg-warning "logical .or. of equal expressions" } */
if ((bool) a || (bool) a) {} /* { dg-warning "logical .or. of equal expressions" } */
- if ((unsigned) a || a) {} /* { dg-warning "logical .or. of equal expressions" } */
+ if ((uint32_t) a || a) {} /* { dg-warning "logical .or. of equal expressions" } */
/* Stay quiet here. */
if (a || b) {}
@@ -96,7 +106,7 @@
if (a > 0 || a > 1) {}
if (a > -2 || a > 1) {}
- if (a || (short) a) {}
+ if (a || (int16_t) a) {}
if ((char) a || a) {}
if (++a || a) {}
if (++a || ++a) {}