diff options
| author | Jason Merrill <jason@redhat.com> | 2012-12-06 23:53:59 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-12-06 23:53:59 -0500 |
| commit | 3e243cfcede8e46b6d1a1548a1e6248df23bae3a (patch) | |
| tree | 37937b4ff2b0e11b4a92113ab4ef5c076b935738 | |
| parent | 01290963d131b098cc4b0f3f5d3401e976eb8d6e (diff) | |
| download | gcc-3e243cfcede8e46b6d1a1548a1e6248df23bae3a.zip gcc-3e243cfcede8e46b6d1a1548a1e6248df23bae3a.tar.gz gcc-3e243cfcede8e46b6d1a1548a1e6248df23bae3a.tar.bz2 | |
re PR c++/55058 (Unexpected invalid type conversion error)
PR c++/55058
* pt.c (tsubst): Keep the quals when looking through a typedef.
From-SVN: r194282
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 9 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/template/typedef40.C | 21 |
3 files changed, 31 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 22bdb50..a92ebe1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2012-12-06 Jason Merrill <jason@redhat.com> + PR c++/55058 + * pt.c (tsubst): Keep the quals when looking through a typedef. + PR c++/55249 * tree.c (build_vec_init_elt): Use the type of the initializer. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 87cd337..33044e0 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11013,8 +11013,13 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) return r; } else - /* We don't have an instantiation yet, so drop the typedef. */ - t = DECL_ORIGINAL_TYPE (decl); + { + /* We don't have an instantiation yet, so drop the typedef. */ + int quals = cp_type_quals (t); + t = DECL_ORIGINAL_TYPE (decl); + t = cp_build_qualified_type_real (t, quals, + complain | tf_ignore_bad_quals); + } } if (type diff --git a/gcc/testsuite/g++.dg/template/typedef40.C b/gcc/testsuite/g++.dg/template/typedef40.C new file mode 100644 index 0000000..1d8be35 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/typedef40.C @@ -0,0 +1,21 @@ +// PR c++/55058 + +template <typename T> +struct A { }; + +template <typename T> +struct B { + B(const A<T> T::* p); + typedef A<T> D; +}; + +template <typename T> +B<T>::B(const D T::* p) { } + +struct C { + C() : e() {}; + + const A<C> e; +}; + +B<C> g(&C::e); |