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

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

From-SVN: r177862

gcc/java/ChangeLog

+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.

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)