--- a/hotspot/src/share/vm/opto/superword.cpp	Mon Jan 11 14:23:35 2016 +0100
+++ b/hotspot/src/share/vm/opto/superword.cpp	Mon Jan 11 16:33:27 2016 +0100
@@ -3438,10 +3438,12 @@
     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);)
-    return true;
+    if (n->bottom_type()->isa_int()) {
+      _negate_invar = negate;
+      _invar = n;
+      NOT_PRODUCT(_tracer.offset_plus_k_10(n, _invar, _negate_invar, _offset);)
+      return true;
+    }
   }
 
   NOT_PRODUCT(_tracer.offset_plus_k_11(n);)