mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-22 19:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR java/15133 (gcjh generates wrong method signatures)

Browse Source 
Fixes PR java/15133
	* gjavah.c (struct method_name): Add member is_native.
	(overloaded_jni_method_exists_p): Match candidate method only if
	it is native.
	(print_method_info): Initialise is_native flag from the method's
	access flags.

From-SVN: r81357
This commit is contained in:
Ranjit Mathew 2004-04-30 18:14:07 +00:00 committed by Ranjit Mathew
parent 693446fc33
commit 3fb577a589
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/java/ChangeLog
View File

@ -1,3 +1,12 @@
2004-04-30 Ranjit Mathew <rmathew@hotmail.com>
Fixes PR java/15133
* gjavah.c (struct method_name): Add member is_native.
(overloaded_jni_method_exists_p): Match candidate method only if
it is native.
(print_method_info): Initialise is_native flag from the method's
access flags.
2004-04-30 Roger Sayle <roger@eyesopen.com>
* builtins.c (java_builtins): Add acos, asin, ceil and floor.

7
gcc/java/gjavah.c
View File

@ -119,6 +119,7 @@ struct method_name
int length;
unsigned char *signature;
int sig_length;
int is_native;
struct method_name *next;
};
@ -634,7 +635,7 @@ name_is_method_p (const unsigned char *name, int length)
return 0;
}
/* If there is already a method named NAME, whose signature is not
/* If there is already a native method named NAME, whose signature is not
SIGNATURE, then return true. Otherwise return false. */
static int
overloaded_jni_method_exists_p (const unsigned char *name, int length,
@ -644,7 +645,8 @@ overloaded_jni_method_exists_p (const unsigned char *name, int length,
for (p = method_name_list; p != NULL; p = p->next)
{
if (p->length == length
if (p->is_native
&& p->length == length
&& ! memcmp (p->name, name, length)
&& (p->sig_length != sig_length
|| memcmp (p->signature, signature, sig_length)))
@ -851,6 +853,7 @@ print_method_info (FILE *stream, JCF* jcf, int name_index, int sig_index,
nn->next = method_name_list;
nn->sig_length = JPOOL_UTF_LENGTH (jcf, sig_index);
nn->signature = xmalloc (nn->sig_length);
nn->is_native = METHOD_IS_NATIVE (flags);
memcpy (nn->signature, JPOOL_UTF_DATA (jcf, sig_index),
nn->sig_length);
method_name_list = nn;