diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-13 22:08:51 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-13 22:08:51 +0000 |
| commit | a0f32ae58fa3c09752632e769c16ccaa8f6196b7 (patch) | |
| tree | dcbaefce19d8a24b0a5a3728e7e50f5d87e8c3ff | |
| parent | 84c0ecd1e39fd4f30f60ff2423118f5e62be6c16 (diff) | |
| download | ppe42-gcc-a0f32ae58fa3c09752632e769c16ccaa8f6196b7.tar.gz ppe42-gcc-a0f32ae58fa3c09752632e769c16ccaa8f6196b7.zip | |
* java/lang/natClassLoader.cc (_Jv_InitNewClassFields): Removed.
(defineClass): Updated.
(_Jv_NewClass): Likewise.
* prims.cc (_Jv_InitPrimClass): Don't call
_Jv_InitNewClassFields.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72444 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 37 | ||||
| -rw-r--r-- | libjava/prims.cc | 2 |
3 files changed, 8 insertions, 39 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 6ec549577bb..67280d95943 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2003-10-13 Tom Tromey <tromey@redhat.com> + + * java/lang/natClassLoader.cc (_Jv_InitNewClassFields): Removed. + (defineClass): Updated. + (_Jv_NewClass): Likewise. + * prims.cc (_Jv_InitPrimClass): Don't call + _Jv_InitNewClassFields. + 2003-10-13 Taras Judge <taras.judge@shaw.ca> PR libgcj/12592 diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 10b4bc64e23..5e7c943c620 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -55,7 +55,6 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader, jclass klass; klass = (jclass) JvAllocObject (&java::lang::Class::class$, sizeof (_Jv_InterpClass)); - _Jv_InitNewClassFields (klass); // Synchronize on the class, so that it is not attempted initialized // until we're done loading. @@ -521,47 +520,11 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader) return klass; } -void -_Jv_InitNewClassFields (jclass ret) -{ - ret->next = NULL; - ret->name = NULL; - ret->accflags = 0; - ret->superclass = NULL; - ret->constants.size = 0; - ret->constants.tags = NULL; - ret->constants.data = NULL; - ret->methods = NULL; - ret->method_count = 0; - ret->vtable_method_count = 0; - ret->fields = NULL; - ret->size_in_bytes = 0; - ret->field_count = 0; - ret->static_field_count = 0; - ret->vtable = NULL; - ret->otable_syms = NULL; - ret->atable = NULL; - ret->atable_syms = NULL; - ret->interfaces = NULL; - ret->loader = NULL; - ret->interface_count = 0; - ret->state = JV_STATE_NOTHING; - ret->thread = NULL; - ret->depth = 0; - ret->ancestors = NULL; - ret->idt = NULL; - ret->arrayclass = NULL; - ret->protectionDomain = NULL; - ret->signers = NULL; - ret->chain = NULL; -} - jclass _Jv_NewClass (_Jv_Utf8Const *name, jclass superclass, java::lang::ClassLoader *loader) { jclass ret = (jclass) JvAllocObject (&java::lang::Class::class$); - _Jv_InitNewClassFields (ret); ret->name = name; ret->superclass = superclass; ret->loader = loader; diff --git a/libjava/prims.cc b/libjava/prims.cc index 3fe65f96722..71cd8c3ece0 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -633,8 +633,6 @@ _Jv_InitPrimClass (jclass cl, char *cname, char sig, int len, { using namespace java::lang::reflect; - _Jv_InitNewClassFields (cl); - // We must set the vtable for the class; the Java constructor // doesn't do this. (*(_Jv_VTable **) cl) = java::lang::Class::class$.vtable; |
