From 1bbee75bcc0d3948fb1e55da6a3547cddeb000a0 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Wed, 5 Jul 2000 01:13:03 +0000 Subject: [PATCH] gjavah.c (HANDLE_METHOD): Call print_method_info with a NULL stream argument on the first pass for CNI as... * gjavah.c (HANDLE_METHOD): Call print_method_info with a NULL stream argument on the first pass for CNI as well as JNI. (print_method_info): Set up method name on the first pass only. From-SVN: r34869 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/gjavah.c | 24 ++++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index cd7b947e58e..e7e2e0bf377 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2000-07-02 Bryce McKinlay + + * gjavah.c (HANDLE_METHOD): Call print_method_info with a NULL stream + argument on the first pass for CNI as well as JNI. + (print_method_info): Set up method name on the first pass only. + 2000-06-29 Alexandre Petit-Bianco * jcf-write.c (push_long_const): Appropriately cast short negative diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c index 3c04ebf4492..b8a37f72b26 100644 --- a/gcc/java/gjavah.c +++ b/gcc/java/gjavah.c @@ -189,9 +189,12 @@ static int method_printed = 0; if (out) \ print_method_info (out, jcf, NAME, SIGNATURE, ACCESS_FLAGS); \ } \ - else if (flag_jni) \ - print_method_info (NULL, jcf, NAME, SIGNATURE, ACCESS_FLAGS); \ - else if (! stubs) add_class_decl (out, jcf, SIGNATURE); + else \ + { \ + print_method_info (NULL, jcf, NAME, SIGNATURE, ACCESS_FLAGS); \ + if (! stubs && ! flag_jni) \ + add_class_decl (out, jcf, SIGNATURE); \ + } #define HANDLE_CODE_ATTRIBUTE(MAX_STACK, MAX_LOCALS, CODE_LENGTH) \ if (out && method_declared) decompile_method (out, jcf, CODE_LENGTH); @@ -665,6 +668,7 @@ DEFUN(print_field_info, (stream, jcf, name_index, sig_index, flags), free (override); } + static void DEFUN(print_method_info, (stream, jcf, name_index, sig_index, flags), FILE *stream AND JCF* jcf @@ -700,7 +704,10 @@ DEFUN(print_method_info, (stream, jcf, name_index, sig_index, flags), else return; } - else + + /* During the first method pass, build a list of method names. This will + be used to determine if field names conflict with method names. */ + if (! stream) { struct method_name *nn; @@ -714,14 +721,11 @@ DEFUN(print_method_info, (stream, jcf, name_index, sig_index, flags), memcpy (nn->signature, JPOOL_UTF_DATA (jcf, sig_index), nn->sig_length); method_name_list = nn; + + /* The rest of this function doesn't matter. */ + return; } - /* If we're not printing, then the rest of this function doesn't - matter. This happens during the first method pass in JNI mode. - Eww. */ - if (! stream) - return; - /* We don't worry about overrides in JNI mode. */ if (! flag_jni) {