2011-08-18 Peter Collingbourne <peter@pcc.me.uk>

	* expr.c (expand_invoke) Use the type of the method rewrite
	target.

From-SVN: r177862

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 11515f0fa84062aa982a06a8cb5c025fa6d3cbc2..8e390110a9c609ff2044a021942a857f0561165a 100644 (file)
--- 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 4686f30309bb0944da95d466e6a5114c22db3ecf..ec2d9b65d0a78af9e008b8979af942e99d74391b 100644 (file)
--- 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)