diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-28 07:40:17 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-07-28 07:40:17 +0000 |
| commit | 11c79049f3a6379362badd782a71666b520b8518 (patch) | |
| tree | 183d39c7eacc5aa6d4dcc80ced7f61a89384b6f9 /libjava/prims.cc | |
| parent | e7206175a0c8d920040676e96ec750fa6493abf7 (diff) | |
| download | gcc-11c79049f3a6379362badd782a71666b520b8518.tar.gz | |
2006-07-28 Gary Benson <gbenson@redhat.com>
* prims.cc (_Jv_CreateJavaVM): Move setting runtimeInitialized
from the start to the end of the function. Remove references
to VMThrowable.trace_enabled.
* java/lang/natVMThrowable.cc (fillInStackTrace): Use
runtimeInitialized rather than trace_enabled to decide
whether to inhibit stack trace generation.
* java/lang/VMThrowable.java (trace_enabled): Removed.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@115791 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index a066866c534..c216c7f5e35 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -56,7 +56,6 @@ details. */ #include <java/lang/NullPointerException.h> #include <java/lang/OutOfMemoryError.h> #include <java/lang/System.h> -#include <java/lang/VMThrowable.h> #include <java/lang/VMClassLoader.h> #include <java/lang/reflect/Modifier.h> #include <java/io/PrintStream.h> @@ -1404,8 +1403,6 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) if (runtimeInitialized) return -1; - runtimeInitialized = true; - jint result = parse_init_args (vm_args); if (result < 0) return -1; @@ -1447,10 +1444,6 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) _Jv_InitPrimClass (&_Jv_doubleClass, "double", 'D', 8); _Jv_InitPrimClass (&_Jv_voidClass, "void", 'V', 0); - // Turn stack trace generation off while creating exception objects. - _Jv_InitClass (&java::lang::VMThrowable::class$); - java::lang::VMThrowable::trace_enabled = 0; - // We have to initialize this fairly early, to avoid circular class // initialization. In particular we want to start the // initialization of ClassLoader before we start the initialization @@ -1465,8 +1458,6 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) no_memory = new java::lang::OutOfMemoryError; - java::lang::VMThrowable::trace_enabled = 1; - #ifdef USE_LTDL LTDL_SET_PRELOADED_SYMBOLS (); #endif @@ -1489,6 +1480,8 @@ _Jv_CreateJavaVM (JvVMInitArgs* vm_args) { } + runtimeInitialized = true; + return 0; } |