diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-26 07:05:32 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-26 07:05:32 +0000 |
| commit | 3139614a9394ccd14218e29799bc5c9db0a741b2 (patch) | |
| tree | 8bd00c51e350e8505bf5561673010a0008df7aba /libjava/java/lang/natClassLoader.cc | |
| parent | 1a3e3dee0831ccde752a948958bf1fbff4197ba6 (diff) | |
| download | gcc-3139614a9394ccd14218e29799bc5c9db0a741b2.tar.gz | |
* 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
Diffstat (limited to 'libjava/java/lang/natClassLoader.cc')
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index 5f7138c3289..84fe0c4b648 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -1,6 +1,6 @@ // natClassLoader.cc - Implementation of java.lang.ClassLoader native methods. -/* Copyright (C) 1999, 2000 Free Software Foundation +/* Copyright (C) 1999, 2000, 2001 Free Software Foundation This file is part of libgcj. @@ -80,8 +80,8 @@ java::lang::ClassLoader::defineClass0 (jstring name, _Jv_Utf8Const * name2 = _Jv_makeUtf8Const (name); if (! _Jv_VerifyClassName (name2)) - JvThrow (new java::lang::ClassFormatError - (JvNewStringLatin1 ("erroneous class name"))); + throw new java::lang::ClassFormatError + (JvNewStringLatin1 ("erroneous class name")); klass->name = name2; } @@ -104,7 +104,10 @@ java::lang::ClassLoader::defineClass0 (jstring name, // anything but ClassNotFoundException, // or some kind of Error. - JvThrow (ex); + // FIXME: Rewrite this as a cleanup instead of + // as a catch handler. + + throw ex; } // if everything proceeded sucessfully, we're loaded. @@ -151,9 +154,7 @@ _Jv_WaitForState (jclass klass, int state) _Jv_MonitorExit (klass); if (klass->state == JV_STATE_ERROR) - { - _Jv_Throw (new java::lang::LinkageError ()); - } + throw new java::lang::LinkageError; } // Finish linking a class. Only called from ClassLoader::resolveClass. @@ -253,7 +254,7 @@ _Jv_PrepareCompiledClass (jclass klass) if (! found) { jstring str = _Jv_NewStringUTF (name->data); - JvThrow (new java::lang::ClassNotFoundException (str)); + throw new java::lang::ClassNotFoundException (str); } pool->data[index].clazz = found; |