From 8b9aec861e5fe49b1eb5235fa21e93f170021775 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 14 May 2014 15:42:25 +0000 Subject: decl.c (gnat_to_gnu_entity): Convert integer_one_node to the appropriate type. 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. From-SVN: r210427 --- gcc/ada/gcc-interface/trans.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gcc/ada/gcc-interface/trans.c') diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c index 11b8982..26194b6 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 *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); -- cgit v1.1