* cuintp.c (UI_To_gnu): Be more conservative with build_int_cst

	call.s
	* trans.c (Exception_Handler_to_gnu_sjlj): Likewise.
	(gnat_to_gnu): Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@86063 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 6 deletions

diff --git a/gcc/ada/cuintp.c b/gcc/ada/cuintp.c
index c0338afb5d9..b919bb58ce1 100644
--- a/gcc/ada/cuintp.c
+++ b/gcc/ada/cuintp.c
@@ -76,26 +76,29 @@ UI_To_gnu (Uint Input, tree type)
       tree comp_type
 	= (TYPE_PRECISION (type) >= TYPE_PRECISION (integer_type_node)
 	   ? type : integer_type_node);
-      tree gnu_base = build_int_cst (comp_type, Base, 0);
+      tree gnu_base = convert (comp_type, build_int_cst (NULL_TREE, Base, 0));
 
       if (Length <= 0)
 	abort ();
 
-      gnu_ret = build_int_cst (comp_type, First, First < 0 ? -1 : 0);
+      gnu_ret = convert (comp_type, build_int_cst (NULL_TREE,
+						   First, First < 0 ? -1 : 0));
       if (First < 0)
 	for (Idx++, Length--; Length; Idx++, Length--)
 	  gnu_ret = fold (build (MINUS_EXPR, comp_type,
 				 fold (build (MULT_EXPR, comp_type,
 					      gnu_ret, gnu_base)),
-				 build_int_cst (comp_type,
-						Udigits_Ptr[Idx], 0)));
+				 convert (comp_type,
+					  build_int_cst (NULL_TREE,
+							 Udigits_Ptr[Idx], 0))));
       else
 	for (Idx++, Length--; Length; Idx++, Length--)
 	  gnu_ret = fold (build (PLUS_EXPR, comp_type,
 				 fold (build (MULT_EXPR, comp_type,
 					      gnu_ret, gnu_base)),
-				 build_int_cst (comp_type,
-						Udigits_Ptr[Idx], 0)));
+				 convert (comp_type,
+					  build_int_cst (NULL_TREE,
+							 Udigits_Ptr[Idx], 0))));
     }
 
   gnu_ret = convert (type, gnu_ret);