diff mbox series

[pushed] c++: consteval and explicit instantiation [PR96905]

Message ID 20210209015218.2686084-1-jason@redhat.com
State New
Headers show
Series [pushed] c++: consteval and explicit instantiation [PR96905] | expand

Commit Message

Jason Merrill Feb. 9, 2021, 1:52 a.m. UTC 
Normally, an explicit instantiation means we want to write out the
instantiation.  But not for a consteval function.

Tested x86_64-pc-linux-gnu, applying to trunk.

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


base-commit: 2da7ce23cfd81b67f77dc102d6f97dd19363b5f4
prerequisite-patch-id: 67efffa865b1469c2b63fe7a6ae9fec692c63079
prerequisite-patch-id: 827552b0b335a925cabfb34023b39d0b0753fb46
diff mbox series

Patch

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>;