diff options
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/parse.y | 8 | ||||
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.compile/rh174912.java | 17 |
4 files changed, 31 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index d7b9c977604..22b1387cf8e 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2005-12-05 Tom Tromey <tromey@redhat.com> + + * parse.y (patch_new_array_init): Don't set length on array. + 2005-12-02 Richard Guenther <rguenther@suse.de> * java-gimplify.c (java_gimplify_labeled_block_expr): Use diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 555541c4bd4..0a1d8e27f13 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -14857,8 +14857,12 @@ patch_new_array_init (tree type, tree node) /* Create a new type. We can't reuse the one we have here by patching its dimension because it originally is of dimension -1 - hence reused by gcc. This would prevent triangular arrays. */ - type = build_java_array_type (element_type, length); + hence reused by gcc. This would prevent triangular arrays. + Note that we don't pass the length here. If we do that then the + length will end up in the signature of this type, and hence in + the signature of the anonymous constructor -- but this is not a + valid java signature. */ + type = build_java_array_type (element_type, -1); TREE_TYPE (init) = TREE_TYPE (TREE_CHAIN (TREE_CHAIN (TYPE_FIELDS (type)))); TREE_TYPE (node) = promote_type (type); TREE_CONSTANT (init) = all_constant; diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 24eed17c47e..c920ffe595d 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2005-12-05 Tom Tromey <tromey@redhat.com> + + * testsuite/libjava.compile/rh174912.java: New file. + 2005-12-01 Geoffrey Keating <geoffk@apple.com> * testsuite/lib/libjava.exp (test_libjava_from_javac): Support diff --git a/libjava/testsuite/libjava.compile/rh174912.java b/libjava/testsuite/libjava.compile/rh174912.java new file mode 100644 index 00000000000..65c1bf574ab --- /dev/null +++ b/libjava/testsuite/libjava.compile/rh174912.java @@ -0,0 +1,17 @@ +// Derived from Red Hat bugzilla 174912 +// https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=174912 +// The bug is that the anonymous class constructor here will end up +// with a bogus '[3C' in its signature. + +public class rh174912 { + public rh174912(char[][] args) { } + + public Object m() { + return new rh174912(new char[][] { "hi".toCharArray(), + "bob".toCharArray(), + "and joe".toCharArray() }) { + }; + } + + public static void main(String[] args) { } +} |