--- a/hotspot/src/cpu/x86/vm/x86_32.ad	Tue Oct 04 21:21:10 2016 +0300
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad	Fri Apr 29 15:23:15 2016 +0200
@@ -1452,6 +1452,15 @@
   return true;
 }
 
+bool Matcher::const_oop_prefer_decode() {
+  ShouldNotCallThis();
+  return true;
+}
+
+bool Matcher::const_klass_prefer_decode() {
+  ShouldNotCallThis();
+  return true;
+}
 
 // Is it better to copy float constants, or load them directly from memory?
 // Intel can load a float constant from a direct address, requiring no