diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-03-01 16:01:34 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-03-01 16:01:34 +0000 |
| commit | 2bb6e0cefeba590b744da9fe75a299f2deacff87 (patch) | |
| tree | 42ca6f30418eaa33910696f8b21d4cb225d9a8bc /libjava/java/lang/natClass.cc | |
| parent | 1809ff6b9a9fd3ff2097bc802f328d8530ab2420 (diff) | |
| download | gcc-2bb6e0cefeba590b744da9fe75a299f2deacff87.zip gcc-2bb6e0cefeba590b744da9fe75a299f2deacff87.tar.gz gcc-2bb6e0cefeba590b744da9fe75a299f2deacff87.tar.bz2 | |
re PR libgcj/24321 (instanceof erroneously causes class initialization)
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
Diffstat (limited to 'libjava/java/lang/natClass.cc')
| -rw-r--r-- | libjava/java/lang/natClass.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 8972cb2..38a9aff 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -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); } |