diff options
| author | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-14 15:42:25 +0000 |
|---|---|---|
| committer | rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-05-14 15:42:25 +0000 |
| commit | 7d7471caf25baecad3e82e1c2fee306276d3610a (patch) | |
| tree | 57496b08bab371d587ae0941d0da6eb416e3ef25 /gcc/ada | |
| parent | fa19d637bfc72d510bb7495a8baf6d626b1ad389 (diff) | |
| download | gcc-7d7471caf25baecad3e82e1c2fee306276d3610a.tar.gz | |
gcc/ada/
* gcc-interface/decl.c (gnat_to_gnu_entity): Convert
integer_one_node to the appropriate type.
* gcc-interface/trans.c (gnat_to_gnu): Likewise.
(pos_to_constructor): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@210427 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada')
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/decl.c | 3 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/trans.c | 7 |
3 files changed, 14 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 7167f97d6f8..e84ca909809 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2014-05-14 Richard Sandiford <r.sandiford@uk.ibm.com> + + * gcc-interface/decl.c (gnat_to_gnu_entity): Convert + integer_one_node to the appropriate type. + * gcc-interface/trans.c (gnat_to_gnu): Likewise. + (pos_to_constructor): Likewise. + 2014-05-13 Eric Botcazou <ebotcazou@adacore.com> * gcc-interface/decl.c (annotate_value): Fix thinko in latest change. diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index 43ed0b33c3b..e18583cb06a 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -2840,7 +2840,8 @@ gnat_to_gnu_entity (Entity_Id gnat_entity, tree gnu_expr, int definition) = build_binary_op (PLUS_EXPR, gnu_string_index_type, gnu_lower_bound, int_const_binop (MINUS_EXPR, gnu_length, - integer_one_node)); + convert (gnu_string_index_type, + integer_one_node))); tree gnu_index_type = create_index_type (convert (sizetype, gnu_lower_bound), convert (sizetype, gnu_upper_bound), diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 11b89825c23..26194b64d23 100644 --- a/gcc/ada/gcc-interface/trans.c +++ b/gcc/ada/gcc-interface/trans.c @@ -5597,6 +5597,7 @@ gnat_to_gnu (Node_Id gnat_node) int length = String_Length (gnat_string); int i; tree gnu_idx = TYPE_MIN_VALUE (TYPE_DOMAIN (gnu_result_type)); + tree gnu_one_node = convert (TREE_TYPE (gnu_idx), integer_one_node); vec<constructor_elt, va_gc> *gnu_vec; vec_alloc (gnu_vec, length); @@ -5606,7 +5607,7 @@ gnat_to_gnu (Node_Id gnat_node) Get_String_Char (gnat_string, i + 1)); CONSTRUCTOR_APPEND_ELT (gnu_vec, gnu_idx, t); - gnu_idx = int_const_binop (PLUS_EXPR, gnu_idx, integer_one_node); + gnu_idx = int_const_binop (PLUS_EXPR, gnu_idx, gnu_one_node); } gnu_result = gnat_build_constructor (gnu_result_type, gnu_vec); @@ -9092,7 +9093,9 @@ pos_to_constructor (Node_Id gnat_expr, tree gnu_array_type, CONSTRUCTOR_APPEND_ELT (gnu_expr_vec, gnu_index, convert (TREE_TYPE (gnu_array_type), gnu_expr)); - gnu_index = int_const_binop (PLUS_EXPR, gnu_index, integer_one_node); + gnu_index = int_const_binop (PLUS_EXPR, gnu_index, + convert (TREE_TYPE (gnu_index), + integer_one_node)); } return gnat_build_constructor (gnu_array_type, gnu_expr_vec); |