From 1e77281b13f7422dda5c2e9f2e72efc364a1d156 Mon Sep 17 00:00:00 2001 From: Marek Polacek Date: Fri, 15 Apr 2016 13:15:23 +0000 Subject: [PATCH] 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 --- gcc/c-family/ChangeLog | 6 ++++++ gcc/c-family/c-common.c | 14 ++++++++++++-- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/c-c++-common/pr70651.c | 9 +++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/c-c++-common/pr70651.c diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index f842efc8d4e..ec79edbaa93 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2016-04-15 Marek Polacek + + PR c/70651 + * c-common.c (build_va_arg): Change two asserts into errors and return + error_mark_node. + 2016-04-13 Marek Polacek PR c++/70639 diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 30c815d5381..f2846bb26e7 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 % not of type %"); + 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 % not of type %"); + return error_mark_node; + } } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8eb124fa9c0..9b395d93e9a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-04-15 Marek Polacek + + PR c/70651 + * c-c++-common/pr70651.c: New test. + 2016-04-15 Kyrylo Tkachov 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 00000000000..a91a2d8fc88 --- /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 **); +} -- 2.30.2