--- a/hotspot/src/share/vm/opto/mulnode.cpp	Fri Mar 03 23:08:35 2017 -0800
+++ b/hotspot/src/share/vm/opto/mulnode.cpp	Mon Mar 13 12:13:09 2017 +0100
@@ -648,6 +648,7 @@
 
   if (shift != maskedShift) {
     shiftNode->set_req(2, phase->intcon(maskedShift)); // Replace shift count with masked value.
+    phase->igvn_rehash_node_delayed(shiftNode);
   }
 
   return maskedShift;