--- a/hotspot/src/share/vm/opto/superword.cpp	Mon Apr 25 10:51:44 2016 +0200
+++ b/hotspot/src/share/vm/opto/superword.cpp	Mon Apr 25 10:53:42 2016 +0200
@@ -3230,8 +3230,7 @@
                  : (Node*) new MaxINode(lim, orig_limit);
   _igvn.register_new_node_with_optimizer(constrained);
   _phase->set_ctrl(constrained, pre_ctrl);
-  _igvn.hash_delete(pre_opaq);
-  pre_opaq->set_req(1, constrained);
+  _igvn.replace_input_of(pre_opaq, 1, constrained);
 }
 
 //----------------------------get_pre_loop_end---------------------------