--- old/src/hotspot/share/gc/shenandoah/shenandoahConcurrentRoots.cpp 2020-05-01 02:26:01.036140223 -0700 +++ new/src/hotspot/share/gc/shenandoah/shenandoahConcurrentRoots.cpp 2020-05-01 02:26:00.648132760 -0700 @@ -37,7 +37,7 @@ } bool ShenandoahConcurrentRoots::can_do_concurrent_class_unloading() { -#if (defined(X86) || defined(AARCH64)) && !defined(SOLARIS) +#if (defined(X86) || defined(AARCH64)) return ShenandoahCodeRootsStyle == 2 && ClassUnloading; #else