* sun/reflect/annotation/AnnotationInvocationHandler.java:
Generify in a few places.
(equals): Rewrite to use invoke on local proxy.
(deepToString): Remove most of it.
(toString): Make nonstatic.
(arrayClone): Delete.
(coerce): New method.
(invoke): Rewrite to handle gcj's structures correctly.
* java/lang/natClass.cc (getDeclaredAnnotations): Fix test for
null loader.
* sources.am: Regenerate.
* Makefile.am: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122485
138bc75d-0d04-0410-961f-
82ee72b054a4
if (bytes == NULL)
return 0;
- ClassLoader *trueLoader = loader;
- if (trueLoader == NULL)
- trueLoader = (ClassLoader *)VMClassLoader::bootLoader;
+ if (loader == NULL)
+ loader = (ClassLoader *)VMClassLoader::bootLoader;
result = (loader->getDeclaredAnnotations
(this, member_type, member_index, kind_req));