This fixes an ICE caused by a cleanup of get_class_binding. Previously
its type_or_fn parm defaulted to -1, which had some funky behaviour I
convinced myself was irrelevant to C++ source. Here we're peeking
behind the curtain of a class under construction, and previously the -1
behaviour caused us never to see a type here -- we could only get back
function decls, because we only looked in the method_vector (and that's
only created during construction if there are functions).
so, look at DECL_TEMPLATE_INFO or CLASSTYPE_TEMPLATE_INFO depending on
what we got back. Incidentally, this means we will now optimize member
class instantiations in this case, whereas before we didn't.
Committing to trunk.
nathan
--
Nathan Sidwell
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 004ce0fdcdf..3cc7c48b490 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-14 Nathan Sidwell <nat...@acm.org>
+
+ PR c++/90916
+ * pt.c (retrieve_specialization): Get the TI from the decl or the
+ classtype as appropriate.
+
2020-01-14 David Malcolm <dmalc...@redhat.com>
* cp-gimplify.c (source_location_table_entry_hash::empty_zero_p):
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index fa82ecad233..4fdc74f9ca8 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1252,11 +1252,16 @@ retrieve_specialization (tree tmpl, tree args, hashval_t hash)
for (ovl_iterator iter (fns); iter; ++iter)
{
tree fn = *iter;
- if (DECL_TEMPLATE_INFO (fn) && DECL_TI_TEMPLATE (fn) == tmpl
- /* using-declarations can add base methods to the method vec,
- and we don't want those here. */
- && DECL_CONTEXT (fn) == class_specialization)
- return fn;
+ if (tree ti = (TREE_CODE (fn) == TYPE_DECL && !TYPE_DECL_ALIAS_P (fn)
+ ? TYPE_TEMPLATE_INFO (TREE_TYPE (fn))
+ : DECL_TEMPLATE_INFO (fn)))
+ if (TI_TEMPLATE (ti) == tmpl
+ /* using-declarations can bring in a different
+ instantiation of tmpl as a member of a different
+ instantiation of tmpl's class. We don't want those
+ here. */
+ && DECL_CONTEXT (fn) == class_specialization)
+ return fn;
}
return NULL_TREE;
}
diff --git a/gcc/testsuite/g++.dg/template/pr90916.C b/gcc/testsuite/g++.dg/template/pr90916.C
new file mode 100644
index 00000000000..bdb7e7b58ef
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/pr90916.C
@@ -0,0 +1,8 @@
+// PR c++/90916 ICE in retrieve_specialization
+
+template <typename> struct S
+{
+ struct A;
+ struct f A ();
+};
+template class S <int>;
