--- a/hotspot/src/share/vm/opto/matcher.hpp	Tue Oct 04 21:21:10 2016 +0300
+++ b/hotspot/src/share/vm/opto/matcher.hpp	Fri Apr 29 15:23:15 2016 +0200
@@ -457,6 +457,9 @@
   static bool narrow_oop_use_complex_address();
   static bool narrow_klass_use_complex_address();
 
+  static bool const_oop_prefer_decode();
+  static bool const_klass_prefer_decode();
+
   // Generate implicit null check for narrow oops if it can fold
   // into address expression (x64).
   //