diff options
| author | Marek Polacek <polacek@redhat.com> | 2020-04-17 23:48:11 -0400 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2020-05-07 14:11:31 -0400 |
| commit | 21968d4ae067e3fa1c1728c8db26478e8ac8ad0b (patch) | |
| tree | 7088aed2bf14766d3337f2b58622dcd8a793e059 /gcc | |
| parent | a5cac223dff2f83b83318ecf4dedc98a98649e2a (diff) | |
| download | gcc-21968d4ae067e3fa1c1728c8db26478e8ac8ad0b.zip gcc-21968d4ae067e3fa1c1728c8db26478e8ac8ad0b.tar.gz gcc-21968d4ae067e3fa1c1728c8db26478e8ac8ad0b.tar.bz2 | |
c++: Fix crash with template spec in different namespace [PR94255]
This is an ICE on invalid, because we're specializing S::foo in the
wrong namespace. cp_parser_class_specifier_1 parses S::foo in M
and then it tries to push the nested-name-specifier of foo, which is
S. By that, we're breaking the assumption of push_inner_scope that
the pushed scope must be a scope nested inside current scope: current
scope is M, but the namespace context of S is N, and N is not nested
in M, so we fell into an infinite loop in push_inner_scope_r.
(cp_parser_class_head called check_specialization_namespace which already
gave a permerror.)
PR c++/94255
* parser.c (cp_parser_class_specifier_1): Check that the scope is
nested inside current scope before pushing it.
* g++.dg/template/spec41.C: New test.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/spec41.C | 17 |
4 files changed, 34 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 312f1ab..7454352 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2020-05-07 Marek Polacek <polacek@redhat.com> + PR c++/94255 + * parser.c (cp_parser_class_specifier_1): Check that the scope is + nested inside current scope before pushing it. + +2020-05-07 Marek Polacek <polacek@redhat.com> + P1957R2 * typeck2.c (check_narrowing): Consider T* to bool narrowing in C++11 and up. diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 5832025..d67fa3b 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -23873,7 +23873,12 @@ cp_parser_class_specifier_1 (cp_parser* parser) if (nested_name_specifier_p) { scope = CP_DECL_CONTEXT (TYPE_MAIN_DECL (type)); - old_scope = push_inner_scope (scope); + /* SCOPE must be a scope nested inside current scope. */ + if (is_nested_namespace (current_namespace, + decl_namespace_context (scope))) + old_scope = push_inner_scope (scope); + else + nested_name_specifier_p = false; } type = begin_class_definition (type); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d14d534..bed2d90 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2020-05-07 Marek Polacek <polacek@redhat.com> + PR c++/94255 + * g++.dg/template/spec41.C: New test. + +2020-05-07 Marek Polacek <polacek@redhat.com> + P1957R2 * g++.dg/cpp0x/initlist92.C: Don't expect an error in C++20 only. diff --git a/gcc/testsuite/g++.dg/template/spec41.C b/gcc/testsuite/g++.dg/template/spec41.C new file mode 100644 index 0000000..249fde7 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/spec41.C @@ -0,0 +1,17 @@ +// PR c++/94255 - crash with template spec in different namespace. +// { dg-do compile { target c++11 } } + +namespace N { + class S { + template <typename> struct foo; + }; + namespace M { + using S = ::N::S; + } +} + +namespace N { + namespace M { + template <> struct S::foo<int> {}; // { dg-error "specialization of" } + } +} |