From: Mark Mitchell <mark@codesourcery.com>
Date: Sun, 2 Oct 2005 21:28:50 +0000 (+0000)
Subject: re PR c++/23840 (Bogus "invalid lvalue in unary '&'" diagnostic and ICE with va_arg)
X-Git-Tag: misc/cutover-cvs2svn~366
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0ad5a317379afbc3dfb0fb1fd4e6fdb98aab8e2;p=thirdparty%2Fgcc.git

re PR c++/23840 (Bogus "invalid lvalue in unary '&'" diagnostic and ICE with va_arg)

	PR c++/23840
	* tree.c (lvalue_p1): A VA_ARG_EXPR with class type is an lvalue,
	when class rvalues are lvalues.

	PR c++/23840
	* g++.dg/expr/stdarg1.C: New test.

From-SVN: r104877
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f4255d628cd3..14fc98fbbea1 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-02  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/23840
+	* tree.c (lvalue_p1): A VA_ARG_EXPR with class type is an lvalue,
+	when class rvalues are lvalues.
+
 2005-09-28  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/16782
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 9c28f13f306e..954a8093a959 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -158,8 +158,12 @@ lvalue_p_1 (tree ref,
     case TARGET_EXPR:
       return treat_class_rvalues_as_lvalues ? clk_class : clk_none;
 
-    case CALL_EXPR:
     case VA_ARG_EXPR:
+      return (treat_class_rvalues_as_lvalues
+	      && CLASS_TYPE_P (TREE_TYPE (ref))
+	      ? clk_class : clk_none);
+
+    case CALL_EXPR:
       /* Any class-valued call would be wrapped in a TARGET_EXPR.  */
       return clk_none;
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 98bfad4bc91a..67105b000d15 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-02  Mark Mitchell  <mark@codesourcery.com>
+
+	PR c++/23840
+	* g++.dg/expr/stdarg1.C: New test.
+
 2005-10-02  Diego Novillo  <dnovillo@redhat.com>
 
 	PR 24142
diff --git a/gcc/testsuite/g++.dg/expr/stdarg1.C b/gcc/testsuite/g++.dg/expr/stdarg1.C
new file mode 100644
index 000000000000..85b6f7460e34
--- /dev/null
+++ b/gcc/testsuite/g++.dg/expr/stdarg1.C
@@ -0,0 +1,13 @@
+// PR c++/23840
+
+#include <stdarg.h>
+struct S 
+{
+  int f(int);
+};
+void f(int i, ...) 
+{
+  va_list ap;
+  va_start (ap, i);
+  va_arg (ap, S).f(0);
+}