--- old/src/hotspot/share/gc/shared/barrierSetConfig.hpp	2018-12-17 18:57:49.788296072 +0100
+++ new/src/hotspot/share/gc/shared/barrierSetConfig.hpp	2018-12-17 18:57:49.301275211 +0100
@@ -48,11 +48,11 @@
 #ifdef SUPPORT_BARRIER_ON_PRIMITIVES
 #define ACCESS_PRIMITIVE_SUPPORT INTERNAL_BT_BARRIER_ON_PRIMITIVES
 #else
-#define ACCESS_PRIMITIVE_SUPPORT INTERNAL_EMPTY
+#define ACCESS_PRIMITIVE_SUPPORT DECORATORS_NONE
 #endif
 
 #ifdef SUPPORT_NOT_TO_SPACE_INVARIANT
-#define ACCESS_TO_SPACE_INVARIANT_SUPPORT INTERNAL_EMPTY
+#define ACCESS_TO_SPACE_INVARIANT_SUPPORT DECORATORS_NONE
 #else
 #define ACCESS_TO_SPACE_INVARIANT_SUPPORT INTERNAL_BT_TO_SPACE_INVARIANT
 #endif