diff options
author | Tom Tromey <tromey@redhat.com> | 2007-01-22 23:04:16 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-01-22 23:04:16 +0000 |
commit | 262fa8a4b5f0e5859a4f059e0bb16a94e7bbe781 (patch) | |
tree | 5a65b021fa1dfa6c969e6de00c7e6ecfad3b93d9 /libjava/testsuite/libjava.jni/pr29812_injar.java | |
parent | c8832aae41666f2632fb54adc2ca04c1a991cce4 (diff) | |
download | gcc-262fa8a4b5f0e5859a4f059e0bb16a94e7bbe781.zip gcc-262fa8a4b5f0e5859a4f059e0bb16a94e7bbe781.tar.gz gcc-262fa8a4b5f0e5859a4f059e0bb16a94e7bbe781.tar.bz2 |
re PR java/29812 (env->klass value is not updated during the native calls)
PR java/29812:
* testsuite/libjava.jni/pr29812.java: New file.
* testsuite/libjava.jni/pr29812_injar.java: New file.
* testsuite/libjava.jni/pr29812_injar.jar: New file.
* testsuite/libjava.jni/pr29812.out: New file.
* testsuite/libjava.jni/pr29812_injar.c: New file.
* testsuite/libjava.jni/pr29812_injar.h: New file.
* testsuite/libjava.jni/pr29812.jar: New file.
* testsuite/libjava.jni/pr29812.c: New file.
* testsuite/libjava.jni/pr29812.h: New file.
* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
New proc.
(gcj_jni_invocation_test_one): Use it.
(gcj_jni_pr29812): New proc.
(gcj_jni_run): Use it.
* java/lang/natRuntime.cc (_load): Push a new system frame before
calling JNI_OnLoad.
* include/jvm.h (_Jv_JNI_PopSystemFrame): Declare.
(_Jv_GetJNIEnvNewFrameWithLoader): Likewise.
* jni.cc (struct _Jv_JNI_LocalFrame) <marker>: Now unsigned char.
<allocated_p>: Now bool.
<loader>: New field.
(_Jv_JNI_EnsureLocalCapacity): Updated.
(_Jv_JNI_NewLocalRef): Likewise.
(_Jv_JNI_NewLocalRef): Likewise.
(_Jv_JNI_PopLocalFrame): Likewise.
(_Jv_JNI_FindClass): Likewise.
(_Jv_GetJNIEnvNewFrame): Likewise.
(_Jv_JNI_AttachCurrentThread): Likewise.
(_Jv_GetJNIEnvNewFrameWithLoader): New function.
(_Jv_GetJNIEnvNewFrame): Use it.
* include/jni_md.h (_CLASSPATH_JNIENV_CONTENTS): Removed 'klass'.
From-SVN: r121064
Diffstat (limited to 'libjava/testsuite/libjava.jni/pr29812_injar.java')
-rw-r--r-- | libjava/testsuite/libjava.jni/pr29812_injar.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libjava/testsuite/libjava.jni/pr29812_injar.java b/libjava/testsuite/libjava.jni/pr29812_injar.java new file mode 100644 index 0000000..9dc32a3 --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr29812_injar.java @@ -0,0 +1,12 @@ +public class pr29812_injar +{ + public class inner + { + } + + static { + System.loadLibrary("pr29812_injar"); + } + + public static native void doit(); +} |