Build failure after JDK-8230003

In file included from /home/rehn/source/jdk/dev-jdk/open/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp:31:
/home/rehn/source/jdk/dev-jdk/open/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp: In member function ‘void ShenandoahRootVerifier::oops_do(OopClosure*)’:
/home/rehn/source/jdk/dev-jdk/open/src/hotspot/share/gc/shenandoah/shenandoahRootVerifier.cpp:69:43: error: invalid conversion from ‘Mutex*’ to ‘const Monitor*’ [-fpermissive]
     shenandoah_assert_locked_or_safepoint(ClassLoaderDataGraph_lock);
                                           ^~~~~~~~~~~~~~~~~~~~~~~~~
/home/rehn/source/jdk/dev-jdk/open/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp:135:78: note: in definition of macro ‘shenandoah_assert_locked_or_safepoint’
                     ShenandoahAsserts::assert_locked_or_shenandoah_safepoint(lock, __FILE__, __LINE__);
                                                                              ^~~~
/home/rehn/source/jdk/dev-jdk/open/src/hotspot/share/gc/shenandoah/shenandoahAsserts.hpp:69:68: note: initializing argument 1 of ‘static void ShenandoahAsserts::assert_locked_or_shenandoah_safepoint(const Monitor*, const char*, int)’
   static void assert_locked_or_shenandoah_safepoint(const Monitor* lock, const char*file, int line);
                                                     ~~~~~~~~~~~~~~~^~~~
gmake[3]: *** [lib/CompileJvm.gmk:178: /home/rehn/source/jdk/dev-jdk/build/linux-x86_64-server-fastdebug/hotspot/variant-server/libjvm/objs/shenandoahRootVerifier.o] Error 1
gmake[3]: *** Waiting for unfinished jobs....
gmake[2]: *** [make/Main.gmk:253: hotspot-server-libs] Error 2