diff options
Diffstat (limited to 'libjava/java')
| -rw-r--r-- | libjava/java/lang/Class.h | 4 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 0f60274..0300a59 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -220,8 +220,8 @@ private: friend jint JvNumStaticFields (jclass); friend jobject _Jv_AllocObject (jclass, jint); - friend jobjectArray _Jv_NewObjectArray (jsize, jclass, jobject); - friend jobject _Jv_NewPrimArray (jclass, jint); + friend void *_Jv_AllocObj (jint, jclass); + friend void *_Jv_AllocArray (jint, jclass); friend jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID, jboolean); diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 54ffc42..b03b8c2 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -586,16 +586,15 @@ _Jv_FindArrayClass (jclass element, java::lang::ClassLoader *loader, array_class = _Jv_NewClass (array_name, &ObjectClass, element->loader); // Note that `vtable_method_count' doesn't include the initial - // NULL slot. + // gc_descr slot. JvAssert (ObjectClass.vtable_method_count == NUM_OBJECT_METHODS); - int dm_count = ObjectClass.vtable_method_count + 1; + int dm_count = ObjectClass.vtable_method_count; // Create a new vtable by copying Object's vtable (except the // class pointer, of course). Note that we allocate this as // unscanned memory -- the vtables are handled specially by the // GC. - int size = (sizeof (_Jv_VTable) + - ((dm_count - 1) * sizeof (void *))); + int size = (sizeof (_Jv_VTable) + ((dm_count - 1) * sizeof (void *))); _Jv_VTable *vtable; if (array_vtable) vtable = array_vtable; @@ -604,6 +603,7 @@ _Jv_FindArrayClass (jclass element, java::lang::ClassLoader *loader, vtable->clas = array_class; memcpy (vtable->method, ObjectClass.vtable->method, dm_count * sizeof (void *)); + vtable->gc_descr = ObjectClass.vtable->gc_descr; array_class->vtable = vtable; array_class->vtable_method_count = ObjectClass.vtable_method_count; @@ -615,6 +615,8 @@ _Jv_FindArrayClass (jclass element, java::lang::ClassLoader *loader, array_class->interfaces = interfaces; array_class->interface_count = sizeof interfaces / sizeof interfaces[0]; + // FIXME: Shouldn't this be synchronized? _Jv_PrepareConstantTimeTables + // needs to be called with the mutex for array_class held. // Generate the interface dispatch table. _Jv_PrepareConstantTimeTables (array_class); |