From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1314) id AC4A63857C5A; Wed, 18 Oct 2023 22:35:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AC4A63857C5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1697668509; bh=R8ZX97HMxWANVBSBRhgL4gyxiqvpZkAh1Zh0CObFclU=; h=From:To:Subject:Date:From; b=uA/2778ZmshRUDfR7eDpyLNzgyib6lW4+mP8zzQ3RZVfBnFtVzvDVuakNCP1UiPgr SmXWYyiH3NEEbzKkCtNhJictAbElftwBfQ56rfWuuhs1PGe2ex8+IZMFbHONqhj0Lb gZ4IveIiQUfKd1LLKoCEgWxWzMvnKdkCkX0XxPL8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Andrew Pinski To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4728] [c] Fix PR 101364: ICE after error due to diagnose_arglist_conflict not checking for error X-Act-Checkin: gcc X-Git-Author: Andrew Pinski X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 11e6bcedb41359c69ee790f38b04033d236336a8 X-Git-Newrev: 879c91fcccf93681bd7e13290bfbb384cadcd268 Message-Id: <20231018223509.AC4A63857C5A@sourceware.org> Date: Wed, 18 Oct 2023 22:35:09 +0000 (GMT) List-Id: https://gcc.gnu.org/g:879c91fcccf93681bd7e13290bfbb384cadcd268 commit r14-4728-g879c91fcccf93681bd7e13290bfbb384cadcd268 Author: Andrew Pinski Date: Sat Oct 14 13:40:05 2023 -0700 [c] Fix PR 101364: ICE after error due to diagnose_arglist_conflict not checking for error When checking to see if we have a function declaration has a conflict due to promotations, there is no test to see if the type was an error mark and then calls c_type_promotes_to. c_type_promotes_to is not ready for error_mark and causes an ICE. This adds a check for error before the call of c_type_promotes_to. OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions. PR c/101364 gcc/c/ChangeLog: * c-decl.cc (diagnose_arglist_conflict): Test for error mark before calling of c_type_promotes_to. gcc/testsuite/ChangeLog: * gcc.dg/pr101364-1.c: New test. Diff: --- gcc/c/c-decl.cc | 3 ++- gcc/testsuite/gcc.dg/pr101364-1.c | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gcc/c/c-decl.cc b/gcc/c/c-decl.cc index 0de384783041..7a145bed281f 100644 --- a/gcc/c/c-decl.cc +++ b/gcc/c/c-decl.cc @@ -1899,7 +1899,8 @@ diagnose_arglist_conflict (tree newdecl, tree olddecl, break; } - if (c_type_promotes_to (type) != type) + if (!error_operand_p (type) + && c_type_promotes_to (type) != type) { inform (input_location, "an argument type that has a default " "promotion cannot match an empty parameter name list " diff --git a/gcc/testsuite/gcc.dg/pr101364-1.c b/gcc/testsuite/gcc.dg/pr101364-1.c new file mode 100644 index 000000000000..e7c94a05553c --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr101364-1.c @@ -0,0 +1,8 @@ +/* { dg-do compile } */ +/* { dg-options "-std=c90 "} */ + +void fruit(); /* { dg-message "previous declaration" } */ +void fruit( /* { dg-error "conflicting types for" } */ + int b[x], /* { dg-error "undeclared " } */ + short c) +{} /* { dg-message "an argument type that has a" } */