--- a/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp	Mon Jun 10 09:41:09 2019 -0700
+++ b/src/hotspot/share/gc/shenandoah/shenandoahCodeRoots.hpp	Mon Jun 10 13:42:11 2019 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Red Hat, Inc. All rights reserved.
+ * Copyright (c) 2017, 2019, Red Hat, Inc. All rights reserved.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
@@ -122,7 +122,7 @@
   void possibly_parallel_blobs_do(CodeBlobClosure* f);
 };
 
-class ShenandoahCodeRoots : public CHeapObj<mtGC> {
+class ShenandoahCodeRoots : public AllStatic {
   friend class ShenandoahHeap;
   friend class ShenandoahCodeRootsIterator;