--- old/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp	2020-01-24 15:21:06.204507541 +0100
+++ new/src/hotspot/share/gc/shenandoah/shenandoahCollectionSet.inline.hpp	2020-01-24 15:21:05.992503978 +0100
@@ -39,9 +39,9 @@
   return is_in(r->region_number());
 }
 
-bool ShenandoahCollectionSet::is_in(oop p) const {
+bool ShenandoahCollectionSet::is_in(HeapWord* p) const {
   assert(_heap->is_in(p), "Must be in the heap");
-  uintx index = (cast_from_oop<uintx>(p)) >> _region_size_bytes_shift;
+  uintx index = ((uintx) p) >> _region_size_bytes_shift;
   // no need to subtract the bottom of the heap from p,
   // _biased_cset_map is biased
   return _biased_cset_map[index] == 1;