* Merged gcj-abi-2-dev-branch to trunk.

(Actual changes too large to list in the commit message;
see ChangeLog.)


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

1 files changed, 21 insertions, 0 deletions

diff --git a/libjava/testsuite/libjava.lang/assign2.java b/libjava/testsuite/libjava.lang/assign2.java
new file mode 100644
index 00000000000..41fdcb594d9
--- /dev/null
+++ b/libjava/testsuite/libjava.lang/assign2.java
@@ -0,0 +1,21 @@
+// Test for an array assignment bug we've had.
+
+public class assign2
+{
+  public static Object[][] c () { return new Long[5][5]; }
+
+  public static Object[] d () { return new Integer[3]; }
+
+  public static void main(String[] args)
+  {
+    try
+      {
+	Object[][] x = c();
+	x[0] = d();
+      }
+    catch (ArrayStoreException _)
+      {
+	System.out.println("good");
+      }
+  }
+}