From: Marek Polacek Date: Wed, 14 May 2025 14:40:54 +0000 (-0400) Subject: c++: fix propagating REF_PARENTHESIZED_P [PR116379] X-Git-Tag: releases/gcc-14.3.0~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c11cb308c1e2aae427d6f32a1144ae8907dc2649;p=thirdparty%2Fgcc.git c++: fix propagating REF_PARENTHESIZED_P [PR116379] Here we have: template struct X{ T val; decltype(auto) value(){ return (val); } }; where the return type of value should be 'int &' since '(val)' is an expression, not a name, and decltype(auto) performs the type deduction using the decltype rules. The problem is that we weren't propagating REF_PARENTHESIZED_P correctly: the return value of finish_non_static_data_member in this test was a REFERENCE_REF_P, so we didn't set the flag. We should use force_paren_expr like below. PR c++/116379 gcc/cp/ChangeLog: * pt.cc (tsubst_expr) : Use force_paren_expr to set REF_PARENTHESIZED_P. gcc/testsuite/ChangeLog: * g++.dg/cpp1y/decltype-auto9.C: New test. Reviewed-by: Jason Merrill --- diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index b6a87b0f5c2..65fa85b0610 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -21277,8 +21277,8 @@ tsubst_expr (tree t, tree args, tsubst_flags_t complain, tree in_decl) { r = finish_non_static_data_member (member, object, NULL_TREE, complain); - if (TREE_CODE (r) == COMPONENT_REF) - REF_PARENTHESIZED_P (r) = REF_PARENTHESIZED_P (t); + if (REF_PARENTHESIZED_P (t)) + r = force_paren_expr (r); RETURN (r); } else if (type_dependent_expression_p (object)) diff --git a/gcc/testsuite/g++.dg/cpp1y/decltype-auto9.C b/gcc/testsuite/g++.dg/cpp1y/decltype-auto9.C new file mode 100644 index 00000000000..1ccf95a0170 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp1y/decltype-auto9.C @@ -0,0 +1,15 @@ +// PR c++/116379 +// { dg-do compile { target c++14 } } + +template +struct X { + T val; + decltype(auto) value() { return (val); } +}; + +int main() { + int i = 0; + X x{ static_cast(i) }; + using type = decltype(x.value()); + using type = int&; +}