aboutsummaryrefslogtreecommitdiff
path: root/gcc/ada
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@gcc.gnu.org>2008-11-20 20:24:53 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2008-11-20 20:24:53 +0000
commit521f661554b8b861a0dce8c949c6bf5d5c561108 (patch)
tree70816a6d23e32a627c48f1de4f08be40988005c9 /gcc/ada
parenta6bf9022494b0784d2e132bbbef9313174aa8ff5 (diff)
downloadgcc-521f661554b8b861a0dce8c949c6bf5d5c561108.zip
gcc-521f661554b8b861a0dce8c949c6bf5d5c561108.tar.gz
gcc-521f661554b8b861a0dce8c949c6bf5d5c561108.tar.bz2
Follow up fix for GC19-015:
* utils.c (init_gigi_decls): Fix type mismatch. From-SVN: r142057
Diffstat (limited to 'gcc/ada')
-rw-r--r--gcc/ada/gcc-interface/utils.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c
index 21904d4..131b237 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);