This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[BC] Patch: FYI:
- From: Tom Tromey <tromey at redhat dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Cc: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 26 Oct 2004 13:06:30 -0600
- Subject: [BC] Patch: FYI:
- Reply-to: tromey at redhat dot com
I'm checking this in on the BC branch.
This fixes a bug in the verifier where merging a reference type and
the null type didn't work properly. Looks like more fallout from the
translation.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* verify-impl.c (debug_print_state): Declare `i' before code.
(merge_types): Modify `t' when it is null_type.
Index: verify-impl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Attic/verify-impl.c,v
retrieving revision 1.1.2.14
diff -u -r1.1.2.14 verify-impl.c
--- verify-impl.c 26 Oct 2004 18:16:48 -0000 1.1.2.14
+++ verify-impl.c 26 Oct 2004 19:04:40 -0000
@@ -930,7 +930,7 @@
;
else if (t->key == null_type)
{
- t = old_type;
+ *t = *old_type;
changed = true;
}
else if (type_initialized (t) != type_initialized (old_type))
@@ -1289,8 +1289,8 @@
debug_print_state (state *s, const char *leader, int pc, int max_stack,
int max_locals)
{
- debug_print ("%s [%4d]: [stack] ", leader, pc);
int i;
+ debug_print ("%s [%4d]: [stack] ", leader, pc);
for (i = 0; i < s->stacktop; ++i)
type_print (&s->stack[i]);
for (; i < max_stack; ++i)
@@ -1630,7 +1630,7 @@
{
state s;
state_check_no_uninitialized_objects (vfr->current_state,
- vfr->current_method->max_locals, true);
+ vfr->current_method->max_locals, true);
copy_state_with_stack (&s, vfr->current_state,
vfr->current_method->max_stack,
vfr->current_method->max_locals);