diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-24 22:09:15 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-06-24 22:09:15 +0000 |
| commit | a7d9c7d6bb3edfbe7a99dcb1cb0c510b10054f3a (patch) | |
| tree | dc3cacf7c6d08a5e1aadc432281d4ad24526b9b2 /gcc/java | |
| parent | 0e26cf9911087616a1506c0613ce9498d2bf0507 (diff) | |
| download | gcc-a7d9c7d6bb3edfbe7a99dcb1cb0c510b10054f3a.tar.gz | |
gcc/java/:
* verify-impl.c (verify_instructions_0): Correctly handle
situation where PC falls off end.
libjava/:
* verify.cc (verify_instructions_0): Correctly handle situation
where PC falls off end.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@101299 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/verify-impl.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4c967594797..bfc0df12a99 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2005-06-24 Tom Tromey <tromey@redhat.com> + + * verify-impl.c (verify_instructions_0): Correctly handle + situation where PC falls off end. + 2005-06-23 Bryce McKinlay <mckinlay@redhat.com> PR java/20697 diff --git a/gcc/java/verify-impl.c b/gcc/java/verify-impl.c index db6078e9c97..f7876387481 100644 --- a/gcc/java/verify-impl.c +++ b/gcc/java/verify-impl.c @@ -2251,10 +2251,12 @@ verify_instructions_0 (void) else { /* We only have to do this checking in the situation where - control flow falls through from the previous - instruction. Otherwise merging is done at the time we - push the branch. */ - if (vfr->states[vfr->PC] != NULL) + control flow falls through from the previous instruction. + Otherwise merging is done at the time we push the branch. + Note that we'll catch the off-the-end problem just + below. */ + if (vfr->PC < vfr->current_method->code_length + && vfr->states[vfr->PC] != NULL) { /* We've already visited this instruction. So merge the states together. It is simplest, but not most |