From 57d705da0b98f5d398c4b8f9bd76fe8ad98e13bc Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Mon, 8 Feb 2021 17:16:14 -0500
Subject: [PATCH] c++: consteval and explicit instantiation [PR96905]

Normally, an explicit instantiation means we want to write out the
instantiation.  But not for a consteval function.

gcc/cp/ChangeLog:

	PR c++/96905
	* pt.c (mark_decl_instantiated): Exit early if consteval.

gcc/testsuite/ChangeLog:

	PR c++/96905
	* g++.dg/cpp2a/consteval-expinst1.C: New test.
---
 gcc/cp/pt.c                                   |  5 +++++
 .../g++.dg/cpp2a/consteval-expinst1.C         | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/cpp2a/consteval-expinst1.C

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 3605b67e424..f73deb3aee3 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -24154,6 +24154,11 @@ mark_decl_instantiated (tree result, int extern_p)
   if (TREE_ASM_WRITTEN (result))
     return;
 
+  /* consteval functions are never emitted.  */
+  if (TREE_CODE (result) == FUNCTION_DECL
+      && DECL_IMMEDIATE_FUNCTION_P (result))
+    return;
+
   /* For anonymous namespace we don't need to do anything.  */
   if (decl_anon_ns_mem_p (result))
     {
diff --git a/gcc/testsuite/g++.dg/cpp2a/consteval-expinst1.C b/gcc/testsuite/g++.dg/cpp2a/consteval-expinst1.C
new file mode 100644
index 00000000000..01452ddbbab
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp2a/consteval-expinst1.C
@@ -0,0 +1,20 @@
+// PR c++/96905
+// { dg-do compile { target c++20 } }
+
+template<typename Rep>
+struct duration
+{
+  static consteval int
+  gcd(int m, int n) noexcept
+  {
+    while (m != 0 && n != 0)
+    {
+      int rem = m % n;
+      m = n;
+      n = rem;
+    }
+    return m + n;
+  }
+};
+
+template class duration<int>;
-- 
2.30.2