diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/java/boehm.c | 6 | ||||
| -rw-r--r-- | gcc/java/decl.c | 2 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 8fd18aa..96c9df9 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2012-09-24 Lawrence Crowl <crowl@google.com> + + * decl.c (java_init_decl_processing): Change to new double_int API. + * jcf-parse.c (get_constant): Likewise. + * boehm.c (mark_reference_fields): Likewise. + (get_boehm_type_descriptor): Likewise. + 2012-07-30 Laurynas Biveinis <laurynas.biveinis@gmail.com> * jcf.h (CPool): Use the "atomic" GTY option for the tags field. diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c index 07dfb61..0fa8964 100644 --- a/gcc/java/boehm.c +++ b/gcc/java/boehm.c @@ -108,7 +108,7 @@ mark_reference_fields (tree field, bits for all words in the record. This is conservative, but the size_words != 1 case is impossible in regular java code. */ for (i = 0; i < size_words; ++i) - *mask = double_int_setbit (*mask, ubit - count - i - 1); + *mask = (*mask).set_bit (ubit - count - i - 1); if (count >= ubit - 2) *pointer_after_end = 1; @@ -200,7 +200,7 @@ get_boehm_type_descriptor (tree type) while (last_set_index) { if ((last_set_index & 1)) - mask = double_int_setbit (mask, log2_size + count); + mask = mask.set_bit (log2_size + count); last_set_index >>= 1; ++count; } @@ -209,7 +209,7 @@ get_boehm_type_descriptor (tree type) else if (! pointer_after_end) { /* Bottom two bits for bitmap mark type are 01. */ - mask = double_int_setbit (mask, 0); + mask = mask.set_bit (0); value = double_int_to_tree (value_type, mask); } else diff --git a/gcc/java/decl.c b/gcc/java/decl.c index e22b0fd..30048fd 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -617,7 +617,7 @@ java_init_decl_processing (void) decimal_int_max = build_int_cstu (unsigned_int_type_node, 0x80000000); decimal_long_max = double_int_to_tree (unsigned_long_type_node, - double_int_setbit (double_int_zero, 64)); + double_int_zero.set_bit (64)); long_zero_node = build_int_cst (long_type_node, 0); diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index c799676..92f032cb 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1043,9 +1043,9 @@ get_constant (JCF *jcf, int index) double_int val; num = JPOOL_UINT (jcf, index); - val = double_int_lshift (uhwi_to_double_int (num), 32, 64, false); + val = double_int::from_uhwi (num).llshift (32, 64); num = JPOOL_UINT (jcf, index + 1); - val = double_int_ior (val, uhwi_to_double_int (num)); + val |= double_int::from_uhwi (num); value = double_int_to_tree (long_type_node, val); break; |