aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2002-01-23 07:45:30 -0500
committerJason Merrill <jason@gcc.gnu.org>2002-01-23 07:45:30 -0500
commit608afcc5e973175f043f94edde39acd5cbd4618a (patch)
tree3f2d70f81de49329e3070c57060c779989514692 /gcc
parentf893c16eeab350c284d0c079843ad32b3bb3bc8d (diff)
downloadgcc-608afcc5e973175f043f94edde39acd5cbd4618a.zip
gcc-608afcc5e973175f043f94edde39acd5cbd4618a.tar.gz
gcc-608afcc5e973175f043f94edde39acd5cbd4618a.tar.bz2
re PR c++/5453 (Compiled program crash - inheritance/template/friend class problem)
PR c++/5453 * class.c (fixed_type_or_null): Fix thinko. From-SVN: r49133
Diffstat (limited to 'gcc')
-rw-r--r--gcc/cp/ChangeLog3
-rw-r--r--gcc/cp/class.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 11d77ed..1d8108b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
2002-01-23 Jason Merrill <jason@redhat.com>
+ PR c++/5453
+ * class.c (fixed_type_or_null): Fix thinko.
+
PR c++/3331
* init.c (resolve_offset_ref): Use build_indirect_ref.
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index f9d597c..a97dd0e 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5318,7 +5318,7 @@ fixed_type_or_null (instance, nonnull, cdtorp)
switch (TREE_CODE (instance))
{
case INDIRECT_REF:
- if (POINTER_TYPE_P (instance))
+ if (POINTER_TYPE_P (TREE_TYPE (instance)))
return NULL_TREE;
else
return fixed_type_or_null (TREE_OPERAND (instance, 0),