--- old/src/share/vm/opto/macro.cpp	2016-10-25 10:40:07.808776622 +0200
+++ new/src/share/vm/opto/macro.cpp	2016-10-25 10:40:07.758776589 +0200
@@ -2397,7 +2397,7 @@
   // Optimize test; set region slot 2
   Node *slow_path = opt_bits_test(ctrl, region, 2, funlock, 0, 0);
 
-  CallNode *call = make_slow_call( (CallNode *) unlock, OptoRuntime::complete_monitor_exit_Type(), CAST_FROM_FN_PTR(address, SharedRuntime::complete_monitor_unlocking_C), "complete_monitor_unlocking_C", slow_path, obj, box );
+  CallNode *call = make_slow_call( (CallNode *) unlock, OptoRuntime::complete_monitor_exit_Type(), OptoRuntime::complete_monitor_unlocking_wrapper()->entry_point(), "complete_monitor_unlocking_wrapper", slow_path, obj, box );
 
   extract_call_projections(call);