From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id BF9D33858288 for ; Mon, 13 Feb 2023 17:06:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BF9D33858288 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676307991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7HaYsIsrVR0kT8+mtP7ShLbt6UPM63H3DH9w2TrWxg=; b=X+Rn8wltLWWFcKeTeoXOHRZ56t7rJ3V9cy3QhQnG785pJvCs1H28Bt8yoECp4C6IjZ3RQY puhHvbtAP6LPf5Vd4xIsLqY9iQ922wYRiTVihAT2gZ2G4e5OonZY2OcMrEIlceHE+XNvVr S9f4q6mobkUmXUobfpeiFGM2MO433fc= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-650-EPDUgEf5OIOHGP0x7iBDbw-1; Mon, 13 Feb 2023 12:06:29 -0500 X-MC-Unique: EPDUgEf5OIOHGP0x7iBDbw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 215D33C14101 for ; Mon, 13 Feb 2023 17:06:28 +0000 (UTC) Received: from pdp-11.lan (unknown [10.22.17.209]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01A2F2026D4B; Mon, 13 Feb 2023 17:06:27 +0000 (UTC) From: Marek Polacek To: Jason Merrill , GCC Patches Subject: [PATCH] c++: fix ICE in joust_maybe_elide_copy [PR106675] Date: Mon, 13 Feb 2023 12:06:19 -0500 Message-Id: <20230213170619.28996-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: joust_maybe_elide_copy checks that the last conversion in the ICS for the first argument is ck_ref_bind, which is reasonable, because we've checked that we're dealing with a copy/move constructor. But it can also happen that we couldn't figure out which conversion function is better to convert the argument, as in this testcase: joust couldn't decide if we should go with operator foo &() or operator foo const &() so we get a ck_ambig, which then upsets joust_maybe_elide_copy. Since a ck_ambig can validly occur, I think we should just return early, as in the patch below. Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk/12? PR c++/106675 gcc/cp/ChangeLog: * call.cc (joust_maybe_elide_copy): Return false for ck_ambig. gcc/testsuite/ChangeLog: * g++.dg/cpp0x/overload-conv-5.C: New test. --- gcc/cp/call.cc | 2 ++ gcc/testsuite/g++.dg/cpp0x/overload-conv-5.C | 21 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp0x/overload-conv-5.C diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index a349d8e79db..048b2b052f8 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -12542,6 +12542,8 @@ joust_maybe_elide_copy (z_candidate *&cand) if (!DECL_COPY_CONSTRUCTOR_P (fn) && !DECL_MOVE_CONSTRUCTOR_P (fn)) return false; conversion *conv = cand->convs[0]; + if (conv->kind == ck_ambig) + return false; gcc_checking_assert (conv->kind == ck_ref_bind); conv = next_conversion (conv); if (conv->kind == ck_user && !TYPE_REF_P (conv->type)) diff --git a/gcc/testsuite/g++.dg/cpp0x/overload-conv-5.C b/gcc/testsuite/g++.dg/cpp0x/overload-conv-5.C new file mode 100644 index 00000000000..b1e7766e42b --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/overload-conv-5.C @@ -0,0 +1,21 @@ +// PR c++/106675 +// { dg-do compile { target c++11 } } + +struct foo { + int n_; + foo(int n) : n_(n) {} +}; + +struct bar { + int n_; + + operator foo() const { + return foo(n_); + } + operator foo &() { return *reinterpret_cast(n_); } + operator foo const &() = delete; + + void crashgcc() { + foo tmp(*this); // { dg-error "ambiguous" } + } +}; base-commit: 72ae1e5635648bd3f6a5760ca46d531ad1f2c6b1 -- 2.39.1