diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-08 20:59:52 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-08 20:59:52 +0000 |
| commit | e8a249a62e0ae7a7bcfa6c7ecdb748e27f7cd9cb (patch) | |
| tree | 9db34f3dffa778bcdbf16646952570a8498d6bb3 | |
| parent | 461eeb14ef1be0157596f51be106d6de62961aa5 (diff) | |
| download | gcc-e8a249a62e0ae7a7bcfa6c7ecdb748e27f7cd9cb.tar.gz | |
Fix for PR java/5812.
* expr.c (build_java_jsr): Take pc arguments, and do lookup_label
gere instead of in JSR macro. Likewise with load_type_state call.
Do the latter on if the return_pc has been verified (the jsr returns).
(JSR): No just call build_java_jsr.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50455 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/expr.c | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index dca4cb08fa1..5210c93afaa 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2002-03-08 Per Bothner <per@bothner.com> + + Fix for PR java/5812. + * expr.c (build_java_jsr): Take pc arguments, and do lookup_label + gere instead of in JSR macro. Likewise with load_type_state call. + Do the latter on if the return_pc has been verified (the jsr returns). + (JSR): No just call build_java_jsr. + 2002-03-07 Jeff Sturm <jsturm@one-point.com> * java/Make-lang.in (JAVA_TARGET_INSTALL_NAME): Define. diff --git a/gcc/java/expr.c b/gcc/java/expr.c index b6a01065983..8eb816e2392 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -48,7 +48,7 @@ static tree pop_value PARAMS ((tree)); static void java_stack_swap PARAMS ((void)); static void java_stack_dup PARAMS ((int, int)); static void build_java_athrow PARAMS ((tree)); -static void build_java_jsr PARAMS ((tree, tree)); +static void build_java_jsr PARAMS ((int, int)); static void build_java_ret PARAMS ((tree)); static void expand_java_multianewarray PARAMS ((tree, int)); static void expand_java_arraystore PARAMS ((tree)); @@ -607,15 +607,18 @@ build_java_athrow (node) /* Implementation for jsr/ret */ static void -build_java_jsr (where, ret) - tree where; - tree ret; +build_java_jsr (target_pc, return_pc) + int target_pc, return_pc; { + tree where = lookup_label (target_pc); + tree ret = lookup_label (return_pc); tree ret_label = fold (build1 (ADDR_EXPR, return_address_type_node, ret)); push_value (ret_label); flush_quick_stack (); emit_jump (label_rtx (where)); expand_label (ret); + if (instruction_bits [return_pc] & BCODE_VERIFIED) + load_type_state (ret); } static void @@ -2968,13 +2971,8 @@ process_jvm_instruction (PC, byte_ops, length) build_java_ret (find_local_variable (index, ptr_type_node, oldpc)); \ } -#define JSR(OPERAND_TYPE, OPERAND_VALUE) \ - { \ - tree where = lookup_label (oldpc+OPERAND_VALUE); \ - tree ret = lookup_label (PC); \ - build_java_jsr (where, ret); \ - load_type_state (ret); \ - } +#define JSR(OPERAND_TYPE, OPERAND_VALUE) \ + build_java_jsr (oldpc+OPERAND_VALUE, PC); /* Push a constant onto the stack. */ #define PUSHC(OPERAND_TYPE, OPERAND_VALUE) \ |