diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2015-05-25 20:59:27 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2015-05-25 20:59:27 +0000 |
| commit | 2117b9bb988c489ff1a2233e066abc7cf9b136c1 (patch) | |
| tree | d811c6f7bac6b6337a78000eea617b1e2544870c /gcc/ada/gcc-interface/utils2.c | |
| parent | f797c2b745ec8a1b5750900caf54c96dcbc904ca (diff) | |
| download | gcc-2117b9bb988c489ff1a2233e066abc7cf9b136c1.zip gcc-2117b9bb988c489ff1a2233e066abc7cf9b136c1.tar.gz gcc-2117b9bb988c489ff1a2233e066abc7cf9b136c1.tar.bz2 | |
decl.c (gnat_to_gnu_entity): Minor tweak.
* gcc-interface/decl.c (gnat_to_gnu_entity): Minor tweak.
* gcc-interface/trans.c (finalize_nrv_unc_r): Use CONSTRUCTOR_ELT.
* gcc-interface/utils.c (convert): Likewise and simplify.
(remove_conversions): Likewise.
* gcc-interface/utils2.c (compare_fat_pointers): Likewise.
(build_unary_op): Likewise and simplify.
From-SVN: r223653
Diffstat (limited to 'gcc/ada/gcc-interface/utils2.c')
| -rw-r--r-- | gcc/ada/gcc-interface/utils2.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/gcc/ada/gcc-interface/utils2.c b/gcc/ada/gcc-interface/utils2.c index aa92382..42587d9 100644 --- a/gcc/ada/gcc-interface/utils2.c +++ b/gcc/ada/gcc-interface/utils2.c @@ -461,7 +461,7 @@ compare_fat_pointers (location_t loc, tree result_type, tree p1, tree p2) /* The constant folder doesn't fold fat pointer types so we do it here. */ if (TREE_CODE (p1) == CONSTRUCTOR) - p1_array = (*CONSTRUCTOR_ELTS (p1))[0].value; + p1_array = CONSTRUCTOR_ELT (p1, 0)->value; else p1_array = build_component_ref (p1, NULL_TREE, TYPE_FIELDS (TREE_TYPE (p1)), true); @@ -472,7 +472,7 @@ compare_fat_pointers (location_t loc, tree result_type, tree p1, tree p2) null_pointer_node)); if (TREE_CODE (p2) == CONSTRUCTOR) - p2_array = (*CONSTRUCTOR_ELTS (p2))[0].value; + p2_array = CONSTRUCTOR_ELT (p2, 0)->value; else p2_array = build_component_ref (p2, NULL_TREE, TYPE_FIELDS (TREE_TYPE (p2)), true); @@ -493,14 +493,14 @@ compare_fat_pointers (location_t loc, tree result_type, tree p1, tree p2) = fold_build2_loc (loc, EQ_EXPR, result_type, p1_array, p2_array); if (TREE_CODE (p1) == CONSTRUCTOR) - p1_bounds = (*CONSTRUCTOR_ELTS (p1))[1].value; + p1_bounds = CONSTRUCTOR_ELT (p1, 1)->value; else p1_bounds = build_component_ref (p1, NULL_TREE, DECL_CHAIN (TYPE_FIELDS (TREE_TYPE (p1))), true); if (TREE_CODE (p2) == CONSTRUCTOR) - p2_bounds = (*CONSTRUCTOR_ELTS (p2))[1].value; + p2_bounds = CONSTRUCTOR_ELT (p2, 1)->value; else p2_bounds = build_component_ref (p2, NULL_TREE, @@ -1445,15 +1445,13 @@ build_unary_op (enum tree_code op_code, tree result_type, tree operand) offset = size_binop (PLUS_EXPR, offset, size_int (bitpos / BITS_PER_UNIT)); - /* Take the address of INNER, convert the offset to void *, and - add then. It will later be converted to the desired result - type, if any. */ - inner = build_unary_op (ADDR_EXPR, NULL_TREE, inner); - inner = convert (ptr_void_type_node, inner); - result = build_binary_op (POINTER_PLUS_EXPR, ptr_void_type_node, + /* Take the address of INNER, convert it to a pointer to our type + and add the offset. */ + inner = build_unary_op (ADDR_EXPR, + build_pointer_type (TREE_TYPE (operand)), + inner); + result = build_binary_op (POINTER_PLUS_EXPR, TREE_TYPE (inner), inner, offset); - result = convert (build_pointer_type (TREE_TYPE (operand)), - result); break; } goto common; @@ -1464,12 +1462,12 @@ build_unary_op (enum tree_code op_code, tree result_type, tree operand) a pointer to our type. */ if (TYPE_IS_PADDING_P (type)) { - result = (*CONSTRUCTOR_ELTS (operand))[0].value; - result = convert (build_pointer_type (TREE_TYPE (operand)), - build_unary_op (ADDR_EXPR, NULL_TREE, result)); + result + = build_unary_op (ADDR_EXPR, + build_pointer_type (TREE_TYPE (operand)), + CONSTRUCTOR_ELT (operand, 0)->value); break; } - goto common; case NOP_EXPR: |