From: Nathan Sidwell <nathan@acm.org>
Date: Thu, 14 May 2020 14:20:35 +0000 (-0700)
Subject: c++: simplify lookup_template_class_1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea5a33d4536ce2af90255782bda0ada632952205;p=gcc.git

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 9bc3e8d7c81..ab6130e0d93 100644
--- 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 68d113bab90..55f72e3c4fd 100644
--- 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))
 	{