From 2dc219a11db3efc10d1564bf31db97aa7918e61b Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Sat, 16 Jan 1999 02:00:27 -0800 Subject: expr.c (process_jvm_instruction): Coerce to correct Throwable sub-type the result of the call that gets the... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit � * expr.c (process_jvm_instruction): Coerce to correct Throwable sub-type the result of the call that gets the exception value. * parse.y (java_complete_expand_methods): If flags_syntax_only, don't call finish_class. * parse.y (java_check_regular_methods): If METHOD_PRIVATE, clear found before continuing. * verify.c (verify_jvm_instructions): On an array load, allow and handle top of stack to be TYPE_NULL. From-SVN: r24696 --- gcc/java/verify.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gcc') diff --git a/gcc/java/verify.c b/gcc/java/verify.c index 4e89f45..7f07319 100644 --- a/gcc/java/verify.c +++ b/gcc/java/verify.c @@ -882,10 +882,12 @@ verify_jvm_instructions (jcf, byte_ops, length) case OPCODE_saload: type = promote_type (short_type_node); goto aload; aload: pop_type (int_type_node); - type = pop_type (ptr_type_node); - if (! is_array_type_p (type)) + tmp = pop_type (ptr_type_node); + if (is_array_type_p (tmp)) + type = TYPE_ARRAY_ELEMENT (TREE_TYPE (tmp)); + else if (tmp != TYPE_NULL) VERIFICATION_ERROR ("array load from non-array type"); - push_type (TYPE_ARRAY_ELEMENT (TREE_TYPE (type))); + push_type (type); break; case OPCODE_anewarray: -- cgit v1.1