diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2000-07-06 15:34:09 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2000-07-06 15:34:09 +0000 |
| commit | a5f1c5f89bcdd5dcf3ae81a09d568b9be02c7142 (patch) | |
| tree | d88d4e6e8c2ed846a39efcf4d0bcbc01e4ced58d /gcc | |
| parent | c2e276fe1829eb25fd037c2207e400ef50a6f3a5 (diff) | |
| download | gcc-a5f1c5f89bcdd5dcf3ae81a09d568b9be02c7142.zip gcc-a5f1c5f89bcdd5dcf3ae81a09d568b9be02c7142.tar.gz gcc-a5f1c5f89bcdd5dcf3ae81a09d568b9be02c7142.tar.bz2 | |
* pt.c (tsubst): Don't layout type, if it's error_mark.
From-SVN: r34888
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6386d66..bce0fea 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2000-07-06 Nathan Sidwell <nathan@codesourcery.com> + * pt.c (tsubst): Don't layout type, if it's error_mark. + +2000-07-06 Nathan Sidwell <nathan@codesourcery.com> + * pt.c (instantiate_pending_templates): Reset template level. 2000-07-05 Jason Merrill <jason@redhat.com> diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9f88761..cef1512 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -6515,8 +6515,10 @@ tsubst (t, args, complain, in_decl) r = build_reference_type (type); r = cp_build_qualified_type_real (r, TYPE_QUALS (t), complain); - /* Will this ever be needed for TYPE_..._TO values? */ - layout_type (r); + if (r != error_mark_node) + /* Will this ever be needed for TYPE_..._TO values? */ + layout_type (r); + return r; } case OFFSET_TYPE: |