FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libgcj/24321 (instanceof erroneously causes class initialization)

Browse source 
PR java/24321:
	* testsuite/libjava.lang/pr24321.java: New file.
	* testsuite/libjava.lang/pr24321.out: New file.
	* java/lang/natClass.cc (isInstance): Don't initialize class.
	(isAssignableFrom): Likewise.

From-SVN: r111603
This commit is contained in:
Tom Tromey 2006-03-01 16:01:34 +00:00 • committed by Tom Tromey
parent 1809ff6b9a
commit 2bb6e0cefe
4 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/java/lang/natClass.cc
View file

@ -621,8 +621,9 @@ jboolean
java::lang::Class::isAssignableFrom (jclass klass)
{
// Arguments may not have been initialized, given ".class" syntax.
_Jv_InitClass (this);
_Jv_InitClass (klass);
// This ensures we can at least look at their superclasses.
_Jv_Linker::wait_for_state (this, JV_STATE_LOADING);
_Jv_Linker::wait_for_state (klass, JV_STATE_LOADING);
return _Jv_IsAssignableFrom (klass, this);
}
@ -631,7 +632,6 @@ java::lang::Class::isInstance (jobject obj)
{
if (! obj)
return false;
_Jv_InitClass (this);
return _Jv_IsAssignableFrom (JV_CLASS (obj), this);
}