From 608afcc5e973175f043f94edde39acd5cbd4618a Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Wed, 23 Jan 2002 07:45:30 -0500 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/class.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 11d77ed8779..1d8108b4309 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2002-01-23 Jason Merrill + 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 f9d597cafb7..a97dd0ee92c 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),