aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2021-06-07 18:17:31 +0200
committerEric Botcazou <ebotcazou@adacore.com>2021-06-07 18:22:29 +0200
commit97d83259b91fb558f5b09bfb09529900f585c4c9 (patch)
tree056bbb7001ac9840e7ea501389fd4e2b580988bf
parent6cb35b606c39d5f21f3298c77bfbcaaef3fbc872 (diff)
downloadgcc-97d83259b91fb558f5b09bfb09529900f585c4c9.zip
gcc-97d83259b91fb558f5b09bfb09529900f585c4c9.tar.gz
gcc-97d83259b91fb558f5b09bfb09529900f585c4c9.tar.bz2
Fix old thinko in warning on pointer for storage order purposes
gcc/c PR c/100920 * c-typeck.c (convert_for_assignment): Test fndecl_built_in_p to spot built-in functions. gcc/testsuite/ * gcc.dg/sso-14.c: Adjust.
-rw-r--r--gcc/c/c-typeck.c2
-rw-r--r--gcc/testsuite/gcc.dg/sso-14.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c
index daa2e12..845d50f 100644
--- a/gcc/c/c-typeck.c
+++ b/gcc/c/c-typeck.c
@@ -7303,7 +7303,7 @@ convert_for_assignment (location_t location, location_t expr_loc, tree type,
/* Do not warn for built-in functions, for example memcpy, since we
control how they behave and they can be useful in this area. */
if (TREE_CODE (rname) != FUNCTION_DECL
- || !DECL_IS_UNDECLARED_BUILTIN (rname))
+ || !fndecl_built_in_p (rname))
warning_at (location, OPT_Wscalar_storage_order,
"passing argument %d of %qE from incompatible "
"scalar storage order", parmnum, rname);
diff --git a/gcc/testsuite/gcc.dg/sso-14.c b/gcc/testsuite/gcc.dg/sso-14.c
index af98145..8941946 100644
--- a/gcc/testsuite/gcc.dg/sso-14.c
+++ b/gcc/testsuite/gcc.dg/sso-14.c
@@ -5,6 +5,7 @@
#include <stddef.h>
#include <stdlib.h>
+#include <string.h>
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#define REV_ENDIANNESS __attribute__((scalar_storage_order("big-endian")))
@@ -42,12 +43,14 @@ int main(void)
{
t_s12 *msg1 = __builtin_alloca(10);
t_u12 *msg2 = __builtin_alloca(10);
+ int same;
msg1 = malloc (sizeof (t_s12));
msg2 = malloc (sizeof (t_u12));
- msg1->a[0].val = 0;
- msg2->a[0].val = 0;
+ memset (msg1, 0, sizeof (t_s12));
+ memcpy (msg2, &msg1, sizeof (t_s12));
+ same = memcmp (msg1, msg2, sizeof (t_s12));
return 0;
}