From: Eric Botcazou <ebotcazou@gcc.gnu.org>
Date: Thu, 20 Nov 2008 20:24:53 +0000 (+0000)
Subject: Follow up fix for GC19-015:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=521f661554b8b861a0dce8c949c6bf5d5c561108;p=gcc.git

Follow up fix for GC19-015:

	* utils.c (init_gigi_decls): Fix type mismatch.

From-SVN: r142057
---

diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 21904d4cb14..131b2376ac7 100644
--- a/gcc/ada/gcc-interface/utils.c
+++ b/gcc/ada/gcc-interface/utils.c
@@ -577,6 +577,7 @@ init_gigi_decls (tree long_long_float_type, tree exception_type)
   /* Build the special descriptor type and its null node if needed.  */
   if (TARGET_VTABLE_USES_DESCRIPTORS)
     {
+      tree null_node = fold_convert (ptr_void_ftype, null_pointer_node);
       tree field_list = NULL_TREE, null_list = NULL_TREE;
       int j;
 
@@ -588,7 +589,7 @@ init_gigi_decls (tree long_long_float_type, tree exception_type)
 					  fdesc_type_node, 0, 0, 0, 1);
 	  TREE_CHAIN (field) = field_list;
 	  field_list = field;
-	  null_list = tree_cons (field, null_pointer_node, null_list);
+	  null_list = tree_cons (field, null_node, null_list);
 	}
 
       finish_record_type (fdesc_type_node, nreverse (field_list), 0, false);