From 4552f5a2c81d09f3d1af9aad2203e95162c2e3a8 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 26 Oct 2007 19:34:03 +0000 Subject: [PATCH] re PR c++/33601 (ICE with pointers to members using "const C" as the class identifier) 2007-10-26 Douglas Gregor 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 * g++.dg/other/pr33601.C: New. From-SVN: r129659 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/g++.dg/other/pr33601.C | 8 ++++++++ gcc/tree.c | 4 ++-- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/g++.dg/other/pr33601.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 626f83e..6e49d2d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2007-10-26 Douglas Gregor + + PR c++/33601 + * tree.c (build_offset_type): Build canonical type based on the + TYPE_MAIN_VARIANT of the base type. + 2007-10-26 Daniel Jacobowitz * reorg.c (emit_delay_sequence): Move insn locator from the diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 02339a0..4ec601f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2007-10-26 Douglas Gregor + + * g++.dg/other/pr33601.C: New. + 2007-10-26 Paolo Carlini PR c++/31988 diff --git a/gcc/testsuite/g++.dg/other/pr33601.C b/gcc/testsuite/g++.dg/other/pr33601.C new file mode 100644 index 0000000..0c17009 --- /dev/null +++ b/gcc/testsuite/g++.dg/other/pr33601.C @@ -0,0 +1,8 @@ +struct A +{ + int membervar; +}; + +typedef const A type; + +int type::* getmemberptr() { return &type::membervar; } 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)); } -- 2.7.4