public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/c++-modules] PR c/94040 - ICE on a call to an invalid redeclaration of strftime
@ 2020-03-19 12:42 Nathan Sidwell
0 siblings, 0 replies; 2+ messages in thread
From: Nathan Sidwell @ 2020-03-19 12:42 UTC (permalink / raw)
To: gcc-cvs
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="us-ascii", Size: 2221 bytes --]
https://gcc.gnu.org/g:45ee7a35f347e59f003d65bce0d43d5123d827cf
commit 45ee7a35f347e59f003d65bce0d43d5123d827cf
Author: Martin Sebor <msebor@redhat.com>
Date: Fri Mar 13 12:29:33 2020 -0600
PR c/94040 - ICE on a call to an invalid redeclaration of strftime
gcc/testsuite/ChangeLog:
* gcc.dg/torture/pr54261-1.c: Correct built-in declartion.
Diff:
---
gcc/testsuite/ChangeLog | 1 +
gcc/testsuite/gcc.dg/torture/pr54261-1.c | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a379b4039d7..e3d1fc3b50f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -7,6 +7,7 @@
* gcc.dg/Wbuiltin-declaration-mismatch-15.c: New test.
* gcc.dg/pr62090.c: Prune expected warning.
* gcc.dg/pr89314.c: Look for warning name rather than text.
+ * gcc.dg/torture/pr54261-1.c: Correct built-in declartion.
2020-03-13 Uroš Bizjak <ubizjak@gmail.com>
diff --git a/gcc/testsuite/gcc.dg/torture/pr54261-1.c b/gcc/testsuite/gcc.dg/torture/pr54261-1.c
index 071b3232d46..7286124e9d6 100644
--- a/gcc/testsuite/gcc.dg/torture/pr54261-1.c
+++ b/gcc/testsuite/gcc.dg/torture/pr54261-1.c
@@ -8,23 +8,23 @@
a PASS. Where the bug trigs (at the time this test-case was added),
cas_int is also false but the fallback isn't used. */
__attribute__((__noinline__, __noclone__))
-int
+unsigned
# if __INT_MAX__ == 0x7fff
__sync_fetch_and_add_2
# else
__sync_fetch_and_add_4
# endif
- (int *at, int val)
+ (volatile void *at, unsigned val)
{
- int tmp = *at;
+ unsigned tmp = *(volatile unsigned*)at;
asm ("");
- *at = tmp + val;
+ *(volatile unsigned*)at = tmp + val;
return tmp;
}
#endif
__attribute__((__noinline__, __noclone__))
-void g (int *at, int val)
+void g (unsigned *at, unsigned val)
{
asm ("");
__sync_fetch_and_add (at, val);
@@ -35,8 +35,8 @@ int main(void)
/* On PTX it is not valid to perform atomic operations on auto
variables, which end up in .local. Making this static places it
in .global. */
- static int x = 41;
- int a = 1;
+ static unsigned x = 41;
+ unsigned a = 1;
g (&x, a);
if (x != 42)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gcc/devel/c++-modules] PR c/94040 - ICE on a call to an invalid redeclaration of strftime
@ 2020-03-19 12:42 Nathan Sidwell
0 siblings, 0 replies; 2+ messages in thread
From: Nathan Sidwell @ 2020-03-19 12:42 UTC (permalink / raw)
To: gcc-cvs
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="us-ascii", Size: 13719 bytes --]
https://gcc.gnu.org/g:f2e9fe5f97d88fc876c44e6ffa57a2e85150adf9
commit f2e9fe5f97d88fc876c44e6ffa57a2e85150adf9
Author: Martin Sebor <msebor@redhat.com>
Date: Fri Mar 13 10:28:26 2020 -0600
PR c/94040 - ICE on a call to an invalid redeclaration of strftime
gcc/c/ChangeLog:
PR c/94040
* c-decl.c (builtin_structptr_type_count): New constant.
(match_builtin_function_types): Reject decls that are incompatible
in types pointed to by pointers.
(diagnose_mismatched_decls): Adjust comments.
gcc/testsuite/ChangeLog:
PR c/94040
* gcc.dg/Wbuiltin-declaration-mismatch-12.c: Relax test to look
for warning name rather than the exact text.
* gcc.dg/Wbuiltin-declaration-mismatch-14.c: New test.
* gcc.dg/Wbuiltin-declaration-mismatch-15.c: New test.
* gcc.dg/pr62090.c: Prune expected warning.
* gcc.dg/pr89314.c: Look for warning name rather than text.
Diff:
---
gcc/c/ChangeLog | 8 +++
gcc/c/c-decl.c | 66 ++++++++++++-------
gcc/testsuite/ChangeLog | 10 +++
.../gcc.dg/Wbuiltin-declaration-mismatch-12.c | 4 +-
.../gcc.dg/Wbuiltin-declaration-mismatch-14.c | 77 ++++++++++++++++++++++
.../gcc.dg/Wbuiltin-declaration-mismatch-15.c | 56 ++++++++++++++++
gcc/testsuite/gcc.dg/pr62090.c | 2 +
gcc/testsuite/gcc.dg/pr89314.c | 2 +-
8 files changed, 198 insertions(+), 27 deletions(-)
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 5b8236ddb09..d3a3b2fc784 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,11 @@
+2020-03-13 Martin Sebor <msebor@redhat.com>
+
+ PR c/94040
+ * c-decl.c (builtin_structptr_type_count): New constant.
+ (match_builtin_function_types): Reject decls that are incompatible
+ in types pointed to by pointers.
+ (diagnose_mismatched_decls): Adjust comments.
+
2020-03-05 Joseph Myers <joseph@codesourcery.com>
PR c/93577
diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index c819fd0d0d5..87a0734b715 100644
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -1641,13 +1641,17 @@ c_bind (location_t loc, tree decl, bool is_global)
}
\f
-/* Stores the first FILE*, const struct tm* etc. argument type (whatever it
- is) seen in a declaration of a file I/O etc. built-in. Subsequent
- declarations of such built-ins are expected to refer to it rather than to
- fileptr_type_node etc. which is just void* (or to any other type).
+/* Stores the first FILE*, const struct tm* etc. argument type (whatever
+ it is) seen in a declaration of a file I/O etc. built-in, corresponding
+ to the builtin_structptr_types array. Subsequent declarations of such
+ built-ins are expected to refer to it rather than to fileptr_type_node,
+ etc. which is just void* (or to any other type).
Used only by match_builtin_function_types. */
-static GTY(()) tree last_structptr_types[6];
+static const unsigned builtin_structptr_type_count
+ = sizeof builtin_structptr_types / sizeof builtin_structptr_types[0];
+
+static GTY(()) tree last_structptr_types[builtin_structptr_type_count];
/* Returns true if types T1 and T2 representing return types or types
of function arguments are close enough to be considered interchangeable
@@ -1692,10 +1696,13 @@ match_builtin_function_types (tree newtype, tree oldtype,
tree newargs = TYPE_ARG_TYPES (newtype);
tree tryargs = newargs;
- gcc_checking_assert ((sizeof (last_structptr_types)
- / sizeof (last_structptr_types[0]))
- == (sizeof (builtin_structptr_types)
- / sizeof (builtin_structptr_types[0])));
+ const unsigned nlst
+ = sizeof last_structptr_types / sizeof last_structptr_types[0];
+ const unsigned nbst
+ = sizeof builtin_structptr_types / sizeof builtin_structptr_types[0];
+
+ gcc_checking_assert (nlst == nbst);
+
for (unsigned i = 1; oldargs || newargs; ++i)
{
if (!oldargs
@@ -1710,11 +1717,12 @@ match_builtin_function_types (tree newtype, tree oldtype,
if (!types_close_enough_to_match (oldtype, newtype))
return NULL_TREE;
- unsigned j = (sizeof (builtin_structptr_types)
- / sizeof (builtin_structptr_types[0]));
+ unsigned j = nbst;
if (POINTER_TYPE_P (oldtype))
- for (j = 0; j < (sizeof (builtin_structptr_types)
- / sizeof (builtin_structptr_types[0])); ++j)
+ /* Iterate over well-known struct types like FILE (whose types
+ aren't known to us) and compare the pointer to each to
+ the pointer argument. */
+ for (j = 0; j < nbst; ++j)
{
if (TREE_VALUE (oldargs) != builtin_structptr_types[j].node)
continue;
@@ -1734,13 +1742,26 @@ match_builtin_function_types (tree newtype, tree oldtype,
last_structptr_types[j] = newtype;
break;
}
- if (j == (sizeof (builtin_structptr_types)
- / sizeof (builtin_structptr_types[0]))
- && !*strict
- && !comptypes (oldtype, newtype))
+
+ if (j == nbst && !comptypes (oldtype, newtype))
{
- *argno = i;
- *strict = oldtype;
+ if (POINTER_TYPE_P (oldtype))
+ {
+ /* For incompatible pointers, only reject differences in
+ the unqualified variants of the referenced types but
+ consider differences in qualifiers as benign (report
+ those to caller via *STRICT below). */
+ tree oldref = TYPE_MAIN_VARIANT (TREE_TYPE (oldtype));
+ tree newref = TYPE_MAIN_VARIANT (TREE_TYPE (newtype));
+ if (!comptypes (oldref, newref))
+ return NULL_TREE;
+ }
+
+ if (!*strict)
+ {
+ *argno = i;
+ *strict = oldtype;
+ }
}
oldargs = TREE_CHAIN (oldargs);
@@ -1965,9 +1986,8 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl,
{
/* Accept "harmless" mismatches in function types such
as missing qualifiers or int vs long when they're the same
- size. However, with -Wextra in effect, diagnose return and
- argument types that are incompatible according to language
- rules. */
+ size. However, diagnose return and argument types that are
+ incompatible according to language rules. */
tree mismatch_expect;
unsigned mismatch_argno;
@@ -2002,8 +2022,6 @@ diagnose_mismatched_decls (tree newdecl, tree olddecl,
if (mismatch_expect && extra_warnings)
{
- /* If types match only loosely, print a warning but accept
- the redeclaration. */
location_t newloc = DECL_SOURCE_LOCATION (newdecl);
bool warned = false;
if (mismatch_argno)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e7b8c882655..a379b4039d7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2020-03-13 Martin Sebor <msebor@redhat.com>
+
+ PR c/94040
+ * gcc.dg/Wbuiltin-declaration-mismatch-12.c: Relax test to look
+ for warning name rather than the exact text.
+ * gcc.dg/Wbuiltin-declaration-mismatch-14.c: New test.
+ * gcc.dg/Wbuiltin-declaration-mismatch-15.c: New test.
+ * gcc.dg/pr62090.c: Prune expected warning.
+ * gcc.dg/pr89314.c: Look for warning name rather than text.
+
2020-03-13 Uroš Bizjak <ubizjak@gmail.com>
* gcc.target/i386/pr64409.c: Do not limit compilation to x32 targets.
diff --git a/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-12.c b/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-12.c
index 6bf97623b8d..f12ef6afb10 100644
--- a/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-12.c
+++ b/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-12.c
@@ -3,6 +3,6 @@
{ dg-do compile }
{ dg-options "-Wbuiltin-declaration-mismatch -Wextra" } */
-extern void __clear_cache (char*, char*); /* { dg-warning "mismatch in argument 1 type of built-in function .__clear_cache.; expected .void \\\*." } */
+extern void __clear_cache (char*, char*); // { dg-warning "\\\[-Wbuiltin-declaration-mismatch" }
-void __builtin_prefetch (const char *, ...); /* { dg-warning "mismatch in argument 1 type of built-in function .__builtin_prefetch.; expected .const void \\\*." } */
+void __builtin_prefetch (const char *, ...); // { dg-warning "\\\[-Wbuiltin-declaration-mismatch" }
diff --git a/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-14.c b/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-14.c
new file mode 100644
index 00000000000..cc536d71431
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-14.c
@@ -0,0 +1,77 @@
+/* PR c/94040 - ICE on a call to an invalid redeclaration of strftime
+ { dg-do compile }
+ { dg-options "-Wall" } */
+
+typedef __SIZE_TYPE__ size_t;
+
+struct tm;
+
+size_t strftime (char *, size_t, int *, struct tm *); // { dg-warning "-Wbuiltin-declaration-mismatch" }
+
+size_t call_strftime (char *d, size_t n, int *f, struct tm *t)
+{
+ size_t r = 0;
+ r += strftime (0, 0, 0, 0);
+ r += strftime (d, 0, 0, 0);
+ r += strftime (d, n, 0, 0);
+ r += strftime (d, n, f, 0);
+ r += strftime (d, n, f, t);
+ return r;
+}
+
+
+char* strchr (char*, char*); // { dg-warning "-Wbuiltin-declaration-mismatch" }
+
+// Verify that missing/extra qualifiers aren't diagnosed without -Wextra.
+
+int strcmp (char*, char*);
+int strncmp (volatile char*, volatile char*, size_t);
+
+// Verify that a difference in pointers is diagnosed.
+
+size_t strlen (const char**);
+// { dg-warning "-Wbuiltin-declaration-mismatch" "pointer" { target *-*-* } .-1 }
+
+ size_t strnlen (const char* const*, size_t);
+// { dg-warning "-Wbuiltin-declaration-mismatch" "pointer" { target *-*-* } .-1 }
+
+
+// Verify that calls to the compatibly-redeclared built-ins are treated
+// as those to the built-ins and diagnosed.
+
+int test_builtin_calls (size_t n)
+{
+ int r = 0;
+ r += strcmp ((char*)0, ""); // { dg-warning "\\\[-Wnonnull]" }
+ r += strcmp ("", (char*)0); // { dg-warning "\\\[-Wnonnull]" }
+
+ r += strncmp ((char*)0, "", n); // { dg-warning "\\\[-Wnonnull]" }
+ r += strncmp ("", (char*)0, n); // { dg-warning "\\\[-Wnonnull]" }
+
+ return r;
+}
+
+
+// Verify that calls to the incompatibly-redeclared built-ins are not
+// treated as those to the built-ins by the middle-end. It doesn't
+// matter if the front-end diagnoses them but the middle-end should
+// not because it shouldn't recognize them as built-ins.
+
+#pragma GCC optimize "2"
+
+size_t test_nonbuiltin_calls (char *s, int c)
+{
+ void *null = 0;
+
+ char *r;
+ r = strchr ((char*)null, s);
+ r = strchr (r, (char*)null);
+ *s = *r; // use the result
+
+ size_t n = 0;
+ n += strftime (0, 0, 0, 0);
+ n += strlen ((const char**)null);
+ n += strnlen ((const char**)null, n);
+
+ return n;
+}
diff --git a/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-15.c b/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-15.c
new file mode 100644
index 00000000000..3c32a5fc545
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/Wbuiltin-declaration-mismatch-15.c
@@ -0,0 +1,56 @@
+/* PR c/94040 - ICE on a call to an invalid redeclaration of strftime
+ { dg-do compile }
+ { dg-options "-Wall -Wextra" } */
+
+typedef __SIZE_TYPE__ size_t;
+
+struct tm;
+
+size_t strftime (const char *, size_t, char *, struct tm *);
+// { dg-warning "-Wbuiltin-declaration-mismatch" "arg 1" { target *-*-* } .-1 }
+
+// Verify that missing/extra qualifiers are diagnosed with -Wextra.
+
+int strcmp (char*, const char*);
+// { dg-warning "-Wbuiltin-declaration-mismatch" "arg 1" { target *-*-* } .-1 }
+
+int strncmp (const char*, volatile char*, size_t);
+// { dg-warning "-Wbuiltin-declaration-mismatch" "arg 2" { target *-*-* } .-1 }
+
+size_t strlen (char*);
+// { dg-warning "-Wbuiltin-declaration-mismatch" "arg 1" { target *-*-* } .-1 }
+
+
+// Verify that calls to built-ins declared with missing/extra qualifiers
+// are still treated as those to built-ins by the front-end.
+
+int test_builtin_calls_fe (size_t n)
+{
+ int r = 0;
+ r += strcmp ((char*)0, ""); // { dg-warning "\\\[-Wnonnull]" }
+ r += strcmp ("", (char*)0); // { dg-warning "\\\[-Wnonnull]" }
+
+ r += strncmp ((char*)0, "", n); // { dg-warning "\\\[-Wnonnull]" }
+ r += strncmp ("", (char*)0, n); // { dg-warning "\\\[-Wnonnull]" }
+
+ r += strlen ((char*)0); // { dg-warning "\\\[-Wnonnull]" }
+ return r;
+}
+
+
+// Ditto but by the middle-end.
+
+#pragma GCC optimize "2"
+
+int test_builtin_calls_me (void)
+{
+ char *null1 = 0;
+ char *null2 = null1;
+ char *null3 = null2;
+
+ int r = 0;
+ r += strcmp (null1, "123"); // { dg-warning "\\\[-Wnonnull]" }
+ r += strncmp ("2345", null2, 4); // { dg-warning "\\\[-Wnonnull]" }
+ r += strlen (null3); // { dg-warning "\\\[-Wnonnull]" }
+ return r;
+}
diff --git a/gcc/testsuite/gcc.dg/pr62090.c b/gcc/testsuite/gcc.dg/pr62090.c
index 53089cf1932..42f1345e646 100644
--- a/gcc/testsuite/gcc.dg/pr62090.c
+++ b/gcc/testsuite/gcc.dg/pr62090.c
@@ -15,3 +15,5 @@ log_bad_request ()
{
b += sprintf (0, "foo");
}
+
+/* { dg-prune-output "\\\[-Wbuiltin-declaration-mismatch]" } */
diff --git a/gcc/testsuite/gcc.dg/pr89314.c b/gcc/testsuite/gcc.dg/pr89314.c
index e35dd8c81e1..27b3a510bfd 100644
--- a/gcc/testsuite/gcc.dg/pr89314.c
+++ b/gcc/testsuite/gcc.dg/pr89314.c
@@ -2,7 +2,7 @@
/* { dg-do compile } */
/* { dg-options "-O2 -Wbuiltin-declaration-mismatch -Wextra" } */
-extern __SIZE_TYPE__ strlen (const float *); /* { dg-warning "mismatch in argument 1 type of built-in function" } */
+extern __SIZE_TYPE__ strlen (const float *); /* { dg-warning "\\\[-Wbuiltin-declaration-mismatch" } */
void bar (void);
void
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-19 12:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-19 12:42 [gcc/devel/c++-modules] PR c/94040 - ICE on a call to an invalid redeclaration of strftime Nathan Sidwell
-- strict thread matches above, loose matches on Subject: below --
2020-03-19 12:42 Nathan Sidwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).