diff -r e00dfcc21fa1 -r 55047d16f141 hotspot/src/share/vm/opto/c2compiler.cpp
--- a/hotspot/src/share/vm/opto/c2compiler.cpp	Tue Apr 05 20:32:54 2016 +0000
+++ b/hotspot/src/share/vm/opto/c2compiler.cpp	Wed Mar 30 17:04:14 2016 +0200
@@ -361,6 +361,9 @@
   case vmIntrinsics::_getCallerClass:
     if (SystemDictionary::reflect_CallerSensitive_klass() == NULL) return false;
     break;
+  case vmIntrinsics::_onSpinWait:
+    if (!Matcher::match_rule_supported(Op_OnSpinWait)) return false;
+    break;
   case vmIntrinsics::_hashCode:
   case vmIntrinsics::_identityHashCode:
   case vmIntrinsics::_getClass: