From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 23 Oct 2002 22:47:31 +0000 (+0000)
Subject: 	* gjavah.c (decode_signature_piece): In JNI mode, print
X-Git-Tag: upstream/4.9.2~83746
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db34d7a0b33c7a007ff3ecb3a8d5807a411a809b;p=platform%2Fupstream%2Flinaro-gcc.git

	* gjavah.c (decode_signature_piece): In JNI mode, print
	`jobjectArray' when array depth is nonzero.
	Fixes PR java/8296.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58474 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index cdfbd2c..26e44c4 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-23  Tom Tromey  <tromey@redhat.com>
+
+	* gjavah.c (decode_signature_piece): In JNI mode, print
+	`jobjectArray' when array depth is nonzero.
+	Fixes PR java/8296.
+
 2002-10-15  Andrew Haley  <aph@redhat.com>
 
 	* parse.y (patch_invoke): Call force_evaluation_order on a static
diff --git a/gcc/java/gjavah.c b/gcc/java/gjavah.c
index 53099ad..3d7e32e 100644
--- a/gcc/java/gjavah.c
+++ b/gcc/java/gjavah.c
@@ -1289,7 +1289,7 @@ decode_signature_piece (stream, signature, limit, need_space)
       /* If the previous iterations left us with something to print,
 	 print it.  For JNI, we always print `jobjectArray' in the
 	 nested cases.  */
-      if (flag_jni && ctype == NULL)
+      if (flag_jni && (ctype == NULL || array_depth > 0))
 	{
 	  ctype = "jobjectArray";
 	  *need_space = 1;