re PR c++/50034 (Overload selection failure within class template)

	PR c++/50034
	* call.c (convert_arg_to_ellipsis): force_rvalue only in
	potentially evaluated context.

From-SVN: r177722

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 47d636ef3b04e31df1abe9ca00ed23d9b9851dc9..bb6d614fb3ca93c4a4959175073550971a20020d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-12  Jason Merrill  <jason@redhat.com>
+
+       PR c++/50034
+       * call.c (convert_arg_to_ellipsis): force_rvalue only in
+       potentially evaluated context.
+
 2011-08-12  Richard Guenther  <rguenther@suse.de>
 
        * call.c (build_over_call): Instead of memcpy use an

diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index a3b0f8a85bbda2e5efda18893f957126997e2874..e8fb68d833a658fd5ef74cee0780493fcd6fea07 100644 (file)
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -6097,7 +6097,7 @@ convert_arg_to_ellipsis (tree arg)
     {
       /* Build up a real lvalue-to-rvalue conversion in case the
         copy constructor is trivial but not callable.  */
-      if (CLASS_TYPE_P (arg_type))
+      if (!cp_unevaluated_operand && CLASS_TYPE_P (arg_type))
        force_rvalue (arg, tf_warning_or_error);
 
       /* [expr.call] 5.2.2/7:

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 38079faf7715d081fe1dc0e4522e5ab02e94a1d9..4cede20faebf0ab83736c4acad5329176b3ccdf1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-12  Jason Merrill  <jason@redhat.com>
+
+       PR c++/50034
+       * g++.dg/cpp0x/defaulted28.C: Add unevaluated case.
+
 2011-08-12  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc.dg/builtins-67.c: New test.

diff --git a/gcc/testsuite/g++.dg/cpp0x/defaulted28.C b/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
index 15caef6cca69f177444586804264b5636f66df91..bcbf763f6dadad1779bb27639185fcd7bfe337e9 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
+++ b/gcc/testsuite/g++.dg/cpp0x/defaulted28.C
@@ -1,4 +1,5 @@
 // PR c++/49102
+// PR c++/50034
 // { dg-options -std=c++0x }
 
 struct A {
@@ -8,8 +9,9 @@ private:
   A(A const&) = default;       // { dg-error "private" }
 };
 
-void f(...) { }
+int f(...) { }
 int main() {
   A a;
   f(a);                        // { dg-error "this context" }
+  sizeof(f(a));                        // OK because unevaluated
 }