From 953bbeaeff050f4d0b670568a587aa1ce82ed711 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 9 Jun 2023 10:37:35 -0400 Subject: c++: fix 32-bit spaceship failures [PR110185] Various spaceship tests failed after r14-1624. This turned out to be because the comparison category classes return in memory on 32-bit targets, and the synthesized operator<=> looks something like if (auto v = a.x <=> b.x, v == 0); else return v; if (auto v = a.y <=> b.y, v == 0); else return v; etc. so check_return_expr was trying to do NRVO for all the 'v' variables, and now on subsequent returns we check to see if the previous NRV is still in scope. But the NRVs didn't have names, so looking up name bindings crashed. Fixed both by giving 'v' a name so we can NRVO the first one, and fixing the test to give up if the old NRV has no name. PR c++/110185 PR c++/58487 gcc/cp/ChangeLog: * method.cc (build_comparison_op): Give retval a name. * typeck.cc (check_return_expr): Fix for nameless variables. --- gcc/cp/method.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'gcc/cp/method.cc') diff --git a/gcc/cp/method.cc b/gcc/cp/method.cc index 0c2ca9e..91cf943 100644 --- a/gcc/cp/method.cc +++ b/gcc/cp/method.cc @@ -1679,6 +1679,7 @@ build_comparison_op (tree fndecl, bool defining, tsubst_flags_t complain) if (defining) { tree var = create_temporary_var (rettype); + DECL_NAME (var) = get_identifier ("retval"); pushdecl (var); cp_finish_decl (var, comp, false, NULL_TREE, flags); comp = retval = var; -- cgit v1.1