Patchwork Fix PR c++/48574

login
register
mail settings
Submitter Dodji Seketeli
Date May 5, 2011, 11:08 p.m.
Message ID <m3sjsswxt4.fsf@redhat.com>
Download mbox | patch
Permalink /patch/94326/
State New
Headers show

Comments

Dodji Seketeli - May 5, 2011, 11:08 p.m.
Hello,

This is a leftover of the fix for PR c++/48574.  When
fold_non_dependent_expr sees the lvalue reference 'b' in the example
of the patch below (because in finish_call_expr,
make_args_non_dependent on 'b' calls build_non_dependent_expr which
calls null_ptr_cst_p which calls fold_non_dependent_expr), it
indirectly calls fixed_type_or_null.

The problem is that fold_non_dependent_expr unsets
processing_template_decl, so the type_dependent_expression_p test I
have added to fix PR c++/48574 returns immediately.

So this patch uses uses_template_parms instead of
type_dependent_expression_p.

Tested and bootstrapped on x86_64-unknown-linux-gnu against trunk and
4.6.

OK to commit to trunk and to 4.6?

gcc/cp/

	PR c++/48574
	* class.c (fixed_type_or_null): Use uses_template_parms to test if
	the instance is dependent.

gcc/testsuite/

	PR c++/48574
	* g++.dg/template/dependent-expr8.C: New test case.
---
 gcc/cp/class.c                                  |    2 +-
 gcc/testsuite/g++.dg/template/dependent-expr8.C |   25 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/template/dependent-expr8.C
Jason Merrill - May 5, 2011, 11:34 p.m.
How about type_dependent_expression_p_push instead?

Jason

Patch

diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 9af238b..6fcc3c5 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -5939,7 +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))
+	      && !uses_template_parms (DECL_INITIAL (instance))
 	      && !htab_find (ht, instance))
 	    {
 	      tree type;
diff --git a/gcc/testsuite/g++.dg/template/dependent-expr8.C b/gcc/testsuite/g++.dg/template/dependent-expr8.C
new file mode 100644
index 0000000..20014d6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/dependent-expr8.C
@@ -0,0 +1,25 @@ 
+// Origin PR c++/48574
+// { dg-options "-std=c++0x" }
+// { dg-do compile }
+
+struct A
+{
+  virtual int foo();
+};
+
+void baz (int);
+
+template <typename T>
+void
+bar(T x)
+{
+  A &b = *x;
+  baz (b.foo ());
+}
+
+void
+foo()
+{
+  A a;
+  bar(&a);
+}