From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 90AE738582BD; Fri, 10 Mar 2023 03:14:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 90AE738582BD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678418049; bh=GvxSbQuuibiL637P/3TvIyIYX4PX7M6oU9s0EtF75FE=; h=From:To:Subject:Date:From; b=f2Y1txwZDOhFsILHblywOfryNER96dtWbwz9ipFBnZZwDZkT+YuZYYtf2lWJlYgMk u0VbchyveEZ/xP8VRGQUZlUMfctd3IH+XJ+iLqKf+mDQSKX83CLPvpSUEvRHOmkATV 6bQxJl4XPIoxJ6Ca+yyKiQzNni+xX82JIxfK36Is= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6568] c++: overloaded fn in contract [PR108542] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/trunk X-Git-Oldrev: da2b9c6e310e808f73c5dcfb3f46ca70b836e8f5 X-Git-Newrev: 68c5d92a1390ecccb61d3600a95eeff6caf7ccdf Message-Id: <20230310031409.90AE738582BD@sourceware.org> Date: Fri, 10 Mar 2023 03:14:09 +0000 (GMT) List-Id: https://gcc.gnu.org/g:68c5d92a1390ecccb61d3600a95eeff6caf7ccdf commit r13-6568-g68c5d92a1390ecccb61d3600a95eeff6caf7ccdf Author: Jason Merrill Date: Thu Mar 9 17:22:46 2023 -0500 c++: overloaded fn in contract [PR108542] PR c++/108542 gcc/cp/ChangeLog: * class.cc (instantiate_type): Strip location wrapper. gcc/testsuite/ChangeLog: * g++.dg/contracts/contracts-err1.C: New test. Diff: --- gcc/cp/class.cc | 2 ++ gcc/testsuite/g++.dg/contracts/contracts-err1.C | 7 +++++++ 2 files changed, 9 insertions(+) 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" }