diff options
Diffstat (limited to 'gcc/ada/gcc-interface')
-rw-r--r-- | gcc/ada/gcc-interface/decl.c | 13 | ||||
-rw-r--r-- | gcc/ada/gcc-interface/utils.c | 11 |
2 files changed, 8 insertions, 16 deletions
diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index cb0f074..9e14d8a 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -7507,9 +7507,8 @@ build_subst_list (Entity_Id gnat_subtype, Entity_Id gnat_type, bool definition) (Node (gnat_value), gnat_subtype, get_entity_name (gnat_discrim), definition, true, false)); - subst_pair *s = VEC_safe_push (subst_pair, heap, gnu_list, NULL); - s->discriminant = gnu_field; - s->replacement = replacement; + subst_pair s = {gnu_field, replacement}; + VEC_safe_push (subst_pair, heap, gnu_list, s); } return gnu_list; @@ -7541,14 +7540,10 @@ build_variant_list (tree qual_union_type, VEC(subst_pair,heap) *subst_list, still be accessed. */ if (!integer_zerop (qual)) { - variant_desc *v; tree variant_type = TREE_TYPE (gnu_field), variant_subpart; + variant_desc v = {variant_type, gnu_field, qual, NULL_TREE}; - v = VEC_safe_push (variant_desc, heap, gnu_list, NULL); - v->type = variant_type; - v->field = gnu_field; - v->qual = qual; - v->new_type = NULL_TREE; + VEC_safe_push (variant_desc, heap, gnu_list, v); /* Recurse on the variant subpart of the variant, if any. */ variant_subpart = get_variant_part (variant_type); diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index 4cca41b..d9121c1 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -4615,16 +4615,14 @@ convert (tree type, tree expr) FOR_EACH_CONSTRUCTOR_ELT(e, idx, index, value) { - constructor_elt *elt; /* We expect only simple constructors. */ if (!SAME_FIELD_P (index, efield)) break; /* The field must be the same. */ if (!SAME_FIELD_P (efield, field)) break; - elt = VEC_quick_push (constructor_elt, v, NULL); - elt->index = field; - elt->value = convert (TREE_TYPE (field), value); + constructor_elt elt = {field, convert (TREE_TYPE (field), value)}; + VEC_quick_push (constructor_elt, v, elt); /* If packing has made this field a bitfield and the input value couldn't be emitted statically any more, we need to @@ -4690,9 +4688,8 @@ convert (tree type, tree expr) v = VEC_alloc (constructor_elt, gc, len); FOR_EACH_CONSTRUCTOR_VALUE (e, ix, value) { - constructor_elt *elt = VEC_quick_push (constructor_elt, v, NULL); - elt->index = NULL_TREE; - elt->value = value; + constructor_elt elt = {NULL_TREE, value}; + VEC_quick_push (constructor_elt, v, elt); } expr = copy_node (expr); TREE_TYPE (expr) = type; |