diff options
| author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-20 21:42:33 +0000 |
|---|---|---|
| committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-20 21:42:33 +0000 |
| commit | 5c725c80118679ebfb245dc1c6dbd2d578a26085 (patch) | |
| tree | 138cc43e9e93669b674b3d22b974badc9b5434fe /libjava/java/lang | |
| parent | ac31415f468cd518a195c09fdbf2d4395c945a40 (diff) | |
| download | ppe42-gcc-5c725c80118679ebfb245dc1c6dbd2d578a26085.tar.gz ppe42-gcc-5c725c80118679ebfb245dc1c6dbd2d578a26085.zip | |
* java/lang/natClass.cc (_Jv_LayoutVTableMethods): Cast pointers
to uaddr, not int.
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass):
Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@89346 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang')
| -rw-r--r-- | libjava/java/lang/natClass.cc | 6 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index f68f2a9a74d..920245cd586 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -1816,11 +1816,11 @@ _Jv_LayoutVTableMethods (jclass klass) // If superclass looks like a constant pool entry, // resolve it now. - if ((uaddr)superclass < (uaddr)klass->constants.size) + if ((uaddr) superclass < (uaddr) klass->constants.size) { if (klass->state < JV_STATE_LINKED) { - _Jv_Utf8Const *name = klass->constants.data[(int)superclass].utf8; + _Jv_Utf8Const *name = klass->constants.data[(uaddr) superclass].utf8; superclass = _Jv_FindClass (name, klass->loader); if (! superclass) { @@ -1828,7 +1828,7 @@ _Jv_LayoutVTableMethods (jclass klass) } } else - superclass = klass->constants.data[(int)superclass].clazz; + superclass = klass->constants.data[(uaddr) superclass].clazz; } if (superclass != NULL && superclass->vtable_method_count == -1) diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index c1ca9ba1270..e660eae39e6 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -131,12 +131,12 @@ _Jv_PrepareCompiledClass (jclass klass) // If superclass looks like a constant pool entry, // resolve it now. if ((uaddr) klass->superclass < pool->size) - klass->superclass = pool->data[(int) klass->superclass].clazz; + klass->superclass = pool->data[(uaddr) klass->superclass].clazz; // Likewise for interfaces. for (int i = 0; i < klass->interface_count; i++) if ((uaddr) klass->interfaces[i] < pool->size) - klass->interfaces[i] = pool->data[(int) klass->interfaces[i]].clazz; + klass->interfaces[i] = pool->data[(uaddr) klass->interfaces[i]].clazz; // Resolve the remaining constant pool entries. for (int index = 1; index < pool->size; ++index) |
