Thu, 05 Jan 2017 01:40:00 +0000
Merge
1.1 --- a/src/share/vm/adlc/formssel.cpp Wed Jan 04 19:44:02 2017 +0000 1.2 +++ b/src/share/vm/adlc/formssel.cpp Thu Jan 05 01:40:00 2017 +0000 1.3 @@ -648,6 +648,7 @@ 1.4 if( strcmp(_matrule->_opType,"MemBarReleaseLock") == 0 ) return true; 1.5 if( strcmp(_matrule->_opType,"MemBarAcquireLock") == 0 ) return true; 1.6 if( strcmp(_matrule->_opType,"MemBarStoreStore") == 0 ) return true; 1.7 + if( strcmp(_matrule->_opType,"MemBarVolatile") == 0 ) return true; 1.8 if( strcmp(_matrule->_opType,"StoreFence") == 0 ) return true; 1.9 if( strcmp(_matrule->_opType,"LoadFence") == 0 ) return true; 1.10