summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/expr.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a1e76ce335e..4de89c56bee 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-06 Andrew Haley <aph@redhat.com>
+
+ * expr.c (java_stack_swap): Make sure destination stack slots are
+ of the correct type.
+
2003-11-03 Kelley Cook <kcook@gcc.gnu.org>
* Make-lang.in (dvi): Move targets to $(docobjdir).
diff --git a/gcc/java/expr.c b/gcc/java/expr.c
index e5654e79b6f..8e7ea9d9829 100644
--- a/gcc/java/expr.c
+++ b/gcc/java/expr.c
@@ -503,8 +503,9 @@ java_stack_swap (void)
decl1 = find_stack_slot (stack_pointer - 1, type1);
decl2 = find_stack_slot (stack_pointer - 2, type2);
temp = copy_to_reg (DECL_RTL (decl1));
- emit_move_insn (DECL_RTL (decl1), DECL_RTL (decl2));
- emit_move_insn (DECL_RTL (decl2), temp);
+ emit_move_insn (DECL_RTL (find_stack_slot (stack_pointer - 1, type2)),
+ DECL_RTL (decl2));
+ emit_move_insn (DECL_RTL (find_stack_slot (stack_pointer - 2, type1)), temp);
stack_type_map[stack_pointer - 1] = type2;
stack_type_map[stack_pointer - 2] = type1;
}
OpenPOWER on IntegriCloud