From 74e56995145901773528b4cfdec971e8967d21c0 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Mon, 19 Jun 2017 14:19:35 +0000 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/pt.c | 14 ++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) 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 + * 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)) -- 2.30.2