c++: simplify lookup_template_class_1

We were checking TYPE_NAME and then copying it if not null.  Just copy
it, and then see if we got null.

	* pt.c (lookup_template_class_1): Remove unnecessary else by
	simply grabbing TYPE_NAME earlier.

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9bc3e8d7c8139b7412912e53ec48761e97c754b6..ab6130e0d93a7a30ab1e6b6e55cf7aaf6e0a6e85 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2020-05-14  Nathan Sidwell  <nathan@acm.org>
 
+       * pt.c (lookup_template_class_1): Remove unnecessary else by
+       simply grabbing TYPE_NAME earlier.
+
        * pt.c (push_template_decl_real): Adjust friend pushing logic.
        Reinit template type.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 68d113bab901377b028223c190abdf632fcf6368..55f72e3c4fda0a3678add907985924b556e975d9 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -9919,7 +9919,8 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
 
       /* If we called start_enum or pushtag above, this information
         will already be set up.  */
-      if (!TYPE_NAME (t))
+      type_decl = TYPE_NAME (t);
+      if (!type_decl)
        {
          TYPE_CONTEXT (t) = FROB_CONTEXT (context);
 
@@ -9928,8 +9929,6 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
          DECL_SOURCE_LOCATION (type_decl)
            = DECL_SOURCE_LOCATION (TYPE_STUB_DECL (template_type));
        }
-      else
-       type_decl = TYPE_NAME (t);
 
       if (CLASS_TYPE_P (template_type))
        {