diff options
Diffstat (limited to 'gcc/java/decl.c')
| -rw-r--r-- | gcc/java/decl.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 73653b2..d6bce48 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -585,25 +585,24 @@ java_init_decl_processing (void) /* Define these next since types below may used them. */ integer_type_node = java_type_for_size (INT_TYPE_SIZE, 0); - integer_zero_node = build_int_2 (0, 0); - integer_one_node = build_int_2 (1, 0); - integer_two_node = build_int_2 (2, 0); - integer_four_node = build_int_2 (4, 0); - integer_minus_one_node = build_int_2 (-1, -1); + integer_zero_node = build_int_cst (NULL_TREE, 0, 0); + integer_one_node = build_int_cst (NULL_TREE, 1, 0); + integer_two_node = build_int_cst (NULL_TREE, 2, 0); + integer_four_node = build_int_cst (NULL_TREE, 4, 0); + integer_minus_one_node = build_int_cst (NULL_TREE, -1, -1); /* A few values used for range checking in the lexer. */ - decimal_int_max = build_int_2 (0x80000000, 0); - TREE_TYPE (decimal_int_max) = unsigned_int_type_node; + decimal_int_max = build_int_cst (unsigned_int_type_node, 0x80000000, 0); #if HOST_BITS_PER_WIDE_INT == 64 - decimal_long_max = build_int_2 (0x8000000000000000LL, 0); + decimal_long_max = build_int_cst (unsigned_long_type_node, + 0x8000000000000000LL, 0); #else #if HOST_BITS_PER_WIDE_INT == 32 - decimal_long_max = build_int_2 (0, 0x80000000); + decimal_long_max = build_int_cst (unsigned_long_type_node, 0, 0x80000000); #else #error "unsupported size" #endif #endif - TREE_TYPE (decimal_long_max) = unsigned_long_type_node; size_zero_node = size_int (0); size_one_node = size_int (1); @@ -611,8 +610,7 @@ java_init_decl_processing (void) bitsize_one_node = bitsize_int (1); bitsize_unit_node = bitsize_int (BITS_PER_UNIT); - long_zero_node = build_int_2 (0, 0); - TREE_TYPE (long_zero_node) = long_type_node; + long_zero_node = build_int_cst (long_type_node, 0, 0); void_type_node = make_node (VOID_TYPE); pushdecl (build_decl (TYPE_DECL, get_identifier ("void"), void_type_node)); @@ -622,8 +620,7 @@ java_init_decl_processing (void) layout_type (t); /* Uses size_zero_node */ return_address_type_node = build_pointer_type (t); - null_pointer_node = build_int_2 (0, 0); - TREE_TYPE (null_pointer_node) = ptr_type_node; + null_pointer_node = build_int_cst (ptr_type_node, 0, 0); #if 0 /* Make a type to be the domain of a few array types |