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

natClass.cc (initializeClass): Throw NoClassDefFoundError with getName() as message.

Browse source 
* java/lang/natClass.cc (initializeClass): Throw NoClassDefFoundError
	with getName() as message.
	(_Jv_CheckArrayStore): Throw ArrayStoreException with object and array
	type as message.

	* java/lang/natVMThrowable.cc: Don't declare parameter t, it is
	unused.

From-SVN: r58991
This commit is contained in:
Mark Wielaard 2002-11-10 21:07:27 +00:00 • committed by Mark Wielaard
parent 9d8f417b41
commit c0cd8f67f1
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libjava/ChangeLog
View file

@ -1,3 +1,13 @@
2002-11-10 Mark Wielaard <mark@klomp.org>
* java/lang/natClass.cc (initializeClass): Throw NoClassDefFoundError
with getName() as message.
(_Jv_CheckArrayStore): Throw ArrayStoreException with object and array
type as message.
* java/lang/natVMThrowable.cc: Don't declare parameter t, it is
unused.
2002-11-08 Ranjit Mathew <rmathew@hotmail.com> 2002-11-08 Ranjit Mathew <rmathew@hotmail.com>
* include/jni.h (JNIIMPORT, JNIEXPORT, JNICALL): Linker defines * include/jni.h (JNIIMPORT, JNIEXPORT, JNICALL): Linker defines

9
libjava/java/lang/natClass.cc
View file

@ -751,7 +751,7 @@ java::lang::Class::initializeClass (void)
if (state == JV_STATE_ERROR) if (state == JV_STATE_ERROR)
{ {
_Jv_MonitorExit (this); _Jv_MonitorExit (this);
throw new java::lang::NoClassDefFoundError; throw new java::lang::NoClassDefFoundError (getName());
} }
// Step 6. // Step 6.
@ -1043,7 +1043,12 @@ _Jv_CheckArrayStore (jobject arr, jobject obj)
jclass obj_class = JV_CLASS (obj); jclass obj_class = JV_CLASS (obj);
if (__builtin_expect if (__builtin_expect
(! _Jv_IsAssignableFrom (elt_class, obj_class), false)) (! _Jv_IsAssignableFrom (elt_class, obj_class), false))
throw new java::lang::ArrayStoreException; throw new java::lang::ArrayStoreException
((new java::lang::StringBuffer
(JvNewStringUTF("Cannot store ")))->append
(obj_class->getName())->append
(JvNewStringUTF(" in array of type "))->append
(elt_class->getName())->toString());
} }
} }

2
libjava/java/lang/natVMThrowable.cc
View file

@ -44,7 +44,7 @@ details. */
arbitrary. It may be better to configure this. */ arbitrary. It may be better to configure this. */
java::lang::VMThrowable * java::lang::VMThrowable *
java::lang::VMThrowable::fillInStackTrace (java::lang::Throwable* t) java::lang::VMThrowable::fillInStackTrace (java::lang::Throwable*)
{ {
if (! trace_enabled) if (! trace_enabled)
return NULL; return NULL;