diff -r 6b056026ecad -r 8d82c4dfa722 hotspot/src/share/vm/opto/connode.cpp
--- a/hotspot/src/share/vm/opto/connode.cpp	Wed Sep 19 16:50:26 2012 -0700
+++ b/hotspot/src/share/vm/opto/connode.cpp	Thu Sep 20 16:49:17 2012 +0200
@@ -480,7 +480,9 @@
         opc == Op_CheckCastPP ||
         opc == Op_StorePConditional ||
         opc == Op_CompareAndSwapP ||
-        opc == Op_CompareAndSwapN;
+        opc == Op_CompareAndSwapN ||
+        opc == Op_GetAndSetP ||
+        opc == Op_GetAndSetN;
   }
   return possible_alias;
 }