exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable. (_Jv_type_matcher): Remove now unneeded cast. (_Jv_Throw): Make argument type jthrowable. Munge name for SJLJ_EXCEPTIONS here ... * gcj/cni.h: ... not here. (JvThrow): Remove. * gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations. * defineclass.cc, interpret.cc, jni.cc, posix-threads.cc, prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc, gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc, gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc, gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc, java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc, java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc, java/lang/natClass.cc, java/lang/natClassLoader.cc, java/lang/natDouble.cc, java/lang/natObject.cc, java/lang/natPosixProcess.cc, java/lang/natRuntime.cc, java/lang/natString.cc, java/lang/natSystem.cc, java/lang/natThread.cc, java/lang/reflect/natArray.cc, java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc, java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc, java/util/zip/natInflater.cc: Use throw, not JvThrow or _Jv_Throw. From-SVN: r40838
This commit is contained in:
parent
56b8908481
commit
b3208f56cb
36 changed files with 294 additions and 284 deletions
|
@ -90,7 +90,7 @@ java::lang::System::arraycopy (jobject src, jint src_offset,
|
|||
jint count)
|
||||
{
|
||||
if (! src || ! dst)
|
||||
_Jv_Throw (new NullPointerException);
|
||||
throw new NullPointerException;
|
||||
|
||||
jclass src_c = src->getClass();
|
||||
jclass dst_c = dst->getClass();
|
||||
|
@ -100,14 +100,14 @@ java::lang::System::arraycopy (jobject src, jint src_offset,
|
|||
if (! src_c->isArray() || ! dst_c->isArray()
|
||||
|| src_comp->isPrimitive() != dst_comp->isPrimitive()
|
||||
|| (src_comp->isPrimitive() && src_comp != dst_comp))
|
||||
_Jv_Throw (new ArrayStoreException);
|
||||
throw new ArrayStoreException;
|
||||
|
||||
__JArray *src_a = (__JArray *) src;
|
||||
__JArray *dst_a = (__JArray *) dst;
|
||||
if (src_offset < 0 || dst_offset < 0 || count < 0
|
||||
|| src_offset + count > src_a->length
|
||||
|| dst_offset + count > dst_a->length)
|
||||
_Jv_Throw (new ArrayIndexOutOfBoundsException);
|
||||
throw new ArrayIndexOutOfBoundsException;
|
||||
|
||||
// Do-nothing cases.
|
||||
if ((src == dst && src_offset == dst_offset)
|
||||
|
@ -149,7 +149,7 @@ java::lang::System::arraycopy (jobject src, jint src_offset,
|
|||
{
|
||||
if (*src_elts
|
||||
&& ! dst_comp->isAssignableFrom((*src_elts)->getClass()))
|
||||
_Jv_Throw (new ArrayStoreException);
|
||||
throw new ArrayStoreException;
|
||||
*dst_elts++ = *src_elts++;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue