diff options
| author | Jason Merrill <jason@redhat.com> | 2017-02-17 15:28:38 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2017-02-17 15:28:38 -0500 |
| commit | 7c5867495bbfce161cd0461b002f626f9339b78f (patch) | |
| tree | 944e3f2408dbdc26f8b77dfd24a0e1f5230b31b5 /gcc | |
| parent | a530e1816779c1c8d4fe5ddaeb5cc313f2136152 (diff) | |
| download | gcc-7c5867495bbfce161cd0461b002f626f9339b78f.zip gcc-7c5867495bbfce161cd0461b002f626f9339b78f.tar.gz gcc-7c5867495bbfce161cd0461b002f626f9339b78f.tar.bz2 | |
PR c++/78690 - ICE with using and global type with same name
* pt.c (type_dependent_object_expression_p): True for
IDENTIFIER_NODE.
From-SVN: r245549
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/dependent-scope1.C | 17 |
3 files changed, 25 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a660c43..2e2cd6c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2017-02-17 Jason Merrill <jason@redhat.com> + PR c++/78690 - ICE with using and global type with same name + * pt.c (type_dependent_object_expression_p): True for + IDENTIFIER_NODE. + PR c++/79549 - C++17 ICE with non-type auto template parameter pack * pt.c (convert_template_argument): Just return an auto arg pack. (tsubst_template_args): Don't tsubst an auto pack type. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 04479d4..9e6ce8d 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -23932,6 +23932,10 @@ type_dependent_expression_p (tree expression) bool type_dependent_object_expression_p (tree object) { + /* An IDENTIFIER_NODE can sometimes have a TREE_TYPE, but it's still + dependent. */ + if (TREE_CODE (object) == IDENTIFIER_NODE) + return true; tree scope = TREE_TYPE (object); return (!scope || dependent_scope_p (scope)); } diff --git a/gcc/testsuite/g++.dg/template/dependent-scope1.C b/gcc/testsuite/g++.dg/template/dependent-scope1.C new file mode 100644 index 0000000..a5c18c4 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/dependent-scope1.C @@ -0,0 +1,17 @@ +// PR c++/78690 + +struct C; + +template <typename T> +struct A +{ + struct C { static void bar (); }; +}; + +template <typename T> +struct B +{ + using A<T>::C; + void + foo () { C.bar (); } +}; |