diff options
| author | Tom Tromey <tromey@redhat.com> | 2001-12-16 22:28:35 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2001-12-16 22:28:35 +0000 |
| commit | 68940f3f3c1c6011be4434d30e1e1f8548be7b7d (patch) | |
| tree | 40b6d3dc40874ea7045518f5a5d294ffddf0cf1f /libjava/java/lang/natClassLoader.cc | |
| parent | 495513eea640d4135f4b62f341bc844a09779df7 (diff) | |
| download | gcc-68940f3f3c1c6011be4434d30e1e1f8548be7b7d.zip gcc-68940f3f3c1c6011be4434d30e1e1f8548be7b7d.tar.gz gcc-68940f3f3c1c6011be4434d30e1e1f8548be7b7d.tar.bz2 | |
For PR java/5088:
* java/lang/natClassLoader.cc (_Jv_InitNewClassFields): New
function.
(_Jv_NewClass): Use it.
(defineClass0): Use it.
* prims.cc (_Jv_InitPrimClass): Adjust vtable here.
(_Jv_InitPrimClass): Use _Jv_InitNewClassFields.
(_Jv_NewArray): Don't abort; just throw exception.
Include InternalError.h.
* java/lang/Class.h (Class::Class): Declare, don't define.
(Class): Declare _Jv_InitNewClassFields as a friend.
(union _Jv_Self): Removed.
From-SVN: r48081
Diffstat (limited to 'libjava/java/lang/natClassLoader.cc')
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index ffe5b18..a6f7b60 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -61,6 +61,7 @@ java::lang::ClassLoader::defineClass0 (jstring name, #ifdef INTERPRETER jclass klass; klass = (jclass) JvAllocObject (&ClassClass, sizeof (_Jv_InterpClass)); + _Jv_InitNewClassFields (klass); // synchronize on the class, so that it is not // attempted initialized until we're done loading. @@ -549,16 +550,13 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader) return klass; } -jclass -_Jv_NewClass (_Jv_Utf8Const *name, jclass superclass, - java::lang::ClassLoader *loader) +void +_Jv_InitNewClassFields (jclass ret) { - jclass ret = (jclass) JvAllocObject (&ClassClass); - ret->next = NULL; - ret->name = name; + ret->name = NULL; ret->accflags = 0; - ret->superclass = superclass; + ret->superclass = NULL; ret->constants.size = 0; ret->constants.tags = NULL; ret->constants.data = NULL; @@ -571,7 +569,7 @@ _Jv_NewClass (_Jv_Utf8Const *name, jclass superclass, ret->static_field_count = 0; ret->vtable = NULL; ret->interfaces = NULL; - ret->loader = loader; + ret->loader = NULL; ret->interface_count = 0; ret->state = JV_STATE_NOTHING; ret->thread = NULL; @@ -579,6 +577,17 @@ _Jv_NewClass (_Jv_Utf8Const *name, jclass superclass, ret->ancestors = NULL; ret->idt = NULL; ret->arrayclass = NULL; +} + +jclass +_Jv_NewClass (_Jv_Utf8Const *name, jclass superclass, + java::lang::ClassLoader *loader) +{ + jclass ret = (jclass) JvAllocObject (&ClassClass); + _Jv_InitNewClassFields (ret); + ret->name = name; + ret->superclass = superclass; + ret->loader = loader; _Jv_RegisterClass (ret); |