diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-04 00:21:55 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-02-04 00:21:55 +0000 |
| commit | 40eb63420d945f60bcae5255fdddfca2e2e1af00 (patch) | |
| tree | cc8f91095e1a91defec3e51a7583aad137e8dbff | |
| parent | b617b28a4d938bb45c62d61b29358f4184eb708a (diff) | |
| download | ppe42-gcc-40eb63420d945f60bcae5255fdddfca2e2e1af00.tar.gz ppe42-gcc-40eb63420d945f60bcae5255fdddfca2e2e1af00.zip | |
2006-02-04 Andreas Tobler <a.tobler@schweiz.ch>
* expr.c (java_stack_swap): Revert gcc_assert patch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110579 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/java/expr.c | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 95b380797a3..a218b80263d 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2006-02-04 Andreas Tobler <a.tobler@schweiz.ch> + + * expr.c (java_stack_swap): Revert gcc_assert patch. + 2006-02-03 Ben Elliston <bje@au.ibm.com> * java-gimplify.c: Use gcc_assert and gcc_unreachable throughout. diff --git a/gcc/java/expr.c b/gcc/java/expr.c index c28f6b25335..6d8926cdef4 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -629,12 +629,14 @@ java_stack_swap (void) tree temp; tree decl1, decl2; + if (stack_pointer < 2 + || (type1 = stack_type_map[stack_pointer - 1]) == TYPE_UNKNOWN + || (type2 = stack_type_map[stack_pointer - 2]) == TYPE_UNKNOWN + || type1 == TYPE_SECOND || type2 == TYPE_SECOND + || TYPE_IS_WIDE (type1) || TYPE_IS_WIDE (type2)) + /* Bad stack swap. */ + abort (); /* Bad stack swap. */ - gcc_assert (stack_pointer >= 2 - && (type1 = stack_type_map[stack_pointer - 1]) != TYPE_UNKNOWN - && (type2 = stack_type_map[stack_pointer - 2]) != TYPE_UNKNOWN - && (type1 != TYPE_SECOND && type2 != TYPE_SECOND) - && (! TYPE_IS_WIDE (type1) && ! TYPE_IS_WIDE (type2))); flush_quick_stack (); decl1 = find_stack_slot (stack_pointer - 1, type1); |
