From cb537f0d838bac376bfe5e6d765e19cd3af01031 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 20 Mar 2025 09:55:40 -0400 Subject: c++: fix return type of __cxa_bad_array_new_length We were lying about the return type, but that's not necessary; we already need to handle a COND_EXPR where one side is void for THROW_EXPR. This fixes an execution failure on nvptx: error: Prototype doesn't match for '__cxa_throw_bad_array_new_length' gcc/cp/ChangeLog: * init.cc (throw_bad_array_new_length): Returns void. --- gcc/cp/init.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gcc') diff --git a/gcc/cp/init.cc b/gcc/cp/init.cc index ce6e58e..e589e45 100644 --- a/gcc/cp/init.cc +++ b/gcc/cp/init.cc @@ -2810,8 +2810,7 @@ diagnose_uninitialized_cst_or_ref_member (tree type, bool using_new, bool compla } /* Call __cxa_bad_array_new_length to indicate that the size calculation - overflowed. Pretend it returns sizetype so that it plays nicely in the - COND_EXPR. */ + overflowed. */ tree throw_bad_array_new_length (void) @@ -2823,7 +2822,7 @@ throw_bad_array_new_length (void) fn = get_global_binding (name); if (!fn) fn = push_throw_library_fn - (name, build_function_type_list (sizetype, NULL_TREE)); + (name, build_function_type_list (void_type_node, NULL_TREE)); } return build_cxx_call (fn, 0, NULL, tf_warning_or_error); -- cgit v1.1