From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id 5D39C3896C19; Mon, 12 Apr 2021 11:23:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5D39C3896C19 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r9-9342] c/99224 - avoid ICEing on invalid __builtin_next_arg X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/releases/gcc-9 X-Git-Oldrev: c0ae84d67a61512ec36d5c82ae52090c4b6440d1 X-Git-Newrev: c7712377876cb7e6c3ca3ce479245c6386dfc9a6 Message-Id: <20210412112343.5D39C3896C19@sourceware.org> Date: Mon, 12 Apr 2021 11:23:43 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 11:23:43 -0000 https://gcc.gnu.org/g:c7712377876cb7e6c3ca3ce479245c6386dfc9a6 commit r9-9342-gc7712377876cb7e6c3ca3ce479245c6386dfc9a6 Author: Richard Biener Date: Wed Feb 24 09:18:05 2021 +0100 c/99224 - avoid ICEing on invalid __builtin_next_arg This avoids crashes with __builtin_next_arg on non-parameters. For the specific testcase we arrive with an anonymous SSA_NAME so that SSA_NAME_VAR becomes NULL and we crash. 2021-02-24 Richard Biener PR c/99224 * builtins.c (fold_builtin_next_arg): Avoid NULL arg. * gcc.dg/pr99224.c: New testcase. (cherry picked from commit 084963dcaca2f0836366fdb001561e29ecbfb483) Diff: --- gcc/builtins.c | 3 ++- gcc/testsuite/gcc.dg/pr99224.c | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gcc/builtins.c b/gcc/builtins.c index e8e43f53ec6..39ba87a6759 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -10267,7 +10267,8 @@ fold_builtin_next_arg (tree exp, bool va_start_p) arg = CALL_EXPR_ARG (exp, 0); } - if (TREE_CODE (arg) == SSA_NAME) + if (TREE_CODE (arg) == SSA_NAME + && SSA_NAME_VAR (arg)) arg = SSA_NAME_VAR (arg); /* We destructively modify the call to be __builtin_va_start (ap, 0) diff --git a/gcc/testsuite/gcc.dg/pr99224.c b/gcc/testsuite/gcc.dg/pr99224.c new file mode 100644 index 00000000000..f6e9ac8eba3 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr99224.c @@ -0,0 +1,6 @@ +/* { dg-do compile } */ + +void f (char *c, ...) +{ + __builtin_next_arg (*c); /* { dg-warning "not last named argument" } */ +}