Mercurial > hg > graal-compiler

diff src/share/vm/adlc/formssel.cpp @ 8117:706c919d3b56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8007722: C2: "assert(tp->base() != Type::AnyPtr) failed: not a bare pointer" at machnode.cpp:376 Summary: GetAndSetP's MachNode should capture bottom type. Reviewed-by: kvn
author roland
date Tue, 26 Feb 2013 12:18:30 +0100
parents b30b3c2a0cf2
children f15fe46d8c00
line wrap: on
line diff
--- a/src/share/vm/adlc/formssel.cpp	Mon Feb 25 14:13:04 2013 +0100
+++ b/src/share/vm/adlc/formssel.cpp	Tue Feb 26 12:18:30 2013 +0100
@@ -753,10 +753,11 @@
         !strcmp(_matrule->_rChild->_opType,"DecodeNKlass") ||
         !strcmp(_matrule->_rChild->_opType,"EncodePKlass") ||
         !strcmp(_matrule->_rChild->_opType,"LoadN")        ||
-        !strcmp(_matrule->_rChild->_opType,"GetAndSetN")   ||
         !strcmp(_matrule->_rChild->_opType,"LoadNKlass")   ||
         !strcmp(_matrule->_rChild->_opType,"CreateEx")     ||  // type of exception
-        !strcmp(_matrule->_rChild->_opType,"CheckCastPP")) ) return true;
+        !strcmp(_matrule->_rChild->_opType,"CheckCastPP")  ||
+        !strcmp(_matrule->_rChild->_opType,"GetAndSetP")   ||
+        !strcmp(_matrule->_rChild->_opType,"GetAndSetN")) )  return true;
   else if ( is_ideal_load() == Form::idealP )                return true;
   else if ( is_ideal_store() != Form::none  )                return true;