From 6acd6692f1ac3c2ece3da36178df73e3b12c4f65 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Tue, 23 Mar 2021 05:18:04 -0700
Subject: [PATCH] c++: Over-zealous assert [PR 99239]

This was simply an overzealous assert.  Possibly correct thinking at
the time that code was written, but not true now.  Of course we can
have imported artificial decls.

	PR c++/99239
	gcc/cp/
	* decl.c (duplicate_decls): Remove assert about maybe-imported
	artificial decls.
	gcc/testsuite/
	* g++.dg/modules/pr99239_a.H: New.
	* g++.dg/modules/pr99239_b.H: New.
---
 gcc/cp/decl.c                            |  2 --
 gcc/testsuite/g++.dg/modules/pr99239_a.H | 13 +++++++++++++
 gcc/testsuite/g++.dg/modules/pr99239_b.H | 12 ++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/g++.dg/modules/pr99239_a.H
 create mode 100644 gcc/testsuite/g++.dg/modules/pr99239_b.H

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index b1d8e44..3483b0c 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2041,8 +2041,6 @@ duplicate_decls (tree newdecl, tree olddecl, bool hiding, bool was_hidden)
     {
       if (DECL_ARTIFICIAL (olddecl))
 	{
-	  gcc_checking_assert (!(DECL_LANG_SPECIFIC (olddecl)
-				 && DECL_MODULE_IMPORT_P (olddecl)));
 	  if (!(global_purview_p () || not_module_p ()))
 	    error ("declaration %qD conflicts with builtin", newdecl);
 	  else
diff --git a/gcc/testsuite/g++.dg/modules/pr99239_a.H b/gcc/testsuite/g++.dg/modules/pr99239_a.H
new file mode 100644
index 0000000..35f006f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99239_a.H
@@ -0,0 +1,13 @@
+// PR 99239 ICE on catch clause
+// { dg-additional-options -fmodule-header }
+// { dg-module-cmi {} }
+
+inline void Foo ()
+{
+  try
+    {}
+  catch(...)
+    {
+    }
+}
+
diff --git a/gcc/testsuite/g++.dg/modules/pr99239_b.H b/gcc/testsuite/g++.dg/modules/pr99239_b.H
new file mode 100644
index 0000000..92638d6
--- /dev/null
+++ b/gcc/testsuite/g++.dg/modules/pr99239_b.H
@@ -0,0 +1,12 @@
+// { dg-additional-options {-fmodule-header -fno-module-lazy} }
+// { dg-module-cmi {} }
+import  "pr99239_a.H";
+       
+inline void
+  _M_remove_reference() throw()
+{
+  try
+    { }
+  catch(...)
+    { }
+}
-- 
2.7.4