re PR java/21519 (ICE in generate_bytecode_conditional, at java/jcf-write.c:1337)

gcc/java:
	PR java/21519:
	* jcf-write.c (generate_bytecode_insns) <SAVE_EXPR>: Don't call
	NOTE_PUSH.
libjava:
	PR java/21519:
	* testsuite/libjava.compile/pr21519.java: New file.
	* testsuite/libjava.compile/pr21519.no-link: New file.

From-SVN: r99739

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 6341396673f9b009f6d146f2fdfb74c04d838461..63b84907a4c93121df54693a8a7e8a766376ce97 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-15  Tom Tromey  <tromey@redhat.com>
+
+       PR java/21519:
+       * jcf-write.c (generate_bytecode_insns) <SAVE_EXPR>: Don't call
+       NOTE_PUSH.
+
 2005-05-12  Aaron Luchko <aluchko@redhat.com>
 
         * gcj.texi: Add '-verify', '-noverify', and '-verifyremote'.

diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index 3a4002bbb87737bfa6d42cbcd61701a0b9f82977..d720f0f6c96e8a3749f6ae31397d85f8ea81aec0 100644 (file)
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -1800,6 +1800,7 @@ create_label_decl (tree name)
                     TREE_TYPE (return_address_type_node));
   DECL_CONTEXT (decl) = current_function_decl;
   DECL_IGNORED_P (decl) = 1;
+  DECL_ARTIFICIAL (decl) = 1;
   return decl;
 }
 

diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c
index 87790408d137b4cba2249d6620f4f191033a1cc5..2032fcec8e0ebac250a489c08b84ef177bfcadfe 100644 (file)
--- a/gcc/java/jcf-write.c
+++ b/gcc/java/jcf-write.c
@@ -2235,7 +2235,6 @@ generate_bytecode_insns (tree exp, int target, struct jcf_partial *state)
        {
          tree type = TREE_TYPE (exp);
          emit_load (arg, state);
-         NOTE_PUSH (TYPE_IS_WIDE (type) ? 2 : 1);
        }
       break;
     case CONVERT_EXPR:

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 76714b43eb1a77099e21aec5eaa316021a3ff594..6778d0fddf2633842ceea801ff3a9d8ad9771718 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-15  Tom Tromey  <tromey@redhat.com>
+
+       PR java/21519:
+       * testsuite/libjava.compile/pr21519.java: New file.
+       * testsuite/libjava.compile/pr21519.no-link: New file.
+
 2005-05-15  Tom Tromey  <tromey@redhat.com>
 
        * stacktrace.cc (getLineNumberForFrame): Use _Jv_GetSafeArg.

diff --git a/libjava/testsuite/libjava.compile/pr21519.java b/libjava/testsuite/libjava.compile/pr21519.java
new file mode 100644 (file)
index 0000000..c836a8f
--- /dev/null
+++ b/libjava/testsuite/libjava.compile/pr21519.java
@@ -0,0 +1,8 @@
+public class pr21519 {
+  char[] source;
+  public int compute(int pos) {
+    for (int i = 0; i < pos; ++i)
+      if (!(source[i] == ' ' || source[i] == '\t')) return -1;
+    return pos;
+  }
+}

diff --git a/libjava/testsuite/libjava.compile/pr21519.no-link b/libjava/testsuite/libjava.compile/pr21519.no-link
new file mode 100644 (file)
index 0000000..e69de29