8332042: Move MEMFLAGS to its own include file

src/hotspot/share/nmt/mallocHeader.cpp

@@ -26,11 +26,17 @@
 
 #include "nmt/mallocHeader.inline.hpp"
 #include "nmt/mallocSiteTable.hpp"
+#include "nmt/memflags.hpp"
 #include "runtime/os.hpp"
+#include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 #include "utilities/nativeCallStack.hpp"
 #include "utilities/ostream.hpp"
 
+// The malloc header, as well as the coming VMATree implementation, rely on MEMFLAGS
+// fitting into eight bits.
+STATIC_ASSERT(sizeof(MEMFLAGS) == sizeof(uint8_t));
+
 void MallocHeader::print_block_on_error(outputStream* st, address bad_address) const {
   assert(bad_address >= (address)this, "sanity");
 

src/hotspot/share/nmt/mallocTracker.hpp

@@ -26,8 +26,8 @@
 #ifndef SHARE_NMT_MALLOCTRACKER_HPP
 #define SHARE_NMT_MALLOCTRACKER_HPP
 
-#include "nmt/memflags.hpp"
 #include "nmt/mallocHeader.hpp"
+#include "nmt/memflags.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "runtime/atomic.hpp"
 #include "runtime/threadCritical.hpp"

src/hotspot/share/services/mallocLimit.cpp

@@ -24,7 +24,6 @@
  */
 
 #include "precompiled.hpp"
-
 #include "nmt/memflags.hpp"
 #include "nmt/nmtCommon.hpp"
 #include "runtime/java.hpp"