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
This commit is contained in:
Nathan Sidwell 2015-05-21 20:50:45 +00:00 committed by Nathan Sidwell
parent d51a6714b9
commit 9ab2fcc16d
4 changed files with 28 additions and 1 deletions

View File

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

View File

@ -195,6 +195,8 @@ change_return_type (tree new_ret, tree fntype)
else else
newtype = build_method_type_directly newtype = build_method_type_directly
(class_of_this_parm (fntype), new_ret, TREE_CHAIN (args)); (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) if (raises)
newtype = build_exception_variant (newtype, raises); newtype = build_exception_variant (newtype, raises);
if (attrs) if (attrs)

View File

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

View File

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