diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2005-05-19 22:24:26 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2005-05-19 23:24:26 +0100 |
| commit | 146e2904bcde57c65ede1a8aed9ee287a239e455 (patch) | |
| tree | 64f08909c66f04266d262394dfb5d7e7b59c1059 | |
| parent | cabf1447768975541f44ad4ad3cc1ab3edfb0901 (diff) | |
| download | gcc-146e2904bcde57c65ede1a8aed9ee287a239e455.zip gcc-146e2904bcde57c65ede1a8aed9ee287a239e455.tar.gz gcc-146e2904bcde57c65ede1a8aed9ee287a239e455.tar.bz2 | |
natClassLoader.cc (_Jv_NewClass): Use _Jv_RegisterInitiatingLoader to register array classes, not _Jv_RegisterClass.
* java/lang/natClassLoader.cc (_Jv_NewClass): Use
_Jv_RegisterInitiatingLoader to register array classes, not
_Jv_RegisterClass.
(_Jv_RegisterInitiatingLoader): Give up if called very early during
bootstrapping. Add a FIXME to handle this case better.
From-SVN: r99993
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d99537c..738b017 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,13 @@ 2005-05-19 Bryce McKinlay <mckinlay@redhat.com> + * java/lang/natClassLoader.cc (_Jv_NewClass): Use + _Jv_RegisterInitiatingLoader to register array classes, not + _Jv_RegisterClass. + (_Jv_RegisterInitiatingLoader): Give up if called very early during + bootstrapping. Add a FIXME to handle this case better. + +2005-05-19 Bryce McKinlay <mckinlay@redhat.com> + * Makefile.am (libgcj0_convenience_la): Removed. Don't build a libgcj convenience library. (libgcj_la_SOURCES): New. Move sources here. diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 2fa3f49..fb3515b 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -127,6 +127,14 @@ _Jv_RegisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader) { if (! loader) loader = java::lang::VMClassLoader::bootLoader; + if (! loader) + { + // Very early in the bootstrap process, the Bootstrap classloader may + // not exist yet. + // FIXME: We could maintain a list of these and come back and register + // them later. + return; + } loader->loadedClasses->put(klass->name->toString(), klass); } @@ -346,7 +354,7 @@ _Jv_NewClass (_Jv_Utf8Const *name, jclass superclass, ret->superclass = superclass; ret->loader = loader; - _Jv_RegisterClass (ret); + _Jv_RegisterInitiatingLoader (ret, loader); return ret; } |