--- a/hotspot/src/share/vm/opto/matcher.cpp	Tue Apr 05 20:32:54 2016 +0000
+++ b/hotspot/src/share/vm/opto/matcher.cpp	Wed Mar 30 17:04:14 2016 +0200
@@ -943,6 +943,7 @@
     case Op_MemBarCPUOrder: // %%% these ideals should have narrower adr_type?
     case Op_StrInflatedCopy:
     case Op_StrCompressedCopy:
+    case Op_OnSpinWait:
     case Op_EncodeISOArray:
       nidx = Compile::AliasIdxTop;
       nat = NULL;