diff mbox series

[2/2] Fix PR middle-end/107705: ICE after reclaration error

Message ID 1668741911-1727-2-git-send-email-apinski@marvell.com
State Committed
Commit ceba66ee230bb96b0889fc8ec7333c7ffae96d6e
Headers
Series [1/2] Fix PRs 106764, 106765, and 107307, all ICE after invalid re-declaration |

Commit Message

Li, Pan2 via Gcc-patches Nov. 18, 2022, 3:25 a.m. UTC 
  From: Andrew Pinski <apinski@marvell.com>

The problem here is after we created a call expression
in the C front-end, we replace the decl type with
an error mark node. We then end up calling
aggregate_value_p with the call expression
with the decl with the error mark as the type
and we ICE.

The fix is to check the function type
after we process the call expression inside
aggregate_value_p to get it.

OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.

Thanks,
Andrew Pinski

gcc/ChangeLog:

	PR middle-end/107705
	* function.cc (aggregate_value_p): Return 0 if
	the function type was an error operand.

gcc/testsuite/ChangeLog:

	* gcc.dg/redecl-22.c: New test.
---
 gcc/function.cc                  | 3 +++
 gcc/testsuite/gcc.dg/redecl-22.c | 9 +++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/redecl-22.c

Comments

Richard Biener Nov. 18, 2022, 8:45 a.m. UTC | #1 
On Fri, Nov 18, 2022 at 4:26 AM apinski--- via Gcc-patches
<gcc-patches@gcc.gnu.org> wrote:
>
> From: Andrew Pinski <apinski@marvell.com>
>
> The problem here is after we created a call expression
> in the C front-end, we replace the decl type with
> an error mark node. We then end up calling
> aggregate_value_p with the call expression
> with the decl with the error mark as the type
> and we ICE.
>
> The fix is to check the function type
> after we process the call expression inside
> aggregate_value_p to get it.
>
> OK? Bootstrapped and tested on x86_64-linux-gnu with no regressions.

OK.

> Thanks,
> Andrew Pinski
>
> gcc/ChangeLog:
>
>         PR middle-end/107705
>         * function.cc (aggregate_value_p): Return 0 if
>         the function type was an error operand.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.dg/redecl-22.c: New test.
> ---
>  gcc/function.cc                  | 3 +++
>  gcc/testsuite/gcc.dg/redecl-22.c | 9 +++++++++
>  2 files changed, 12 insertions(+)
>  create mode 100644 gcc/testsuite/gcc.dg/redecl-22.c
>
> diff --git a/gcc/function.cc b/gcc/function.cc
> index 361aa5f7ed1..9c8773bbc59 100644
> --- a/gcc/function.cc
> +++ b/gcc/function.cc
> @@ -2090,6 +2090,9 @@ aggregate_value_p (const_tree exp, const_tree fntype)
>    if (VOID_TYPE_P (type))
>      return 0;
>
> +  if (error_operand_p (fntype))
> +    return 0;
> +
>    /* If a record should be passed the same as its first (and only) member
>       don't pass it as an aggregate.  */
>    if (TREE_CODE (type) == RECORD_TYPE && TYPE_TRANSPARENT_AGGR (type))
> diff --git a/gcc/testsuite/gcc.dg/redecl-22.c b/gcc/testsuite/gcc.dg/redecl-22.c
> new file mode 100644
> index 00000000000..7758570fabe
> --- /dev/null
> +++ b/gcc/testsuite/gcc.dg/redecl-22.c
> @@ -0,0 +1,9 @@
> +/* We used to ICE in the gimplifier, PR 107705 */
> +/* { dg-do compile } */
> +/* { dg-options "-w" } */
> +int f (void)
> +{
> +  int (*p) (void) = 0; // { dg-note "" }
> +  return p ();
> +  int p = 1; // { dg-error "" }
> +}
> --
> 2.17.1
>
diff mbox series

Patch

diff --git a/gcc/function.cc b/gcc/function.cc
index 361aa5f7ed1..9c8773bbc59 100644
--- a/gcc/function.cc
+++ b/gcc/function.cc
@@ -2090,6 +2090,9 @@  aggregate_value_p (const_tree exp, const_tree fntype)
   if (VOID_TYPE_P (type))
     return 0;
 
+  if (error_operand_p (fntype))
+    return 0;
+
   /* If a record should be passed the same as its first (and only) member
      don't pass it as an aggregate.  */
   if (TREE_CODE (type) == RECORD_TYPE && TYPE_TRANSPARENT_AGGR (type))
diff --git a/gcc/testsuite/gcc.dg/redecl-22.c b/gcc/testsuite/gcc.dg/redecl-22.c
new file mode 100644
index 00000000000..7758570fabe
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/redecl-22.c
@@ -0,0 +1,9 @@ 
+/* We used to ICE in the gimplifier, PR 107705 */
+/* { dg-do compile } */
+/* { dg-options "-w" } */
+int f (void)
+{
+  int (*p) (void) = 0; // { dg-note "" }
+  return p ();
+  int p = 1; // { dg-error "" }
+}