* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40838 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 6 deletions

diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index 4e9d3ceea4a..61adf26cb00 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))