diff options
Diffstat (limited to 'gcc/cp/init.c')
| -rw-r--r-- | gcc/cp/init.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 32f242c3275..000f514a43c 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1131,7 +1131,7 @@ build_vtbl_address (tree binfo) /* Now compute the address to use when initializing the vptr. */ vtbl = unshare_expr (BINFO_VTABLE (binfo_for)); - if (TREE_CODE (vtbl) == VAR_DECL) + if (VAR_P (vtbl)) vtbl = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (vtbl)), vtbl); return vtbl; @@ -1293,7 +1293,7 @@ member_init_ok_or_else (tree field, tree type, tree member_name) member_name); return 0; } - if (TREE_CODE (field) == VAR_DECL) + if (VAR_P (field)) { error ("%q#D is a static data member; it can only be " "initialized at its definition", @@ -1515,7 +1515,7 @@ build_aggr_init (tree exp, tree init, int flags, tsubst_flags_t complain) return stmt_expr; } - if (TREE_CODE (exp) == VAR_DECL || TREE_CODE (exp) == PARM_DECL) + if (VAR_P (exp) || TREE_CODE (exp) == PARM_DECL) /* Just know that we've seen something for this node. */ TREE_USED (exp) = 1; @@ -1728,7 +1728,7 @@ expand_aggr_init_1 (tree binfo, tree true_exp, tree exp, tree init, int flags, in and expand the constructor. Constructors now come as TARGET_EXPRs. */ - if (init && TREE_CODE (exp) == VAR_DECL + if (init && VAR_P (exp) && COMPOUND_LITERAL_P (init)) { vec<tree, va_gc> *cleanups = NULL; @@ -1849,7 +1849,7 @@ build_offset_ref (tree type, tree member, bool address_p) processing. */ if (TREE_CODE (member) == TYPE_DECL) return member; - if (TREE_CODE (member) == VAR_DECL || TREE_CODE (member) == CONST_DECL) + if (VAR_P (member) || TREE_CODE (member) == CONST_DECL) return convert_from_reference (member); if (TREE_CODE (member) == FIELD_DECL && DECL_C_BIT_FIELD (member)) @@ -1964,7 +1964,7 @@ constant_value_1 (tree decl, bool integral_p, bool return_aggregate_cst_ok_p) while (TREE_CODE (decl) == CONST_DECL || (integral_p ? decl_constant_var_p (decl) - : (TREE_CODE (decl) == VAR_DECL + : (VAR_P (decl) && CP_TYPE_CONST_NON_VOLATILE_P (TREE_TYPE (decl))))) { tree init; |