diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2004-11-25 03:47:08 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2004-11-25 03:47:08 +0000 |
| commit | 367390404d26b7bfc400d77893579e83e2a19fb9 (patch) | |
| tree | 477abdf83653e20b0e74447d6ca47eb67b0511b8 /libjava/prims.cc | |
| parent | ec0641f612862498e829fdaf040a201c0ba68762 (diff) | |
| download | gcc-367390404d26b7bfc400d77893579e83e2a19fb9.zip gcc-367390404d26b7bfc400d77893579e83e2a19fb9.tar.gz gcc-367390404d26b7bfc400d77893579e83e2a19fb9.tar.bz2 | |
* Merged gcj-abi-2-dev-branch to trunk.
(Actual changes too large to list in the commit message;
see ChangeLog.)
From-SVN: r91270
Diffstat (limited to 'libjava/prims.cc')
| -rw-r--r-- | libjava/prims.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libjava/prims.cc b/libjava/prims.cc index 70ede27..e3d5750 100644 --- a/libjava/prims.cc +++ b/libjava/prims.cc @@ -61,12 +61,16 @@ details. */ #include <java/lang/VirtualMachineError.h> #include <gnu/gcj/runtime/VMClassLoader.h> #include <gnu/gcj/runtime/FinalizerThread.h> +#include <execution.h> #include <gnu/java/lang/MainThread.h> #ifdef USE_LTDL #include <ltdl.h> #endif +// Execution engine for compiled code. +_Jv_CompiledEngine _Jv_soleCompiledEngine; + // We allocate a single OutOfMemoryError exception which we keep // around for use if we run out of memory. static java::lang::OutOfMemoryError *no_memory; @@ -723,7 +727,7 @@ JvConvertArgv (int argc, const char **argv) { if (argc < 0) argc = 0; - jobjectArray ar = JvNewObjectArray(argc, &StringClass, NULL); + jobjectArray ar = JvNewObjectArray(argc, &java::lang::String::class$, NULL); jobject *ptr = elements(ar); jbyteArray bytes = NULL; for (int i = 0; i < argc; i++) @@ -1204,7 +1208,7 @@ _Jv_CheckAccess (jclass self_klass, jclass other_klass, jint flags) return ((self_klass == other_klass) || ((flags & Modifier::PUBLIC) != 0) || (((flags & Modifier::PROTECTED) != 0) - && other_klass->isAssignableFrom (self_klass)) + && _Jv_IsAssignableFromSlow (other_klass, self_klass)) || (((flags & Modifier::PRIVATE) == 0) && _Jv_ClassNameSamePackage (self_klass->name, other_klass->name))); |