diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/boehm.c | 2 | ||||
| -rw-r--r-- | gcc/java/class.c | 8 | ||||
| -rw-r--r-- | gcc/java/constants.c | 4 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c index f4a9af6..07dfb61 100644 --- a/gcc/java/boehm.c +++ b/gcc/java/boehm.c @@ -233,6 +233,6 @@ uses_jv_markobj_p (tree dtable) this function is only used with flag_reduced_reflection. No point in asserting unless we hit the bad case. */ gcc_assert (!flag_reduced_reflection || TARGET_VTABLE_USES_DESCRIPTORS == 0); - v = VEC_index (constructor_elt, CONSTRUCTOR_ELTS (dtable), 3)->value; + v = VEC_index (constructor_elt, CONSTRUCTOR_ELTS (dtable), 3).value; return (PROCEDURE_OBJECT_DESCRIPTOR == TREE_INT_CST_LOW (v)); } diff --git a/gcc/java/class.c b/gcc/java/class.c index 40ff26d..f806cea 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -1533,7 +1533,7 @@ make_method_value (tree mdecl) v = VEC_alloc (constructor_elt, gc, length); VEC_safe_grow_cleared (constructor_elt, gc, v, length); - e = VEC_index (constructor_elt, v, idx--); + e = &VEC_index (constructor_elt, v, idx--); e->value = null_pointer_node; FOR_EACH_VEC_ELT (tree, DECL_FUNCTION_THROWS (mdecl), ix, t) @@ -1542,7 +1542,7 @@ make_method_value (tree mdecl) tree utf8 = build_utf8_ref (unmangle_classname (IDENTIFIER_POINTER (sig), IDENTIFIER_LENGTH (sig))); - e = VEC_index (constructor_elt, v, idx--); + e = &VEC_index (constructor_elt, v, idx--); e->value = utf8; } gcc_assert (idx == -1); @@ -1621,7 +1621,7 @@ get_dispatch_table (tree type, tree this_class_addr) arraysize += 2; VEC_safe_grow_cleared (constructor_elt, gc, v, arraysize); - e = VEC_index (constructor_elt, v, arraysize - 1); + e = &VEC_index (constructor_elt, v, arraysize - 1); #define CONSTRUCTOR_PREPEND_VALUE(E, V) E->value = V, E-- for (i = nvirtuals; --i >= 0; ) @@ -3007,7 +3007,7 @@ emit_catch_table (tree this_class) int n_catch_classes; constructor_elt *e; /* Fill in the dummy entry that make_class created. */ - e = VEC_index (constructor_elt, TYPE_CATCH_CLASSES (this_class), 0); + e = &VEC_index (constructor_elt, TYPE_CATCH_CLASSES (this_class), 0); e->value = make_catch_class_record (null_pointer_node, null_pointer_node); CONSTRUCTOR_APPEND_ELT (TYPE_CATCH_CLASSES (this_class), NULL_TREE, make_catch_class_record (null_pointer_node, diff --git a/gcc/java/constants.c b/gcc/java/constants.c index 2cc911f..c709fa4 100644 --- a/gcc/java/constants.c +++ b/gcc/java/constants.c @@ -514,8 +514,8 @@ build_constants_constructor (void) int c = outgoing_cpool->count; VEC_safe_grow_cleared (constructor_elt, gc, tags, c); VEC_safe_grow_cleared (constructor_elt, gc, data, c); - t = VEC_index (constructor_elt, tags, c-1); - d = VEC_index (constructor_elt, data, c-1); + t = &VEC_index (constructor_elt, tags, c-1); + d = &VEC_index (constructor_elt, data, c-1); } #define CONSTRUCTOR_PREPEND_VALUE(E, V) E->value = V, E-- diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 6169b6a..5167b9b 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -1430,7 +1430,7 @@ extern tree *type_map; #define PUSH_SUPER_VALUE(V, VALUE) \ do \ { \ - constructor_elt *_elt___ = VEC_last (constructor_elt, V); \ + constructor_elt *_elt___ = &VEC_last (constructor_elt, V); \ tree _next___ = DECL_CHAIN (_elt___->index); \ gcc_assert (!DECL_NAME (_elt___->index)); \ _elt___->value = VALUE; \ @@ -1444,7 +1444,7 @@ extern tree *type_map; #define PUSH_FIELD_VALUE(V, NAME, VALUE) \ do \ { \ - constructor_elt *_elt___ = VEC_last (constructor_elt, V); \ + constructor_elt *_elt___ = &VEC_last (constructor_elt, V); \ tree _next___ = DECL_CHAIN (_elt___->index); \ gcc_assert (strcmp (IDENTIFIER_POINTER (DECL_NAME (_elt___->index)), \ NAME) == 0); \ |