--- old/src/share/vm/opto/superword.cpp	2015-09-21 11:51:33.327479500 +0200
+++ new/src/share/vm/opto/superword.cpp	2015-09-21 11:51:32.979538962 +0200
@@ -3055,6 +3055,9 @@
     }
   }
   if (invariant(n)) {
+    if (opc == Op_ConvI2L) {
+      n = n->in(1);
+    }
     _negate_invar = negate;
     _invar = n;
     NOT_PRODUCT(_tracer.offset_plus_k_10(n, _invar, _negate_invar, _offset);)