From patchwork Thu Apr 14 00:24:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 52891 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2A84E3857C41 for ; Thu, 14 Apr 2022 00:25:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A84E3857C41 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649895948; bh=gsIcDjlLS5XfPSJj5uOPO+ws2H1lxUAnzaEAG2i+Op0=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=MHd3iTxmIO6Nj9Sk/07yQhj/yg2YMCDz3/NcRXhIqIJsxfZp2kJxjS16fahgvd3Oh SmwyHfpGpGQSC4ohktG8OEbf7co5auHGQZzV9CWk4aGdXkcBQdaegCCv4vcr+UH9pF 94EPabVG7473OV22hxxz8FxuxkYxaGqwk+/I0JUM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 A7674385781D for ; Thu, 14 Apr 2022 00:24:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A7674385781D Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-660-gs7ILQcUN9-yrSMPZMV6HQ-1; Wed, 13 Apr 2022 20:24:27 -0400 X-MC-Unique: gs7ILQcUN9-yrSMPZMV6HQ-1 Received: by mail-qk1-f197.google.com with SMTP id bp31-20020a05620a459f00b00699fabcc554so2233520qkb.12 for ; Wed, 13 Apr 2022 17:24:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gsIcDjlLS5XfPSJj5uOPO+ws2H1lxUAnzaEAG2i+Op0=; b=tx4WJjGnqoZvBofxok1JmrVvZJtPn1c3U2GNk7LMYDeGiyyk1D6rliYEQOwac7jFDf l/dVwulJX69jZUXEAexMC9lTCygFgrjqOq0k7mRo85zqXmbJZhiRZVsxekbL8GvVD7LY w1Boot5hlnAup+gpUrEcsxvWWe/2PVRwBXAcr6OM65FDHrOkfCyg1suhM/zhrkKWw5fG ukjsmdMTl5Mj7gpVgfLvb3mUAtiqRq4KoJnD2OPhClTaHvonzxKDI2VzwWzKOW6dLOu4 m9LGTakrzSpBhZ6ojiyGv/D8zrNSdwbv9z0JR5xdvIhVwLo/a9Sjg05hBw7/I023DdZZ yn2g== X-Gm-Message-State: AOAM533juyy08UsH4lAFHl8WD0ftk5JS6wqxhnLv4Ms3COWMBuNNActo YO/+KVi8x2vComxiWCQ481VsrFpn3/9kBsSs2vZ4+b0fcOU/YvIqCf2rV30CkQHxx+WpouLO/U9 ZBK9lmdNRutGNqFHUYoq11/+pX2Xie28FF4wyrQM7Sk3WASS+jgQ1v5ZkFdcJ5/DrAw== X-Received: by 2002:a05:622a:28a:b0:2f1:14f3:8f1a with SMTP id z10-20020a05622a028a00b002f114f38f1amr65931qtw.257.1649895866355; Wed, 13 Apr 2022 17:24:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwDayDKm+5rkOyDpgE2J4tkZz+dXAdvNDD16wxiAW2RFHe4CVAb+jSGD4ayw2HKyd6RSUpP1A== X-Received: by 2002:a05:622a:28a:b0:2f1:14f3:8f1a with SMTP id z10-20020a05622a028a00b002f114f38f1amr65916qtw.257.1649895865944; Wed, 13 Apr 2022 17:24:25 -0700 (PDT) Received: from barrymore.redhat.com (130-44-159-43.s15913.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.159.43]) by smtp.gmail.com with ESMTPSA id f18-20020a05622a1a1200b002eef655b3e3sm251324qtb.94.2022.04.13.17.24.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Apr 2022 17:24:24 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: template conversion op [PR101698] Date: Wed, 13 Apr 2022 20:24:22 -0400 Message-Id: <20220414002422.3271330-1-jason@redhat.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.1 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_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jason Merrill via Gcc-patches From: Jason Merrill Reply-To: Jason Merrill Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Asking for conversion to a dependent type also makes a BASELINK dependent. Tested x86_64-pc-linux-gnu, applying to trunk. PR c++/101698 gcc/cp/ChangeLog: * pt.cc (tsubst_baselink): Also check dependent optype. gcc/testsuite/ChangeLog: * g++.dg/template/conv19.C: New test. --- gcc/cp/pt.cc | 3 ++- gcc/testsuite/g++.dg/template/conv19.C | 34 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/conv19.C base-commit: ad8161e6d7b26d690d90069ae9a129e7ac36892a diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 84712e6fc2f..63c08706377 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -16470,7 +16470,8 @@ tsubst_baselink (tree baselink, tree object_type, tree binfo_type = BINFO_TYPE (BASELINK_BINFO (baselink)); binfo_type = tsubst (binfo_type, args, complain, in_decl); - bool dependent_p = binfo_type != BINFO_TYPE (BASELINK_BINFO (baselink)); + bool dependent_p = (binfo_type != BINFO_TYPE (BASELINK_BINFO (baselink)) + || optype != BASELINK_OPTYPE (baselink)); if (dependent_p) { diff --git a/gcc/testsuite/g++.dg/template/conv19.C b/gcc/testsuite/g++.dg/template/conv19.C new file mode 100644 index 00000000000..7a3da939c1f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/conv19.C @@ -0,0 +1,34 @@ +// PR c++/101698 +// { dg-do compile { target c++11 } } + +class Base { + public: + template + operator const T&() const = delete; + + virtual operator const int&() const { + static int res; + return res; + } +}; + +template +class Derive : public Base { + public: + operator const T&() const override { + using Y = int; + //static_assert(__is_same_as(T,Y), ""); + + static int res; + + res = Base::operator const Y&(); // OK + res = Base::operator const T&(); // { dg-bogus "deleted" } + return res; + } +}; + +int main() { + Derive a; + const int& b = a; + (void)b; +}