diff options
| author | Nathan Sidwell <nathan@acm.org> | 2017-06-19 14:19:35 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2017-06-19 14:19:35 +0000 |
| commit | 74e56995145901773528b4cfdec971e8967d21c0 (patch) | |
| tree | e5020bddbe12f4d506d2ebb8b2fbb1ace0e0630b /gcc | |
| parent | c14c0b1568f84e974152d2e2c1bc3da384a16f2d (diff) | |
| download | gcc-74e56995145901773528b4cfdec971e8967d21c0.zip gcc-74e56995145901773528b4cfdec971e8967d21c0.tar.gz gcc-74e56995145901773528b4cfdec971e8967d21c0.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fece2d0..5b90bbf 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 57be0ab..e5238ad 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)) |