From 1f70503232d4183b4b58f2910c460569d05907b9 Mon Sep 17 00:00:00 2001 From: Patrick Palka Date: Fri, 20 Sep 2024 15:41:42 -0400 Subject: c++: CWG 2789 and reversed operator candidates As a follow-up to r15-3741-gee3efe06c9c49c, which was specifically concerned with usings, it seems the CWG 2789 refinement should also compare contexts of a reversed vs non-reversed (member) candidate during operator overload resolution. DR 2789 gcc/cp/ChangeLog: * call.cc (cand_parms_match): Check for matching class contexts even in the reversed case. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/concepts-memfun4.C: Adjust expected result involving reversed candidate. Reviewed-by: Jason Merrill --- gcc/cp/call.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'gcc/cp') diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index f2ce508..70783ba 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -12865,10 +12865,6 @@ cand_parms_match (z_candidate *c1, z_candidate *c2, pmatch match_kind) } } - else if (reversed) - return (reversed_match (c1, c2) - && reversed_match (c2, c1)); - tree parms1 = TYPE_ARG_TYPES (TREE_TYPE (fn1)); tree parms2 = TYPE_ARG_TYPES (TREE_TYPE (fn2)); @@ -12880,6 +12876,10 @@ cand_parms_match (z_candidate *c1, z_candidate *c2, pmatch match_kind) if (base1 != base2) return false; + if (reversed) + return (reversed_match (c1, c2) + && reversed_match (c2, c1)); + /* Use object_parms_correspond to simplify comparing iobj/xobj/static member functions. */ if (!object_parms_correspond (fn1, fn2, base1)) @@ -12897,6 +12897,9 @@ cand_parms_match (z_candidate *c1, z_candidate *c2, pmatch match_kind) parms1 = skip_parms (fn1, parms1); parms2 = skip_parms (fn2, parms2); } + else if (reversed) + return (reversed_match (c1, c2) + && reversed_match (c2, c1)); return compparms (parms1, parms2); } -- cgit v1.1