--- a/hotspot/src/share/vm/opto/matcher.hpp	Wed May 04 13:32:03 2016 -0700
+++ b/hotspot/src/share/vm/opto/matcher.hpp	Fri Apr 29 17:24:16 2016 +0200
@@ -488,6 +488,9 @@
   // ourselves.
   static const bool need_masked_shift_count;
 
+  // Whether code generation need accurate ConvI2L types.
+  static const bool convi2l_type_required;
+
   // This routine is run whenever a graph fails to match.
   // If it returns, the compiler should bailout to interpreter without error.
   // In non-product mode, SoftMatchFailure is false to detect non-canonical