diff options
| author | Jason Merrill <jason@redhat.com> | 2014-07-14 16:39:35 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-07-14 16:39:35 -0400 |
| commit | d110c52ee3620c3ba0f23f113383b3e8e7b3c0eb (patch) | |
| tree | bf697d23f24548b0ddb508dd3263dcf57f54df81 | |
| parent | d8e11262f0dcc28ce6236ee0764dcba68923b12c (diff) | |
| download | gcc-d110c52ee3620c3ba0f23f113383b3e8e7b3c0eb.zip gcc-d110c52ee3620c3ba0f23f113383b3e8e7b3c0eb.tar.gz gcc-d110c52ee3620c3ba0f23f113383b3e8e7b3c0eb.tar.bz2 | |
re PR c++/61445 ([C++11] ice in instantiate_decl at cp/pt.c:19770)
PR c++/61445
PR c++/56947
* pt.c (instantiate_decl): Don't check defer_ok for local class
members.
From-SVN: r212524
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/local9.C | 15 |
3 files changed, 22 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 98af8db..0d66bb3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2014-07-14 Jason Merrill <jason@redhat.com> + + PR c++/61445 + PR c++/56947 + * pt.c (instantiate_decl): Don't check defer_ok for local class + members. + 2014-07-14 Jakub Jelinek <jakub@redhat.com> PR middle-end/61294 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 7b79280..b32cf6c 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -19775,11 +19775,6 @@ instantiate_decl (tree d, int defer_ok, if (external_p && !always_instantiate_p (d)) return d; - /* Any local class members should be instantiated from the TAG_DEFN - with defer_ok == 0. */ - gcc_checking_assert (!defer_ok || !decl_function_context (d) - || LAMBDA_TYPE_P (DECL_CONTEXT (d))); - gen_tmpl = most_general_template (tmpl); gen_args = DECL_TI_ARGS (d); diff --git a/gcc/testsuite/g++.dg/template/local9.C b/gcc/testsuite/g++.dg/template/local9.C new file mode 100644 index 0000000..90f14bb --- /dev/null +++ b/gcc/testsuite/g++.dg/template/local9.C @@ -0,0 +1,15 @@ +// PR c++/61445 + +template <typename T> void f (T) +{ + struct A + { + struct B { B(); }; + void g () { B b; } + }; +} + +int main() +{ + f(0); +} |