diff options
| author | Jason Merrill <jason@redhat.com> | 2014-05-30 14:55:56 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2014-05-30 14:55:56 -0400 |
| commit | b6bb89777e6555619405ac85c024db4f43d10870 (patch) | |
| tree | 5836835f67d73e317d8317e51862b231859d73b3 | |
| parent | 51db86a829cb328a78138283bafd8770f365a76b (diff) | |
| download | gcc-b6bb89777e6555619405ac85c024db4f43d10870.zip gcc-b6bb89777e6555619405ac85c024db4f43d10870.tar.gz gcc-b6bb89777e6555619405ac85c024db4f43d10870.tar.bz2 | |
re PR c++/56947 (Bogus 'XX' was not declared in this scope)
PR c++/56947
* pt.c (instantiate_decl): Check that defer_ok is not set for
local class members.
From-SVN: r211094
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/local8.C | 18 |
3 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b313801..34287b5 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2014-05-30 Jason Merrill <jason@redhat.com> + PR c++/56947 + * pt.c (instantiate_decl): Check that defer_ok is not set for + local class members. + PR c++/60992 * pt.c (tsubst_init): Split out from... (tsubst_expr) [DECL_EXPR]: Here. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index a24e044..0d22fae 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -19696,6 +19696,11 @@ 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/local8.C b/gcc/testsuite/g++.dg/template/local8.C new file mode 100644 index 0000000..006bd8c --- /dev/null +++ b/gcc/testsuite/g++.dg/template/local8.C @@ -0,0 +1,18 @@ +// PR c++/56947 + +struct A +{ + A (int); +}; + +template < typename > +void Fn () +{ + const int kCapacity = 0; + struct Q:A + { + Q ():A (kCapacity) { } + }; + Q q; +} +template void Fn < int >(); |