diff options
| author | Jason Merrill <jason@redhat.com> | 2012-02-08 04:52:11 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2012-02-08 04:52:11 -0500 |
| commit | 84d594c6487e4502beb72786cdd82c234b549a98 (patch) | |
| tree | 94dfb5054a25fdb1f7ebfa1de74bda0ab3a2ea2c /gcc/cp | |
| parent | 75685ef74d410e993ed35c43ac76a56f00b4ddaf (diff) | |
| download | gcc-84d594c6487e4502beb72786cdd82c234b549a98.zip gcc-84d594c6487e4502beb72786cdd82c234b549a98.tar.gz gcc-84d594c6487e4502beb72786cdd82c234b549a98.tar.bz2 | |
re PR c++/52035 (internal compiler error: tree code ‘template_type_parm’ is not supported in LTO streams)
PR c++/52035
* pt.c (tsubst): Strip uninstantiated typedef.
From-SVN: r184000
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6cc2742..b506f4b 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2012-02-07 Jason Merrill <jason@redhat.com> + + PR c++/52035 + * pt.c (tsubst): Strip uninstantiated typedef. + 2012-02-06 Jason Merrill <jason@redhat.com> PR c++/52088 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 4c93b31..a0b2a0b 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -11178,7 +11178,9 @@ tsubst (tree t, tree args, tsubst_flags_t complain, tree in_decl) complain | tf_ignore_bad_quals); return r; } - /* Else we must be instantiating the typedef, so fall through. */ + else + /* We don't have an instantiation yet, so drop the typedef. */ + t = DECL_ORIGINAL_TYPE (decl); } if (type |