diff options
Diffstat (limited to 'gcc/java/expr.c')
| -rw-r--r-- | gcc/java/expr.c | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 7d515052ba0..30f67adfe5f 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -383,6 +383,10 @@ pop_type_0 (tree type, char **messagep) fail: { char *temp = xstrdup (lang_printable_name (type, 0)); + /* If the stack contains a multi-word type, keep popping the stack until + the real type is found. */ + while (t == void_type_node) + t = stack_type_map[--stack_pointer]; *messagep = concat ("expected type '", temp, "' but stack contains '", lang_printable_name (t, 0), "'", NULL); @@ -814,15 +818,6 @@ build_java_array_length_access (tree node) tree array_type = TREE_TYPE (type); HOST_WIDE_INT length; - /* JVM spec: If the arrayref is null, the arraylength instruction - throws a NullPointerException. The only way we could get a node - of type ptr_type_node at this point is `aconst_null; arraylength' - or something equivalent. */ - if (!flag_new_verifier && type == ptr_type_node) - return build3 (CALL_EXPR, int_type_node, - build_address_of (soft_nullpointer_node), - NULL_TREE, NULL_TREE); - if (!is_array_type_p (type)) { /* With the new verifier, we will see an ordinary pointer type @@ -1225,21 +1220,11 @@ expand_java_arrayload (tree lhs_type_node) index_node = save_expr (index_node); array_node = save_expr (array_node); - if (TREE_TYPE (array_node) == ptr_type_node) - /* The only way we could get a node of type ptr_type_node at this - point is `aconst_null; arraylength' or something equivalent, so - unconditionally throw NullPointerException. */ - load_node = build3 (CALL_EXPR, lhs_type_node, - build_address_of (soft_nullpointer_node), - NULL_TREE, NULL_TREE); - else - { - lhs_type_node = build_java_check_indexed_type (array_node, - lhs_type_node); - load_node = build_java_arrayaccess (array_node, - lhs_type_node, - index_node); - } + lhs_type_node = build_java_check_indexed_type (array_node, + lhs_type_node); + load_node = build_java_arrayaccess (array_node, + lhs_type_node, + index_node); if (INTEGRAL_TYPE_P (lhs_type_node) && TYPE_PRECISION (lhs_type_node) <= 32) load_node = fold (build1 (NOP_EXPR, int_type_node, load_node)); push_value (load_node); |