git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

c++: fix decltype_p handling for binary expressions 

With Jakub's constexpr virtual base patch,
23_containers/vector/bool/cmp_c++20.cc failed the assert I add to
fixed_type_or_null, meaning that it returned the wrong value.  Let's fix the
result as well as adding the assert, and fix cp_parser_binary_expression to
properly wrap any class-type calls in the operands in TARGET_EXPR even
within a decltype so we don't hit the assert.

gcc/cp/ChangeLog:

	* class.cc (fixed_type_or_null): Handle class-type CALL_EXPR.
	* parser.cc (cp_parser_binary_expression): Fix decltype_p handling.
This commit is contained in:
Jason Merrill 2025-06-25 16:26:56 -04:00
parent b4aadc6015
commit 1f4a917c61
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/cp/class.cc
View File

@ -8350,6 +8350,15 @@ fixed_type_or_null (tree instance, int *nonnull, int *cdtorp)
*nonnull = 1;
return TREE_TYPE (instance);
}
if (CLASS_TYPE_P (TREE_TYPE (instance)))
{
/* We missed a build_cplus_new somewhere, likely due to tf_decltype
mishandling. */
gcc_checking_assert (false);
if (nonnull)
*nonnull = 1;
return TREE_TYPE (instance);
}
return NULL_TREE;
case SAVE_EXPR:

8
gcc/cp/parser.cc
View File

@ -10835,6 +10835,14 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p,
goto pop;
}
/* If we skipped build_cplus_new in build_cxx_call because of decltype_p,
call it now that we know current.lhs is a subexpression. */
if (decltype_p && !processing_template_decl
&& TREE_CODE (current.lhs) == CALL_EXPR
&& CLASS_TYPE_P (TREE_TYPE (current.lhs)))
current.lhs = build_cplus_new (TREE_TYPE (current.lhs), current.lhs,
tf_warning_or_error);
get_rhs:
current.tree_type = binops_by_token[token->type].tree_type;
current.loc = token->location;