[PR90916] Use TI accessor.

	PR c++/90916
	* pt.c (retrieve_specialization): Use get_template_info, not open
	coding access.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index c137539..59e0994 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2020-01-14  Nathan Sidwell  <nathan@acm.org>
 
+       PT c++/90916
+       * pt.c (retrieve_specialization): Use get_template_info, not open
+       coding access.
+
        PR c++/90916
        * pt.c (retrieve_specialization): Get the TI from the decl or the
        classtype as appropriate.

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 7e675ce..9bb8cc1 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1252,9 +1252,7 @@ retrieve_specialization (tree tmpl, tree args, hashval_t hash)
       for (ovl_iterator iter (fns); iter; ++iter)
        {
          tree fn = *iter;
-         if (tree ti = (TREE_CODE (fn) == TYPE_DECL && !TYPE_DECL_ALIAS_P (fn)
-                        ? TYPE_TEMPLATE_INFO (TREE_TYPE (fn))
-                        : DECL_TEMPLATE_INFO (fn)))
+         if (tree ti = get_template_info (fn))
            if (TI_TEMPLATE (ti) == tmpl
                /* using-declarations can bring in a different
                   instantiation of tmpl as a member of a different