From a283c407619b032551995bec2a0732ea094a834c Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Tue, 5 Feb 2013 22:33:55 -0500 Subject: [PATCH] re PR c++/56177 (ICE when used forward for 'auto f();') PR c++/56177 * decl.c (start_preparsed_function): Update restype if we change decl1. From-SVN: r195780 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/decl.c | 1 + gcc/testsuite/g++.dg/cpp1y/auto-fn14.C | 5 +++++ 3 files changed, 10 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp1y/auto-fn14.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ce0bfad..a2bd701 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2013-02-05 Jason Merrill + PR c++/56177 + * decl.c (start_preparsed_function): Update restype if we change + decl1. + PR c++/56208 * pt.c (fn_type_unification): Discard any access checks from substituting explicit args. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 9b40018..cfee0f8 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -13116,6 +13116,7 @@ start_preparsed_function (tree decl1, tree attrs, int flags) DECL_CONTEXT (decl1) = DECL_CONTEXT (DECL_TI_TEMPLATE (decl1)); } fntype = TREE_TYPE (decl1); + restype = TREE_TYPE (fntype); /* If #pragma weak applies, mark the decl appropriately now. The pragma only applies to global functions. Because diff --git a/gcc/testsuite/g++.dg/cpp1y/auto-fn14.C b/gcc/testsuite/g++.dg/cpp1y/auto-fn14.C new file mode 100644 index 0000000..e7e8699 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/auto-fn14.C @@ -0,0 +1,5 @@ +// PR c++/56177 +// { dg-options "-std=c++1y" } + +auto f (); +auto f () { return 33; } -- 2.7.4