From: Nathan Sidwell <nathan@acm.org>
Date: Mon, 19 Jun 2017 14:19:35 +0000 (+0000)
Subject: pt.c (coerce_template_parms): Fix indentation.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=74e56995145901773528b4cfdec971e8967d21c0;p=gcc.git

pt.c (coerce_template_parms): Fix indentation.

	* pt.c (coerce_template_parms): Fix indentation.
	(tsubst_decl): Remove repeated SET_DECL_RTL.  Move VAR_P handling
	in to single block.

From-SVN: r249370
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fece2d040da..5b90bbff94b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2017-06-19  Nathan Sidwell  <nathan@acm.org>
 
+	* pt.c (coerce_template_parms): Fix indentation.
+	(tsubst_decl): Remove repeated SET_DECL_RTL.  Move VAR_P handling
+	in to single block.
+
 	PR c++/81119
 	* name-lookup.c (update_binding): Only warn about constructors
 	hidden by functions.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 57be0ab4364..e5238ad2fa5 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8101,10 +8101,10 @@ coerce_template_parms (tree parms,
       parm = TREE_VEC_ELT (parms, parm_idx);
  
       if (parm == error_mark_node)
-      {
-        TREE_VEC_ELT (new_inner_args, arg_idx) = error_mark_node;
-        continue;
-      }
+	{
+	  TREE_VEC_ELT (new_inner_args, arg_idx) = error_mark_node;
+	  continue;
+	}
 
       /* Calculate the next argument.  */
       if (arg_idx < nargs)
@@ -12947,13 +12947,11 @@ tsubst_decl (tree t, tree args, tsubst_flags_t complain)
 	/* The initializer must not be expanded until it is required;
 	   see [temp.inst].  */
 	DECL_INITIAL (r) = NULL_TREE;
-	if (VAR_P (r))
-	  SET_DECL_MODE (r, VOIDmode);
-	if (CODE_CONTAINS_STRUCT (TREE_CODE (t), TS_DECL_WRTL))
-	  SET_DECL_RTL (r, NULL);
 	DECL_SIZE (r) = DECL_SIZE_UNIT (r) = 0;
 	if (VAR_P (r))
 	  {
+	    SET_DECL_MODE (r, VOIDmode);
+
 	    /* Possibly limit visibility based on template args.  */
 	    DECL_VISIBILITY (r) = VISIBILITY_DEFAULT;
 	    if (DECL_VISIBILITY_SPECIFIED (t))