--- a/src/hotspot/share/oops/access.hpp	Tue Jun 26 13:50:59 2018 -0700
+++ b/src/hotspot/share/oops/access.hpp	Tue Jun 26 16:59:38 2018 -0400
@@ -375,8 +375,7 @@
   const DecoratorSet location_decorators = decorators & IN_DECORATOR_MASK;
   STATIC_ASSERT(location_decorators == 0 || ( // make sure location decorators are disjoint if set
     (location_decorators ^ IN_NATIVE) == 0 ||
-    (location_decorators ^ IN_HEAP) == 0 ||
-    (location_decorators ^ (IN_NATIVE | IN_CONCURRENT_ROOT)) == 0
+    (location_decorators ^ IN_HEAP) == 0
   ));
 }