re PR c++/60943 ([C++14] Return type deduction interferes with ref-qualifiers)

	cp/
	PR c++/60943
	* decl2.c (change_return_type): Propagate FUNCTION_REF_QUALIFIED.

	testsuite/
	* g++.dg/cpp1y/pr60943.C: New.

From-SVN: r223502

gcc/cp/ChangeLog

+2015-05-21  Nathan Sidwell  <nathan@acm.org>
+
+	PR c++/60943
+	* decl2.c (change_return_type): Propagate FUNCTION_REF_QUALIFIED.
+
 2015-05-21  Marek Polacek  <polacek@redhat.com>
 
 	* typeck.c (warn_args_num): Don't print "declare here" for builtins.
@@ -14,7 +19,7 @@
 	(build_op_delete_call): Warn about size_t placement delete with
 	-Wc++14-compat.
 
-2015-05-19  Nathan sidwell  <nathan@acm.org>
+2015-05-19  Nathan Sidwell  <nathan@acm.org>
 
 	PR c++/65954
 	* typeck.c (finish_class_member_access_expr): Diagnose failed

gcc/cp/decl2.c

@@ -195,6 +195,8 @@ change_return_type (tree new_ret, tree fntype)
   else
     newtype = build_method_type_directly
       (class_of_this_parm (fntype), new_ret, TREE_CHAIN (args));
+  if (FUNCTION_REF_QUALIFIED (fntype))
+    newtype = build_ref_qualified_type (newtype, type_memfn_rqual (fntype));
   if (raises)
     newtype = build_exception_variant (newtype, raises);
   if (attrs)

gcc/testsuite/ChangeLog

+2015-05-21  Nathan Sidwell  <nathan@acm.org>
+
+	* g++.dg/cpp1y/pr60943.C: New.
+					 
 2015-05-21  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/66233

gcc/testsuite/g++.dg/cpp1y/pr60943.C

+// { dg-options "-std=c++14" }
+
+struct A {
+  auto f() & {}
+  auto f() && {}
+};
+
+void Foo (A &a)
+{
+  a.f();
+}
+
+void Bar (A &&a)
+{
+  a.f ();
+}