diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-18 14:47:32 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-08-18 14:47:32 +0000 |
| commit | 57664a5af4559c7f0ba58a481803bb8ab4b26d04 (patch) | |
| tree | 74db74b8da18fcf4eb30ccddeb91e657e10dfb54 /gcc/java | |
| parent | a6949f31b3c533adfa3fc5fa0e22ea399186ccf2 (diff) | |
| download | gcc-57664a5af4559c7f0ba58a481803bb8ab4b26d04.tar.gz | |
2011-08-18 Peter Collingbourne <peter@pcc.me.uk>
* expr.c (expand_invoke) Use the type of the method rewrite
target.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177862 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/expr.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 11515f0fa84..8e390110a9c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2011-08-18 Peter Collingbourne <peter@pcc.me.uk> + + * expr.c (expand_invoke) Use the type of the method rewrite + target. + 2011-08-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * jcf-dump.c (print_constant): Cast first frexp arg. diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 4686f30309b..ec2d9b65d0a 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -2544,12 +2544,12 @@ expand_invoke (int opcode, int method_ref_index, int nargs ATTRIBUTE_UNUSED) return; } - method_type = TREE_TYPE (method); - arg_list = pop_arguments (method_type); + arg_list = pop_arguments (TREE_TYPE (method)); flush_quick_stack (); maybe_rewrite_invocation (&method, &arg_list, &method_signature, &special); + method_type = TREE_TYPE (method); func = NULL_TREE; if (opcode == OPCODE_invokestatic) |