diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-11-29 18:34:58 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-11-29 18:34:58 +0000 |
| commit | 3141ed0fe01e5e5cd726dc6410f49a0323361d94 (patch) | |
| tree | 5ba6f0f10a37c9d1c36de0493f0563ef6f583cad /libjava/testsuite/libjava.jni | |
| parent | 4311c8e54c31efed7aa9aaef244a4ac93fbf96d2 (diff) | |
| download | gcc-3141ed0fe01e5e5cd726dc6410f49a0323361d94.zip gcc-3141ed0fe01e5e5cd726dc6410f49a0323361d94.tar.gz gcc-3141ed0fe01e5e5cd726dc6410f49a0323361d94.tar.bz2 | |
re PR java/18278 (JNI functions cannot return a weak reference)
gcc/java:
PR java/18278:
* expr.c (build_jni_stub): Unwrap the return value.
* java-tree.h (soft_unwrapjni_node): New define.
(enum java_tree_index): Added JTI_SOFT_UNWRAPJNI_NODE.
* decl.c (java_init_decl_processing): Initialize
soft_unwrapjni_node.
libjava:
PR java/18278:
* testsuite/libjava.jni/pr18278.out: New file.
* testsuite/libjava.jni/pr18278.c: New file.
* testsuite/libjava.jni/pr18278.java: New file.
* include/jvm.h (_Jv_UnwrapJNIweakReference): Declare.
* jni.cc (_Jv_UnwrapJNIweakReference): New function.
(call): Unwrap return value if needed.
From-SVN: r107676
Diffstat (limited to 'libjava/testsuite/libjava.jni')
| -rw-r--r-- | libjava/testsuite/libjava.jni/pr18278.c | 10 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/pr18278.java | 13 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.jni/pr18278.out | 2 |
3 files changed, 25 insertions, 0 deletions
diff --git a/libjava/testsuite/libjava.jni/pr18278.c b/libjava/testsuite/libjava.jni/pr18278.c new file mode 100644 index 0000000..7ca73a4 --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr18278.c @@ -0,0 +1,10 @@ +#include <jni.h> +#include <stdio.h> + +#include "pr18278.h" + +jobject Java_pr18278_weakRef(JNIEnv *env, jclass cls, jobject data) +{ + jobject r = (* env)->NewWeakGlobalRef(env, data); + return r; +} diff --git a/libjava/testsuite/libjava.jni/pr18278.java b/libjava/testsuite/libjava.jni/pr18278.java new file mode 100644 index 0000000..8a39dde --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr18278.java @@ -0,0 +1,13 @@ +public class pr18278 { + public pr18278() {} + + public static void main(String[] args) { + System.loadLibrary("pr18278"); + String bob = "Bob"; + Object o = weakRef("Bob"); + System.out.println(o); + System.out.println(bob == o); + } + + static native Object weakRef(Object o); +} diff --git a/libjava/testsuite/libjava.jni/pr18278.out b/libjava/testsuite/libjava.jni/pr18278.out new file mode 100644 index 0000000..e01142a --- /dev/null +++ b/libjava/testsuite/libjava.jni/pr18278.out @@ -0,0 +1,2 @@ +Bob +true |