aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@redhat.com>2011-04-13 15:09:26 +0000
committerDodji Seketeli <dodji@gcc.gnu.org>2011-04-13 17:09:26 +0200
commit91d8b4bd7ad6acd3907cba2346c70c101c793e9f (patch)
treebfeedb41882a7eec47bc8d8ba31f40acaea8054e
parentba9c349ec817c21ef7a72455a240cdc8f2c4926d (diff)
downloadgcc-91d8b4bd7ad6acd3907cba2346c70c101c793e9f.zip
gcc-91d8b4bd7ad6acd3907cba2346c70c101c793e9f.tar.gz
gcc-91d8b4bd7ad6acd3907cba2346c70c101c793e9f.tar.bz2
re PR c++/48574 (ICE)
Fix PR c++/48574 gcc/cp/ * class.c (fixed_type_or_null): We cannot determine the dynamic type of a reference variable if its initializer is dependent. gcc/testsuite/ * g++.dg/template/dependent-expr7.C: New test case. From-SVN: r172375
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/class.c1
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/template/dependent-expr7.C22
4 files changed, 34 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f144d50..3745e1a 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-13 Dodji Seketeli <dodji@redhat.com>
+
+ PR c++/48574
+ * class.c (fixed_type_or_null): We cannot determine the dynamic
+ type of a reference variable if its initializer is dependent.
+
2011-04-13 Jason Merrill <jason@redhat.com>
PR c++/48581
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index b6aebae..3216068 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5939,6 +5939,7 @@ fixed_type_or_null (tree instance, int *nonnull, int *cdtorp)
itself. */
if (TREE_CODE (instance) == VAR_DECL
&& DECL_INITIAL (instance)
+ && !type_dependent_expression_p (DECL_INITIAL (instance))
&& !htab_find (ht, instance))
{
tree type;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e740808..f066a80 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-13 Dodji Seketeli <dodji@redhat.com>
+
+ PR c++/48574
+ * g++.dg/template/dependent-expr7.C: New test case.
+
2011-04-13 Jason Merrill <jason@redhat.com>
* g++.dg/cpp0x/sfinae13.C: New.
diff --git a/gcc/testsuite/g++.dg/template/dependent-expr7.C b/gcc/testsuite/g++.dg/template/dependent-expr7.C
new file mode 100644
index 0000000..b246820
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/dependent-expr7.C
@@ -0,0 +1,22 @@
+// Origin PR c++/48574
+// { dg-do compile }
+
+struct A
+{
+ virtual void foo();
+};
+
+template <typename T>
+void
+bar(T x)
+{
+ A &b = *x;
+ b.foo ();
+}
+
+void
+foo()
+{
+ A a;
+ bar(&a);
+}