From d46fbca90c61b6b380a6c4c0fb365a8bdbe1f63c Mon Sep 17 00:00:00 2001 From: apbianco Date: Mon, 1 May 2000 21:46:29 +0000 Subject: [PATCH] 2000-04-25 Alexandre Petit-Bianco * parse.y (register_incomplete_type): Handle JDEP_ANONYMOUS. (This is a fix for the Java PR #195: http://sourceware.cygnus.com/ml/java-prs/2000-q2/msg00009.html) git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@33588 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/java/ChangeLog | 16 ++++++++++++++++ gcc/java/parse.y | 22 +++++++++++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 2f9190e1096..29ac87fbcce 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -20,6 +20,10 @@ Wed Apr 26 14:29:33 2000 Alexandre Petit-Bianco * zextract.c (find_zip_file_start): New function. (read_zip_archive): Use it. +2000-04-25 Alexandre Petit-Bianco + + * parse.y (register_incomplete_type): Handle JDEP_ANONYMOUS. + Mon Apr 24 14:59:36 2000 Alexandre Petit-Bianco * parse.y (end_class_declaration): Reset the interface number @@ -126,6 +130,18 @@ Thu Apr 20 18:20:58 2000 Jason Schroeder 2000-04-05 Tom Tromey + Fix for PR gcj/2: + * expr.c (expand_invoke): Generate check to see if object pointer + is null in nonvirtual invocation case. + * java-tree.h (soft_nullpointer_node): Declare. + * decl.c (soft_nullpointer_node): New global. + (init_decl_processing): Initialize soft_nullpointer_node. + * parse.y (invocation_mode): Return INVOKE_NONVIRTUAL for `final' + or `private' methods. + (patch_invoke): Handle INVOKE_NONVIRTUAL case. + +2000-04-05 Tom Tromey + Fix for PR gcj/140: * parse.y (check_final_assignment): Recognize assignments to the `length' field of an array when generating class files. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 576e624c9ff..0b14bcae7aa 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -4513,7 +4513,7 @@ finish_method_declaration (method_body) && TREE_TYPE (current_function_decl) && TREE_TYPE (TREE_TYPE (current_function_decl)) == void_type_node) method_body = build1 (RETURN_EXPR, void_type_node, NULL); - + BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (current_function_decl)) = method_body; maybe_absorb_scoping_blocks (); /* Exit function's body */ @@ -4936,7 +4936,9 @@ register_incomplete_type (kind, wfl, decl, ptr) JDEP_WFL (new) = wfl; JDEP_CHAIN (new) = NULL; JDEP_MISC (new) = NULL_TREE; - if ((kind == JDEP_SUPER || kind == JDEP_INTERFACE) + /* For some dependencies, set the enclosing class of the current + class to be the enclosing context */ + if ((kind == JDEP_SUPER || kind == JDEP_INTERFACE || kind == JDEP_ANONYMOUS) && GET_ENCLOSING_CPC ()) JDEP_ENCLOSING (new) = TREE_VALUE (GET_ENCLOSING_CPC ()); else @@ -7295,10 +7297,19 @@ java_complete_expand_methods (class_decl) /* First, do the ordinary methods. */ for (decl = first_decl; decl; decl = TREE_CHAIN (decl)) { - /* Skip abstract or native methods */ - if (METHOD_ABSTRACT (decl) || METHOD_NATIVE (decl) + /* Skip abstract or native methods -- but do handle native + methods when generating JNI stubs. */ + if (METHOD_ABSTRACT (decl) + || (! flag_jni && METHOD_NATIVE (decl)) || DECL_CONSTRUCTOR_P (decl) || DECL_CLINIT_P (decl)) continue; + + if (METHOD_NATIVE (decl)) + { + tree body = build_jni_stub (decl); + BLOCK_EXPR_BODY (DECL_FUNCTION_BODY (decl)) = body; + } + java_complete_expand_method (decl); } @@ -7428,10 +7439,11 @@ java_complete_expand_method (mdecl) { block_body = java_complete_tree (block_body); - if (!flag_emit_xref) + if (! flag_emit_xref && ! METHOD_NATIVE (mdecl)) check_for_initialization (block_body); ctxp->explicit_constructor_p = 0; } + BLOCK_EXPR_BODY (fbody) = block_body; /* If we saw a return but couldn't evaluate it properly, we'll -- 2.11.4.GIT