--- a/hotspot/src/share/vm/opto/matcher.cpp	Mon Apr 11 20:38:38 2016 -0700
+++ b/hotspot/src/share/vm/opto/matcher.cpp	Tue Apr 12 14:17:42 2016 -0400
@@ -944,6 +944,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;