FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exception.cc (java_eh_info): Make value type jthrowable.

Browse source 
* 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:
Richard Henderson 2001-03-25 23:05:32 -08:00 • committed by Richard Henderson
parent 56b8908481
commit b3208f56cb
36 changed files with 294 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libjava/resolve.cc
View file

@ -70,7 +70,7 @@ static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6);
static void throw_incompatible_class_change_error (jstring msg)
{
JvThrow (new java::lang::IncompatibleClassChangeError (msg));
throw new java::lang::IncompatibleClassChangeError (msg);
}
_Jv_word
@ -98,7 +98,7 @@ _Jv_ResolvePoolEntry (jclass klass, int index)
if (! found)
{
jstring str = _Jv_NewStringUTF (name->data);
JvThrow (new java::lang::ClassNotFoundException (str));
throw new java::lang::ClassNotFoundException (str);
}
if ((found->accflags & Modifier::PUBLIC) == Modifier::PUBLIC
@ -110,7 +110,7 @@ _Jv_ResolvePoolEntry (jclass klass, int index)
}
else
{
JvThrow (new java::lang::IllegalAccessError (found->getName()));
throw new java::lang::IllegalAccessError (found->getName());
}
}
break;
@ -185,17 +185,16 @@ _Jv_ResolvePoolEntry (jclass klass, int index)
_Jv_ResolveField (field, cls->loader);
if (field_type != 0 && field->type != field_type)
JvThrow
(new java::lang::LinkageError
(JvNewStringLatin1
("field type mismatch with different loaders")));
throw new java::lang::LinkageError
(JvNewStringLatin1
("field type mismatch with different loaders"));
the_field = field;
goto end_of_field_search;
}
else
{
JvThrow (new java::lang::IllegalAccessError);
throw new java::lang::IllegalAccessError;
}
}
}
@ -319,7 +318,7 @@ _Jv_ResolvePoolEntry (jclass klass, int index)
msg = msg->concat (JvNewStringLatin1("."));
msg = msg->concat (_Jv_NewStringUTF (method_name->data));
msg = msg->concat (JvNewStringLatin1(" was not found."));
JvThrow(new java::lang::NoSuchMethodError (msg));
throw new java::lang::NoSuchMethodError (msg);
}
pool->data[index].rmethod =
@ -366,7 +365,7 @@ _Jv_SearchMethodInClass (jclass cls, jclass klass,
}
else
{
JvThrow (new java::lang::IllegalAccessError);
throw new java::lang::IllegalAccessError;
}
}
return 0;
@ -486,7 +485,7 @@ _Jv_DetermineVTableIndex (jclass klass,
static void
_Jv_abstractMethodError ()
{
JvThrow (new java::lang::AbstractMethodError);
throw new java::lang::AbstractMethodError;
}
void
@ -684,8 +683,7 @@ _Jv_PrepareClass(jclass klass)
{
clz->state = JV_STATE_ERROR;
clz->notifyAll ();
JvThrow (new java::lang::IncompatibleClassChangeError
(clz->getName ()));
throw new java::lang::IncompatibleClassChangeError (clz->getName ());
}
/* FIXME: At this point, if (loader != super_class->loader), we
@ -1211,10 +1209,9 @@ _Jv_BuildResolvedMethod (_Jv_Method* method,
static void
throw_class_format_error (jstring msg)
{
if (msg == 0)
JvThrow (new java::lang::ClassFormatError);
else
JvThrow (new java::lang::ClassFormatError (msg));
throw (msg
? new java::lang::ClassFormatError (msg)
: new java::lang::ClassFormatError);
}
static void
@ -1226,8 +1223,7 @@ throw_class_format_error (char *msg)
static void
throw_internal_error (char *msg)
{
JvThrow
(new java::lang::InternalError (JvNewStringLatin1 (msg)));
throw new java::lang::InternalError (JvNewStringLatin1 (msg));
}