--- old/src/hotspot/share/utilities/hashtable.cpp	2018-01-15 16:24:17.488921472 -0800
+++ new/src/hotspot/share/utilities/hashtable.cpp	2018-01-15 16:24:17.072905712 -0800
@@ -32,7 +32,7 @@
 #include "classfile/protectionDomainCache.hpp"
 #include "classfile/stringTable.hpp"
 #include "memory/allocation.inline.hpp"
-#include "memory/filemap.hpp"
+#include "memory/metaspaceShared.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/oop.inline.hpp"
 #include "runtime/safepoint.hpp"
@@ -161,8 +161,7 @@
   if (NULL != _buckets) {
     // Don't delete the buckets in the shared space.  They aren't
     // allocated by os::malloc
-    if (!UseSharedSpaces ||
-        !FileMapInfo::current_info()->is_in_shared_space(_buckets)) {
+    if (!MetaspaceShared::is_in_shared_metaspace(_buckets)) {
        FREE_C_HEAP_ARRAY(HashtableBucket, _buckets);
     }
     _buckets = NULL;