diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-17 19:17:08 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-02-17 19:17:08 +0000 |
| commit | 3846508d050b277700b61b136c2523b2bfe23c03 (patch) | |
| tree | 247aeb11c899ea6580277539cb710a77d1b1f610 /libjava/java/lang | |
| parent | a2822f7ea08361b8d35e53c9a49fa032d1836fee (diff) | |
| download | ppe42-gcc-3846508d050b277700b61b136c2523b2bfe23c03.tar.gz ppe42-gcc-3846508d050b277700b61b136c2523b2bfe23c03.zip | |
* java/lang/Class.h (_Jv_GetMethodString): Updated declaration.
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Updated.
* java/lang/natClass.cc (_Jv_LookupInterfaceMethod): Updated.
* link.cc (_Jv_GetMethodString): Added 'derived' argument.
Changed type of second argument. Rewrote.
(make_vtable): Use it.
(append_partial_itable): Updated.
(layout_vtable_methods): Updated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95181 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang')
| -rw-r--r-- | libjava/java/lang/Class.h | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 8 | ||||
| -rw-r--r-- | libjava/java/lang/reflect/natMethod.cc | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 34ff5df634d..d7b21e76b05 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -228,7 +228,7 @@ void _Jv_InitNewClassFields (jclass klass); // Friend functions and classes in prims.cc void _Jv_InitPrimClass (jclass, char *, char, int); -jstring _Jv_GetMethodString (jclass, _Jv_Utf8Const *); +jstring _Jv_GetMethodString (jclass, _Jv_Method *, jclass = NULL); jboolean _Jv_CheckAccess (jclass self_klass, jclass other_klass, jint flags); @@ -454,7 +454,7 @@ private: // in prims.cc friend void ::_Jv_InitPrimClass (jclass, char *, char, int); - friend jstring (::_Jv_GetMethodString) (jclass, _Jv_Utf8Const *); + friend jstring (::_Jv_GetMethodString) (jclass, _Jv_Method *, jclass); friend jboolean (::_Jv_CheckAccess) (jclass self_klass, jclass other_klass, jint flags); diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 0e9c26c7b4f..f29f6674764 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -1,6 +1,6 @@ // natClass.cc - Implementation of java.lang.Class native methods. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation This file is part of libgcj. @@ -973,13 +973,13 @@ _Jv_LookupInterfaceMethod (jclass klass, _Jv_Utf8Const *name, if (Modifier::isStatic(meth->accflags)) throw new java::lang::IncompatibleClassChangeError - (_Jv_GetMethodString (klass, meth->name)); + (_Jv_GetMethodString (klass, meth)); if (Modifier::isAbstract(meth->accflags)) throw new java::lang::AbstractMethodError - (_Jv_GetMethodString (klass, meth->name)); + (_Jv_GetMethodString (klass, meth)); if (! Modifier::isPublic(meth->accflags)) throw new java::lang::IllegalAccessError - (_Jv_GetMethodString (klass, meth->name)); + (_Jv_GetMethodString (klass, meth)); _Jv_AddMethodToCache (klass, meth); diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc index b4b3a7a9b06..27c26e19ac7 100644 --- a/libjava/java/lang/reflect/natMethod.cc +++ b/libjava/java/lang/reflect/natMethod.cc @@ -1,6 +1,6 @@ // natMethod.cc - Native code for Method class. -/* Copyright (C) 1998, 1999, 2000, 2001 , 2002, 2003, 2004 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001 , 2002, 2003, 2004, 2005 Free Software Foundation This file is part of libgcj. @@ -496,7 +496,7 @@ _Jv_CallAnyMethodA (jobject obj, || concrete_meth->ncode == NULL || Modifier::isAbstract(concrete_meth->accflags)) throw new java::lang::IncompatibleClassChangeError - (_Jv_GetMethodString (vtable->clas, meth->name)); + (_Jv_GetMethodString (vtable->clas, meth)); ncode = concrete_meth->ncode; } else |
