--- a/hotspot/src/share/vm/interpreter/templateTable.hpp	Thu Aug 11 12:08:11 2011 -0700
+++ b/hotspot/src/share/vm/interpreter/templateTable.hpp	Tue Aug 16 04:14:05 2011 -0700
@@ -120,8 +120,8 @@
 
   // helpers
   static void unimplemented_bc();
-  static void patch_bytecode(Bytecodes::Code bc, Register scratch1,
-                             Register scratch2, bool load_bc_in_scratch = true);
+  static void patch_bytecode(Bytecodes::Code bc, Register bc_reg,
+                             Register temp_reg, bool load_bc_into_bc_reg = true, int byte_no = -1);
 
   // C calls
   static void call_VM(Register oop_result, address entry_point);