diff -r fe95464806a7 -r 74b616640b00 src/hotspot/share/runtime/safepoint.hpp
--- a/src/hotspot/share/runtime/safepoint.hpp	Wed Feb 20 14:30:33 2019 +0100
+++ b/src/hotspot/share/runtime/safepoint.hpp	Wed Feb 20 08:31:40 2019 -0500
@@ -197,7 +197,7 @@
   assert(!SafepointSynchronize::is_at_safepoint(), __VA_ARGS__)
 
 // State class for a thread suspended at a safepoint
-class ThreadSafepointState: public CHeapObj<mtInternal> {
+class ThreadSafepointState: public CHeapObj<mtThread> {
  private:
   // At polling page safepoint (NOT a poll return safepoint):
   volatile bool                   _at_poll_safepoint;