From b4220f64e3bc2c2c3eb868bee76468b445fcdd3e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 15 May 2005 18:28:29 +0000 Subject: [PATCH] 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) : 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 --- gcc/java/ChangeLog | 6 ++++++ gcc/java/expr.c | 1 + gcc/java/jcf-write.c | 1 - libjava/ChangeLog | 6 ++++++ libjava/testsuite/libjava.compile/pr21519.java | 8 ++++++++ libjava/testsuite/libjava.compile/pr21519.no-link | 0 6 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 libjava/testsuite/libjava.compile/pr21519.java create mode 100644 libjava/testsuite/libjava.compile/pr21519.no-link diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 6341396673f..63b84907a4c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2005-05-15 Tom Tromey + + PR java/21519: + * jcf-write.c (generate_bytecode_insns) : Don't call + NOTE_PUSH. + 2005-05-12 Aaron Luchko * gcj.texi: Add '-verify', '-noverify', and '-verifyremote'. diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 3a4002bbb87..d720f0f6c96 100644 --- 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 87790408d13..2032fcec8e0 100644 --- 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 76714b43eb1..6778d0fddf2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-05-15 Tom Tromey + + PR java/21519: + * testsuite/libjava.compile/pr21519.java: New file. + * testsuite/libjava.compile/pr21519.no-link: New file. + 2005-05-15 Tom Tromey * 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 index 00000000000..c836a8f9f7f --- /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 index 00000000000..e69de29bb2d -- 2.30.2