diff src/cpu/sparc/vm/templateTable_sparc.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents d8041d695d19
children 52b4284cb496
line wrap: on
line diff
--- a/src/cpu/sparc/vm/templateTable_sparc.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/cpu/sparc/vm/templateTable_sparc.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -2942,6 +2942,7 @@
 
 
 void TemplateTable::generate_vtable_call(Register Rrecv, Register Rindex, Register Rret) {
+  Register Rtemp = G4_scratch;
   Register Rcall = Rindex;
   assert_different_registers(Rcall, G5_method, Gargs, Rret);
 
@@ -2950,7 +2951,6 @@
 #ifdef GRAAL
   __ profile_called_method(G5_method, Rtemp);
 #endif
-  __ profile_arguments_type(G5_method, Rcall, Gargs, true);
   __ call_from_interpreter(Rcall, Gargs, Rret);
 }
 
@@ -3025,7 +3025,6 @@
   __ null_check(O0);
 
   __ profile_final_call(O4);
-  __ profile_arguments_type(G5_method, Rscratch, Gargs, true);
 
   // get return address
   AddressLiteral table(Interpreter::invoke_return_entry_table());
@@ -3055,7 +3054,6 @@
 
   // do the call
   __ profile_call(O4);
-  __ profile_arguments_type(G5_method, Rscratch, Gargs, false);
   __ call_from_interpreter(Rscratch, Gargs, Rret);
 }
 
@@ -3071,7 +3069,6 @@
 
   // do the call
   __ profile_call(O4);
-  __ profile_arguments_type(G5_method, Rscratch, Gargs, false);
   __ call_from_interpreter(Rscratch, Gargs, Rret);
 }
 
@@ -3097,7 +3094,6 @@
   // do the call - the index (f2) contains the Method*
   assert_different_registers(G5_method, Gargs, Rcall);
   __ mov(Rindex, G5_method);
-  __ profile_arguments_type(G5_method, Rcall, Gargs, true);
   __ call_from_interpreter(Rcall, Gargs, Rret);
   __ bind(notFinal);
 
@@ -3208,7 +3204,6 @@
   __ profile_called_method(G5_method, Rscratch);
 #endif
 
-  __ profile_arguments_type(G5_method, Rcall, Gargs, true);
   __ call_from_interpreter(Rcall, Gargs, Rret);
 }
 
@@ -3238,7 +3233,6 @@
   // do the call
   __ verify_oop(G4_mtype);
   __ profile_final_call(O4);  // FIXME: profile the LambdaForm also
-  __ profile_arguments_type(G5_method, Rscratch, Gargs, true);
   __ call_from_interpreter(Rscratch, Gargs, Rret);
 }
 
@@ -3275,7 +3269,6 @@
 
   // do the call
   __ verify_oop(G4_callsite);
-  __ profile_arguments_type(G5_method, Rscratch, Gargs, false);
   __ call_from_interpreter(Rscratch, Gargs, Rret);
 }