--- a/src/hotspot/share/oops/accessBackend.inline.hpp	Fri Jun 22 16:06:43 2018 -0400
+++ b/src/hotspot/share/oops/accessBackend.inline.hpp	Fri Jun 22 17:46:58 2018 -0400
@@ -35,7 +35,7 @@
 inline typename EnableIf<
   AccessInternal::MustConvertCompressedOop<idecorators, T>::value, T>::type
 RawAccessBarrier<decorators>::decode_internal(typename HeapOopType<idecorators>::type value) {
-  if (HasDecorator<decorators, OOP_NOT_NULL>::value) {
+  if (HasDecorator<decorators, IS_NOT_NULL>::value) {
     return CompressedOops::decode_not_null(value);
   } else {
     return CompressedOops::decode(value);
@@ -48,7 +48,7 @@
   AccessInternal::MustConvertCompressedOop<idecorators, T>::value,
   typename HeapOopType<idecorators>::type>::type
 RawAccessBarrier<decorators>::encode_internal(T value) {
-  if (HasDecorator<decorators, OOP_NOT_NULL>::value) {
+  if (HasDecorator<decorators, IS_NOT_NULL>::value) {
     return CompressedOops::encode_not_null(value);
   } else {
     return CompressedOops::encode(value);