diff options
| author | Marek Polacek <polacek@redhat.com> | 2016-04-15 13:15:23 +0000 |
|---|---|---|
| committer | Marek Polacek <mpolacek@gcc.gnu.org> | 2016-04-15 13:15:23 +0000 |
| commit | 1e77281b13f7422dda5c2e9f2e72efc364a1d156 (patch) | |
| tree | 061774906bbfa0c5be9e741fd1174ca837aed154 | |
| parent | 51dbe4a05d67f3fe09dcd08336024293ef3fbd0c (diff) | |
| download | gcc-1e77281b13f7422dda5c2e9f2e72efc364a1d156.zip gcc-1e77281b13f7422dda5c2e9f2e72efc364a1d156.tar.gz gcc-1e77281b13f7422dda5c2e9f2e72efc364a1d156.tar.bz2 | |
re PR c/70651 (ICE on invalid code on x86_64-linux-gnu in build_va_arg, at c-family/c-common.c:5728)
PR c/70651
* c-common.c (build_va_arg): Change two asserts into errors and return
error_mark_node.
* c-c++-common/pr70651.c: New test.
From-SVN: r235027
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/pr70651.c | 9 |
4 files changed, 32 insertions, 2 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index f842efc..ec79edb 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2016-04-15 Marek Polacek <polacek@redhat.com> + + PR c/70651 + * c-common.c (build_va_arg): Change two asserts into errors and return + error_mark_node. + 2016-04-13 Marek Polacek <polacek@redhat.com> PR c++/70639 diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 30c815d..f2846bb 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -5725,7 +5725,12 @@ build_va_arg (location_t loc, tree expr, tree type) /* Verify that &ap is still recognized as having va_list type. */ tree canon_expr_type = targetm.canonical_va_list_type (TREE_TYPE (expr)); - gcc_assert (canon_expr_type != NULL_TREE); + if (canon_expr_type == NULL_TREE) + { + error_at (loc, + "first argument to %<va_arg%> not of type %<va_list%>"); + return error_mark_node; + } return build_va_arg_1 (loc, type, expr); } @@ -5793,7 +5798,12 @@ build_va_arg (location_t loc, tree expr, tree type) /* Verify that &ap is still recognized as having va_list type. */ tree canon_expr_type = targetm.canonical_va_list_type (TREE_TYPE (expr)); - gcc_assert (canon_expr_type != NULL_TREE); + if (canon_expr_type == NULL_TREE) + { + error_at (loc, + "first argument to %<va_arg%> not of type %<va_list%>"); + return error_mark_node; + } } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8eb124f..9b395d9 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-04-15 Marek Polacek <polacek@redhat.com> + + PR c/70651 + * c-c++-common/pr70651.c: New test. + 2016-04-15 Kyrylo Tkachov <kyrylo.tkachov@arm.com> PR rtl-optimization/70681 diff --git a/gcc/testsuite/c-c++-common/pr70651.c b/gcc/testsuite/c-c++-common/pr70651.c new file mode 100644 index 0000000..a91a2d8 --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr70651.c @@ -0,0 +1,9 @@ +/* PR c/70651 */ +/* { dg-do compile } */ +/* { dg-prune-output "\[^\n\r\]*first argument to .va_arg. not of type .va_list.\[^\n\r\]*" } */ + +void fn1 () +{ + char **a = 0; + __builtin_va_arg (a, char **); +} |