From 901ebcdf97fefd24e464f98593bfa6dc741d4525 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Thu, 18 Aug 2011 14:47:32 +0000 Subject: [PATCH] 2011-08-18 Peter Collingbourne * expr.c (expand_invoke) Use the type of the method rewrite target. From-SVN: r177862 --- gcc/java/ChangeLog | 5 +++++ 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 + + * expr.c (expand_invoke) Use the type of the method rewrite + target. + 2011-08-10 Rainer Orth * 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)