diff options
Diffstat (limited to 'libjava/java/lang')
| -rw-r--r-- | libjava/java/lang/Class.h | 8 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 2 | ||||
| -rw-r--r-- | libjava/java/lang/ref/natReference.cc | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index c94b6d39217..62e280ced82 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -368,7 +368,7 @@ public: inline jclass getComponentType (void) { - return isArray () ? (* (jclass *) &methods) : 0; + return isArray () ? element_type : 0; } jboolean isAssignableFrom (jclass cls); @@ -554,7 +554,11 @@ private: _Jv_Constants constants; // Methods. If this is an array class, then this field holds a // pointer to the element type. - _Jv_Method *methods; + union + { + _Jv_Method *methods; + jclass element_type; + }; // Number of methods. If this class is primitive, this holds the // character used to represent this type in a signature. jshort method_count; diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 5f4d957f61c..fa6f201db46 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -458,7 +458,7 @@ _Jv_NewArrayClass (jclass element, java::lang::ClassLoader *loader, = java::lang::Object::class$.vtable_method_count; // Stash the pointer to the element type. - array_class->methods = (_Jv_Method *) element; + array_class->element_type = element; // Register our interfaces. static jclass interfaces[] = diff --git a/libjava/java/lang/ref/natReference.cc b/libjava/java/lang/ref/natReference.cc index 5ad5b107405..23f435f4def 100644 --- a/libjava/java/lang/ref/natReference.cc +++ b/libjava/java/lang/ref/natReference.cc @@ -363,8 +363,8 @@ void // finalizer for ourselves as well. _Jv_RegisterFinalizer (this, finalize_reference); _Jv_RegisterFinalizer (referent, finalize_referred_to_object); - jobject *objp = reinterpret_cast<jobject *> (&referent); - _Jv_GCRegisterDisappearingLink (objp); + gnu::gcj::RawData **p = &referent; + _Jv_GCRegisterDisappearingLink ((jobject *) p); add_to_hash (this); } } |
