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

4 files changed, 46 insertions, 46 deletions

diff --git a/libjava/java/lang/reflect/natArray.cc b/libjava/java/lang/reflect/natArray.cc
index 1680456..bc48041 100644
--- a/libjava/java/lang/reflect/natArray.cc
+++ b/libjava/java/lang/reflect/natArray.cc
@@ -1,6 +1,6 @@
 // natField.cc - Implementation of java.lang.reflect.Field native methods.
 
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -64,7 +64,7 @@ java::lang::reflect::Array::getLength (jobject array)
 {
   jclass arrayType = array->getClass();
   if (! arrayType->isArray ())
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
   return ((__JArray*) array)->length;
 }
 
@@ -73,7 +73,7 @@ java::lang::reflect::Array::getElementType (jobject array, jint index)
 {
   jclass arrayType = array->getClass();
   if (! arrayType->isArray ())
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
   jint length = ((__JArray*) array)->length;
   if ((_Jv_uint) index >= (_Jv_uint) length)
     _Jv_ThrowBadArrayIndex(index);
@@ -86,7 +86,7 @@ java::lang::reflect::Array::getBoolean (jobject array, jint index)
   jclass elementType = getElementType (array, index);
   if (elementType == JvPrimClass (boolean))
     return elements ((jbooleanArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jchar
@@ -95,7 +95,7 @@ java::lang::reflect::Array::getChar (jobject array, jint index)
   jclass elementType = getElementType (array, index);
   if (elementType == JvPrimClass (char))
     return elements ((jcharArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jbyte
@@ -104,7 +104,7 @@ java::lang::reflect::Array::getByte (jobject array, jint index)
   jclass elementType = getElementType (array, index);
   if (elementType == JvPrimClass (byte))
     return elements ((jbyteArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jshort
@@ -115,7 +115,7 @@ java::lang::reflect::Array::getShort (jobject array, jint index)
     return elements ((jshortArray) array) [index];
   if (elementType == JvPrimClass (byte))
     return elements ((jbyteArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jint
@@ -130,7 +130,7 @@ java::lang::reflect::Array::getInt (jobject array, jint index)
     return elements ((jbyteArray) array) [index];
   if (elementType == JvPrimClass (char))
     return elements ((jcharArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jlong
@@ -147,7 +147,7 @@ java::lang::reflect::Array::getLong (jobject array, jint index)
     return elements ((jbyteArray) array) [index];
   if (elementType == JvPrimClass (char))
     return elements ((jcharArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jfloat
@@ -166,7 +166,7 @@ java::lang::reflect::Array::getFloat (jobject array, jint index)
     return elements ((jbyteArray) array) [index];
   if (elementType == JvPrimClass (char))
     return elements ((jcharArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jdouble
@@ -187,7 +187,7 @@ java::lang::reflect::Array::getDouble (jobject array, jint index)
     return elements ((jbyteArray) array) [index];
   if (elementType == JvPrimClass (char))
     return elements ((jcharArray) array) [index];
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 jobject
@@ -218,7 +218,7 @@ java::lang::reflect::Array::get (jobject array, jint index)
       else
 	return java::lang::Boolean::FALSE;
     }
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -236,7 +236,7 @@ java::lang::reflect::Array::setChar (jobject array, jint index, jchar value)
   else if (elementType == JvPrimClass (double))
     elements ((jdoubleArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -256,7 +256,7 @@ java::lang::reflect::Array::setByte (jobject array, jint index, jbyte value)
   else if (elementType == JvPrimClass (double))
     elements ((jdoubleArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -274,7 +274,7 @@ java::lang::reflect::Array::setShort (jobject array, jint index, jshort value)
   else if (elementType == JvPrimClass (double))
     elements ((jdoubleArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -290,7 +290,7 @@ java::lang::reflect::Array::setInt (jobject array, jint index, jint value)
   else if (elementType == JvPrimClass (double))
     elements ((jdoubleArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -304,7 +304,7 @@ java::lang::reflect::Array::setLong (jobject array, jint index, jlong value)
   else if (elementType == JvPrimClass (double))
     elements ((jdoubleArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -316,7 +316,7 @@ java::lang::reflect::Array::setFloat (jobject array, jint index, jfloat value)
   else if (elementType == JvPrimClass (double))
     elements ((jdoubleArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -326,7 +326,7 @@ java::lang::reflect::Array::setDouble (jobject array, jint index, jdouble value)
   if (elementType == JvPrimClass (double))
     elements ((jdoubleArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -337,7 +337,7 @@ java::lang::reflect::Array::setBoolean (jobject array,
   if (elementType == JvPrimClass (boolean))
     elements ((jbooleanArray) array) [index] = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -345,6 +345,6 @@ java::lang::reflect::Array::set (jobject array, jint index,
 				       jobject value, jclass elType)
 {
   if (! _Jv_IsInstanceOf (value, elType))
-    JvThrow (new java::lang::IllegalArgumentException ());
+    throw new java::lang::IllegalArgumentException;
   elements ((jobjectArray) array) [index] = value;
 }
diff --git a/libjava/java/lang/reflect/natConstructor.cc b/libjava/java/lang/reflect/natConstructor.cc
index 2209ad9..1103d77 100644
--- a/libjava/java/lang/reflect/natConstructor.cc
+++ b/libjava/java/lang/reflect/natConstructor.cc
@@ -1,6 +1,6 @@
 // natConstructor.cc - Native code for Constructor class.
 
-/* Copyright (C) 1999, 2000  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -48,7 +48,7 @@ java::lang::reflect::Constructor::newInstance (jobjectArray args)
 
   using namespace java::lang::reflect;
   if (Modifier::isAbstract (declaringClass->getModifiers()))
-    JvThrow (new InstantiationException);
+    throw new InstantiationException;
 
   jmethodID meth = _Jv_FromReflectedConstructor (this);
   // In the constructor case the return type is the type of the
diff --git a/libjava/java/lang/reflect/natField.cc b/libjava/java/lang/reflect/natField.cc
index 0aedc4e..b627485 100644
--- a/libjava/java/lang/reflect/natField.cc
+++ b/libjava/java/lang/reflect/natField.cc
@@ -79,9 +79,9 @@ getAddr (java::lang::reflect::Field* field, jclass caller, jobject obj)
   else
     {
       if (obj == NULL)
-	_Jv_Throw (new java::lang::NullPointerException ());
+	throw new java::lang::NullPointerException;
       if (! _Jv_IsInstanceOf (obj, field->getDeclaringClass()))
-	JvThrow (new java::lang::IllegalArgumentException ());
+	throw new java::lang::IllegalArgumentException;
       return (void*) ((char*) obj + fld->getOffset ());
     }
 }
@@ -91,7 +91,7 @@ getBoolean (jclass cls, void* addr)
 {
   if (cls == JvPrimClass (boolean))
     return * (jboolean *) addr;
-  _Jv_Throw (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 static jchar
@@ -99,7 +99,7 @@ getChar (jclass cls, void* addr)
 {
   if (cls == JvPrimClass (char))
     return * (jchar *) addr;
-  _Jv_Throw (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 static jbyte
@@ -107,7 +107,7 @@ getByte (jclass cls, void* addr)
 {
   if (cls == JvPrimClass (byte))
     return * (jbyte *) addr;
-  _Jv_Throw (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 static jshort
@@ -117,7 +117,7 @@ getShort (jclass cls, void* addr)
     return * (jshort *) addr;
   if (cls == JvPrimClass (byte))
     return * (jbyte *) addr;
-  _Jv_Throw (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 static jint
@@ -131,7 +131,7 @@ getInt (jclass cls, void* addr)
     return * (jchar *) addr;
   if (cls == JvPrimClass (byte))
     return * (jbyte *) addr;
-  _Jv_Throw (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 static jlong
@@ -249,7 +249,7 @@ java::lang::reflect::Field::get (jclass caller, jobject obj)
       else
 	return java::lang::Boolean::FALSE;
     }
-  JvThrow (new java::lang::IllegalArgumentException());
+  throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -258,7 +258,7 @@ setBoolean (jclass type, void *addr, jboolean value)
   if (type == JvPrimClass (boolean))
     * (jboolean *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -275,7 +275,7 @@ setChar (jclass type, void *addr, jchar value)
   else if (type == JvPrimClass (double))
     * (jdouble *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -294,7 +294,7 @@ setByte (jclass type, void *addr, jbyte value)
   else if (type == JvPrimClass (double))
     * (jdouble *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -311,7 +311,7 @@ setShort (jclass type, void *addr, jshort value)
   else if (type == JvPrimClass (double))
     * (jdouble *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -326,7 +326,7 @@ setInt (jclass type, void *addr, jint value)
   else if (type == JvPrimClass (double))
     * (jdouble *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -339,7 +339,7 @@ setLong (jclass type, void *addr, jlong value)
   else if (type == JvPrimClass (double))
     * (jdouble *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -350,7 +350,7 @@ setFloat (jclass type, void *addr, jfloat value)
   else if (type == JvPrimClass (double))
     * (jdouble *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 static void
@@ -359,7 +359,7 @@ setDouble (jclass type, void *addr, jdouble value)
   if (type == JvPrimClass (double))
     * (jdouble *) addr = value;
   else
-    JvThrow (new java::lang::IllegalArgumentException());
+    throw new java::lang::IllegalArgumentException;
 }
 
 void
@@ -421,7 +421,7 @@ void
 java::lang::reflect::Field::set (jclass caller, jobject object, jobject value, jclass type)
 {
   if (! _Jv_IsInstanceOf (value, type))
-    JvThrow (new java::lang::IllegalArgumentException ());
+    throw new java::lang::IllegalArgumentException;
   void* addr = getAddr (this, caller, object);
   * (jobject*) addr = value;
 }
diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index 4e9d3ce..61adf26 100644
--- a/libjava/java/lang/reflect/natMethod.cc
+++ b/libjava/java/lang/reflect/natMethod.cc
@@ -160,9 +160,9 @@ java::lang::reflect::Method::invoke (jobject obj, jobjectArray args)
     {
       jclass k = obj ? obj->getClass() : NULL;
       if (! obj)
-	JvThrow (new java::lang::NullPointerException);
+	throw new java::lang::NullPointerException;
       if (! declaringClass->isAssignableFrom(k))
-	JvThrow (new java::lang::IllegalArgumentException);
+	throw new java::lang::IllegalArgumentException;
       // FIXME: access checks.
 
       // Find the possibly overloaded method based on the runtime type
@@ -447,7 +447,7 @@ _Jv_CallAnyMethodA (jobject obj,
       // The JDK accepts this, so we do too.
     }
   else if (parameter_types->length != args->length)
-    JvThrow (new java::lang::IllegalArgumentException);
+    throw new java::lang::IllegalArgumentException;
 
   int param_count = parameter_types->length;
 
@@ -469,7 +469,7 @@ _Jv_CallAnyMethodA (jobject obj,
 	  if (! argelts[i]
 	      || ! k
 	      || ! can_widen (k, paramelts[i]))
-	    JvThrow (new java::lang::IllegalArgumentException);
+	    throw new java::lang::IllegalArgumentException;
 	    
 	  if (paramelts[i] == JvPrimClass (boolean))
 	    COPY (&argvals[i],
@@ -499,7 +499,7 @@ _Jv_CallAnyMethodA (jobject obj,
       else
 	{
 	  if (argelts[i] && ! paramelts[i]->isAssignableFrom (k))
-	    JvThrow (new java::lang::IllegalArgumentException);
+	    throw new java::lang::IllegalArgumentException;
 	  COPY (&argvals[i], argelts[i], jobject);
 	}
     }
@@ -514,7 +514,7 @@ _Jv_CallAnyMethodA (jobject obj,
 						  &ret_value);
 
   if (ex)
-    JvThrow (ex);
+    throw ex;
 
   jobject r;
 #define VAL(Wrapper, Field)  (new Wrapper (ret_value.Field))