From 4c38e99eb4137eab7acfed72c434d8667051372e Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 30 Oct 2007 23:37:53 +0100
Subject: [PATCH] re PR c++/33616 ("lvalue required as unary '&' operand" with
 template pmf)

	PR c++/33616
	* decl2.c (build_offset_ref_call_from_tree): Call
	build_non_dependent_expr on object prior to building ADDR_EXPR from it
	if FN is DOTSTAR_EXPR.

	* g++.dg/template/ptrmem18.C: New test.

From-SVN: r129784
---
 gcc/cp/ChangeLog                         |  7 ++++
 gcc/cp/decl2.c                           |  2 +-
 gcc/testsuite/ChangeLog                  |  5 +++
 gcc/testsuite/g++.dg/template/ptrmem18.C | 49 ++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/template/ptrmem18.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d5b73e797cb..5e2447f94c3 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/33616
+	* decl2.c (build_offset_ref_call_from_tree): Call
+	build_non_dependent_expr on object prior to building ADDR_EXPR from it
+	if FN is DOTSTAR_EXPR.
+
 2007-10-30  Douglas Gregor  <doug.gregor@gmail.com>
 
 	PR c++/31993
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 0a978344fa1..db0d9f38ee0 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -3499,9 +3499,9 @@ build_offset_ref_call_from_tree (tree fn, tree args)
 	 parameter.  That must be done before the FN is transformed
 	 because we depend on the form of FN.  */
       args = build_non_dependent_args (args);
+      object = build_non_dependent_expr (object);
       if (TREE_CODE (fn) == DOTSTAR_EXPR)
 	object = build_unary_op (ADDR_EXPR, object, 0);
-      object = build_non_dependent_expr (object);
       args = tree_cons (NULL_TREE, object, args);
       /* Now that the arguments are done, transform FN.  */
       fn = build_non_dependent_expr (fn);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5a266cee36f..4fcafd01bbd 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-30  Jakub Jelinek  <jakub@redhat.com>
+
+	PR c++/33616
+	* g++.dg/template/ptrmem18.C: New test.
+
 2007-10-30  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	PR fortran/33596
diff --git a/gcc/testsuite/g++.dg/template/ptrmem18.C b/gcc/testsuite/g++.dg/template/ptrmem18.C
new file mode 100644
index 00000000000..c3124cd81bf
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/ptrmem18.C
@@ -0,0 +1,49 @@
+// PR c++/33616
+// { dg-do run }
+// { dg-options "-O2" }
+
+extern "C" void abort ();
+
+struct S {
+  int c;
+  S () : c (0) {}
+  virtual void f1 () { c += 1; }
+  virtual void f2 () { c += 16; }
+};
+
+struct T {
+  S s;
+};
+
+typedef void (S::*Q) ();
+
+template <Q P>
+void test1 (T *t)
+{
+  (t->s.*P)();
+}
+
+template <Q P>
+void test2 (T *t)
+{
+  S &s = t->s;
+  (s.*P)();
+}
+
+int
+main ()
+{
+  T t;
+  test1 <&S::f1> (&t);
+  if (t.s.c != 1)
+    abort ();
+  test1 <&S::f2> (&t);
+  if (t.s.c != 17)
+    abort ();
+  test2 <&S::f1> (&t);
+  if (t.s.c != 18)
+    abort ();
+  test2 <&S::f2> (&t);
+  if (t.s.c != 34)
+    abort ();
+}
-- 
2.30.2