From 68c5d92a1390ecccb61d3600a95eeff6caf7ccdf Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Thu, 9 Mar 2023 17:22:46 -0500
Subject: [PATCH] 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.
---
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
diff --git a/gcc/cp/class.cc b/gcc/cp/class.cc
index 27a798297372..d37e9d4d5763 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 000000000000..8437d94e2ad3
--- /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<typename T>
+void f (T n) {}
+void g() [[pre: f]]; // { dg-error "overloaded" }
--
GitLab