aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <doug.gregor@gmail.com>2008-02-29 21:41:38 +0000
committerDoug Gregor <dgregor@gcc.gnu.org>2008-02-29 21:41:38 +0000
commitf31c9f09a1b5c59b7c73daaab8e138ac2bedcd0b (patch)
treee5209d526d4831be4dd0f7323a5a1518da448340
parent359be76ebbc75fd04b7476d764ecf2a34ac48b8b (diff)
downloadgcc-f31c9f09a1b5c59b7c73daaab8e138ac2bedcd0b.zip
gcc-f31c9f09a1b5c59b7c73daaab8e138ac2bedcd0b.tar.gz
gcc-f31c9f09a1b5c59b7c73daaab8e138ac2bedcd0b.tar.bz2
re PR c++/35315 (ICE with attribute transparent_union)
2008-02-29 Douglas Gregor <doug.gregor@gmail.com> PR c++/35315 * tree-inline.c (build_duplicate_type): When we make a duplicate type, make it unique in the canonical types system. 2008-02-29 Douglas Gregor <doug.gregor@gmail.com> PR c++/35315 * g++.dg/ext/attrib32.C: Add another test case. From-SVN: r132779
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/ext/attrib32.C11
-rw-r--r--gcc/tree-inline.c2
4 files changed, 24 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a3a5540..32be0dd 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-29 Douglas Gregor <doug.gregor@gmail.com>
+
+ PR c++/35315
+ * tree-inline.c (build_duplicate_type): When we make a
+ duplicate type, make it unique in the canonical types system.
+
2008-02-29 Tom Tromey <tromey@redhat.com>
* toplev.c (input_file_stack, input_file_stack_tick, fs_p,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 951afe1..ff4c560 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-29 Douglas Gregor <doug.gregor@gmail.com>
+
+ PR c++/35315
+ * g++.dg/ext/attrib32.C: Add another test case.
+
2008-02-29 Tom Tromey <tromey@redhat.com>
* g++.dg/warn/pragma-system_header2.C: Ignore "included from"
diff --git a/gcc/testsuite/g++.dg/ext/attrib32.C b/gcc/testsuite/g++.dg/ext/attrib32.C
index 523015c..39363bb 100644
--- a/gcc/testsuite/g++.dg/ext/attrib32.C
+++ b/gcc/testsuite/g++.dg/ext/attrib32.C
@@ -9,3 +9,14 @@ void bar()
{
foo(0);
}
+
+typedef union U1 { int i; } U2 __attribute__((transparent_union));
+
+static void foo2(U1) {}
+static void foo2(U2) {}
+
+void bar2(U1 u1, U2 u2)
+{
+ foo2(u1);
+ foo2(u2);
+}
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index ea0bac6..74895a8 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -3723,5 +3723,7 @@ build_duplicate_type (tree type)
pointer_map_destroy (id.decl_map);
+ TYPE_CANONICAL (type) = type;
+
return type;
}