aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree.c
diff options
context:
space:
mode:
authorDouglas Gregor <doug.gregor@gmail.com>2007-10-26 19:34:03 +0000
committerDoug Gregor <dgregor@gcc.gnu.org>2007-10-26 19:34:03 +0000
commit4552f5a2c81d09f3d1af9aad2203e95162c2e3a8 (patch)
treee144a43b87857650113ed783225510d05607b2c4 /gcc/tree.c
parent84f2b1d168c4cd781fd67af8ec884efd3f4d93e3 (diff)
downloadgcc-4552f5a2c81d09f3d1af9aad2203e95162c2e3a8.zip
gcc-4552f5a2c81d09f3d1af9aad2203e95162c2e3a8.tar.gz
gcc-4552f5a2c81d09f3d1af9aad2203e95162c2e3a8.tar.bz2
re PR c++/33601 (ICE with pointers to members using "const C" as the class identifier)
2007-10-26 Douglas Gregor <doug.gregor@gmail.com> PR c++/33601 * tree.c (build_offset_type): Build canonical type based on the TYPE_MAIN_VARIANT of the base type. 2007-10-26 Douglas Gregor <doug.gregor@gmail.com> * g++.dg/other/pr33601.C: New. From-SVN: r129659
Diffstat (limited to 'gcc/tree.c')
-rw-r--r--gcc/tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/tree.c b/gcc/tree.c
index 88ec29e..24e758f 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -5949,10 +5949,10 @@ build_offset_type (tree basetype, tree type)
if (TYPE_STRUCTURAL_EQUALITY_P (basetype)
|| TYPE_STRUCTURAL_EQUALITY_P (type))
SET_TYPE_STRUCTURAL_EQUALITY (t);
- else if (TYPE_CANONICAL (basetype) != basetype
+ else if (TYPE_CANONICAL (TYPE_MAIN_VARIANT (basetype)) != basetype
|| TYPE_CANONICAL (type) != type)
TYPE_CANONICAL (t)
- = build_offset_type (TYPE_CANONICAL (basetype),
+ = build_offset_type (TYPE_CANONICAL (TYPE_MAIN_VARIANT (basetype)),
TYPE_CANONICAL (type));
}