From patchwork Fri Mar 10 03:13:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Merrill X-Patchwork-Id: 66197 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 4C92438515F4 for ; Fri, 10 Mar 2023 03:14:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4C92438515F4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678418067; bh=bsCswLo8RIidMn8sRngxCJkdRz+1qb60CxoRA+YCPZo=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=oTQsD6U1SuGQZuHfTGJ+B5cUpY9QQaW04tk6eEMC/rg83a5zQNR2aDGlxbISWPE/p 00qd5vs/c027wTD5g+i6lNgaio7U1cPG9UhQZ/VEiGxTV54q1UW3kC1js9kttkF/35 Yhgye7MM7yuIcWRl9yjawGa5rXxRl5LNf4N5PEe4= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 545603858C5E for ; Fri, 10 Mar 2023 03:13:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 545603858C5E Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-381-kqxGtVV4MkKFn6GUnd_Chg-1; Thu, 09 Mar 2023 22:13:55 -0500 X-MC-Unique: kqxGtVV4MkKFn6GUnd_Chg-1 Received: by mail-qv1-f70.google.com with SMTP id m1-20020a05621402a100b004bb706b3a27so2301160qvv.20 for ; Thu, 09 Mar 2023 19:13:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678418035; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bsCswLo8RIidMn8sRngxCJkdRz+1qb60CxoRA+YCPZo=; b=vBppN6pUyTr83+3v8rUYhjQJBlf7l2gLZcOwZ3U5hhvFaPyyZronXyHArbJZr0YJ1X dKsjG0V5wowJuDKXjSWMSwQDrxRxoIOiE85xK9WU5K3ZWZb2KhV1RwmaJi+jq2Czcgk0 Kz993lyVd+/LXMcnkM0/yyaeKsYhDomJ4bhbHHSASDakBPDKaXm8fV1Lb76nwGLiVXuR LJ0xWxyp4k0f3DEYwLY+QvPd42Zr1lme9qtqmN+dOD071PzDkhcXFcxgZgybPpoMzDAH S0NDKgPOxOEEDtEK2xhafRb0DgdKgqvMRBZlXYBdglMJsfvnZe8vYqLOCGYYTzwTDCoO 0UCA== X-Gm-Message-State: AO0yUKWlYWIpIUrlB6LuFwVMGkYK54Ds6SmwjJKJWAyM8kszsRbysw1x SqM6ujHUKO+N+OtxpE3WaU7B5ULB9bMD6QfXLMn+ZVV6x5m7NEVtOUB7a9V7klKgsOHq5p5wsyL Q0lcg5MN7PAyhQYT24WnVq11Uyt3uCwQCvC/wefPKCfcJdp0A7L1dR+IGGtlZCPhBhVcWiMNXNQ == X-Received: by 2002:ac8:5c0f:0:b0:3bf:c994:c9ae with SMTP id i15-20020ac85c0f000000b003bfc994c9aemr9359409qti.16.1678418035195; Thu, 09 Mar 2023 19:13:55 -0800 (PST) X-Google-Smtp-Source: AK7set+hOZEl0XvbHq57GL0f2kP/Oa62tsFUTLhsxBBNnUAPTR29LYdHM/QenMxkkD7JqY3882AOhQ== X-Received: by 2002:ac8:5c0f:0:b0:3bf:c994:c9ae with SMTP id i15-20020ac85c0f000000b003bfc994c9aemr9359389qti.16.1678418034834; Thu, 09 Mar 2023 19:13:54 -0800 (PST) Received: from jason.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 i7-20020ae9ee07000000b00743049c2b15sm499272qkg.66.2023.03.09.19.13.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 19:13:54 -0800 (PST) To: gcc-patches@gcc.gnu.org Subject: [pushed] c++: overloaded fn in contract [PR108542] Date: Thu, 9 Mar 2023 22:13:51 -0500 Message-Id: <20230310031351.2404945-1-jason@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 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 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" Tested x86_64-pc-linux-gnu, applying to trunk. -- 8< -- PR c++/108542 gcc/cp/ChangeLog: * class.cc (instantiate_type): Strip location wrapper. gcc/testsuite/ChangeLog: * g++.dg/contracts/contracts-err1.C: New test. --- gcc/cp/class.cc | 2 ++ gcc/testsuite/g++.dg/contracts/contracts-err1.C | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 gcc/testsuite/g++.dg/contracts/contracts-err1.C base-commit: e0324e2629e25a90c13c68b4eef1e47b091970c3 diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc index 27a79829737..d37e9d4d576 100644 --- a/gcc/cp/class.cc +++ b/gcc/cp/class.cc @@ -8728,6 +8728,8 @@ instantiate_type (tree lhstype, tree rhs, tsubst_flags_t complain) complain &= ~tf_ptrmem_ok; + STRIP_ANY_LOCATION_WRAPPER (rhs); + if (lhstype == unknown_type_node) { if (complain & tf_error) diff --git a/gcc/testsuite/g++.dg/contracts/contracts-err1.C b/gcc/testsuite/g++.dg/contracts/contracts-err1.C new file mode 100644 index 00000000000..8437d94e2ad --- /dev/null +++ b/gcc/testsuite/g++.dg/contracts/contracts-err1.C @@ -0,0 +1,7 @@ +// PR c++/108542 +// { dg-additional-options -fcontracts } +// { dg-do compile { target c++11 } } + +template +void f (T n) {} +void g() [[pre: f]]; // { dg-error "overloaded" }