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
|
@ -116,7 +116,7 @@ void
|
|||
java::lang::Thread::join (jlong millis, jint nanos)
|
||||
{
|
||||
if (millis < 0 || nanos < 0 || nanos > 999999)
|
||||
_Jv_Throw (new IllegalArgumentException);
|
||||
throw new IllegalArgumentException;
|
||||
|
||||
Thread *current = currentThread ();
|
||||
|
||||
|
@ -135,7 +135,7 @@ java::lang::Thread::join (jlong millis, jint nanos)
|
|||
_Jv_MutexUnlock (&nt->join_mutex);
|
||||
|
||||
if (current->isInterrupted (true))
|
||||
_Jv_Throw (new InterruptedException);
|
||||
throw new InterruptedException;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -150,7 +150,7 @@ java::lang::Thread::setPriority (jint newPriority)
|
|||
{
|
||||
checkAccess ();
|
||||
if (newPriority < MIN_PRIORITY || newPriority > MAX_PRIORITY)
|
||||
_Jv_Throw (new IllegalArgumentException);
|
||||
throw new IllegalArgumentException;
|
||||
|
||||
jint gmax = group->getMaxPriority();
|
||||
if (newPriority > gmax)
|
||||
|
@ -165,7 +165,7 @@ void
|
|||
java::lang::Thread::sleep (jlong millis, jint nanos)
|
||||
{
|
||||
if (millis < 0 || nanos < 0 || nanos > 999999)
|
||||
_Jv_Throw (new IllegalArgumentException);
|
||||
throw new IllegalArgumentException;
|
||||
|
||||
if (millis == 0 && nanos == 0)
|
||||
++nanos;
|
||||
|
@ -180,7 +180,7 @@ java::lang::Thread::sleep (jlong millis, jint nanos)
|
|||
_Jv_MutexUnlock (&nt->join_mutex);
|
||||
|
||||
if (current->isInterrupted (true))
|
||||
_Jv_Throw (new InterruptedException);
|
||||
throw new InterruptedException;
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -299,7 +299,7 @@ java::lang::Thread::start (void)
|
|||
|
||||
// Its illegal to re-start() a thread, even if its dead.
|
||||
if (!startable_flag)
|
||||
_Jv_Throw (new IllegalThreadStateException);
|
||||
throw new IllegalThreadStateException;
|
||||
|
||||
alive_flag = true;
|
||||
startable_flag = false;
|
||||
|
@ -310,16 +310,16 @@ java::lang::Thread::start (void)
|
|||
void
|
||||
java::lang::Thread::stop (java::lang::Throwable *)
|
||||
{
|
||||
_Jv_Throw (new UnsupportedOperationException
|
||||
(JvNewStringLatin1 ("java::lang::Thread::stop unimplemented")));
|
||||
throw new UnsupportedOperationException
|
||||
(JvNewStringLatin1 ("java::lang::Thread::stop unimplemented"));
|
||||
}
|
||||
|
||||
void
|
||||
java::lang::Thread::suspend (void)
|
||||
{
|
||||
checkAccess ();
|
||||
_Jv_Throw (new UnsupportedOperationException
|
||||
(JvNewStringLatin1 ("java::lang::Thread::suspend unimplemented")));
|
||||
throw new UnsupportedOperationException
|
||||
(JvNewStringLatin1 ("java::lang::Thread::suspend unimplemented"));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue