diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2015-08-22 17:44:46 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2015-08-22 17:44:46 +0000 |
| commit | 82e78c3f286b8f03008fb22229310cfe4174b1ca (patch) | |
| tree | c8ea43d8552009f1ae662f8f4aaf98e41323b43b | |
| parent | 2e969ce55137fdf615207106ceabcaa462ef74a2 (diff) | |
| download | gcc-82e78c3f286b8f03008fb22229310cfe4174b1ca.zip gcc-82e78c3f286b8f03008fb22229310cfe4174b1ca.tar.gz gcc-82e78c3f286b8f03008fb22229310cfe4174b1ca.tar.bz2 | |
re PR c++/63693 (ICE in resolve_typename_type)
/cp
2015-08-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/63693
* pt.c (resolve_typename_type): Use CLASSTYPE_PRIMARY_TEMPLATE_TYPE
only on class types.
/testsuite
2015-08-22 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/63693
* g++.dg/cpp0x/decltype63.C: New.
From-SVN: r227098
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/decltype63.C | 7 |
4 files changed, 20 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c2a1206..b5a3398 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2015-08-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/63693 + * pt.c (resolve_typename_type): Use CLASSTYPE_PRIMARY_TEMPLATE_TYPE + only on class types. + 2015-08-21 Jason Merrill <jason@redhat.com> PR c++/67240 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index eaafaef..fb7b9d2 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -22673,7 +22673,8 @@ resolve_typename_type (tree type, bool only_current_p) return type; /* If SCOPE isn't the template itself, it will not have a valid TYPE_FIELDS list. */ - if (same_type_p (scope, CLASSTYPE_PRIMARY_TEMPLATE_TYPE (scope))) + if (CLASS_TYPE_P (scope) + && same_type_p (scope, CLASSTYPE_PRIMARY_TEMPLATE_TYPE (scope))) /* scope is either the template itself or a compatible instantiation like X<T>, so look up the name in the original template. */ scope = CLASSTYPE_PRIMARY_TEMPLATE_TYPE (scope); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index da24538..aad7edc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-08-22 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/63693 + * g++.dg/cpp0x/decltype63.C: New. + 2015-08-22 Nathan Sidwell <nathan@acm.org> * c-c++-common/Wsizeof-pointer-memaccess1.c: Require alloca. diff --git a/gcc/testsuite/g++.dg/cpp0x/decltype63.C b/gcc/testsuite/g++.dg/cpp0x/decltype63.C new file mode 100644 index 0000000..60dfec4 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/decltype63.C @@ -0,0 +1,7 @@ +// PR c++/63693 +// { dg-do compile { target c++11 } } + +template<typename T> +class C{ + T t; + decltype(t)::a:: // { dg-error "expected" } |