--- old/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	2019-03-13 09:15:53.932257653 +0100
+++ new/src/hotspot/share/gc/parallel/parallelScavengeHeap.cpp	2019-03-13 09:15:53.352248047 +0100
@@ -151,16 +151,13 @@
 
 }
 
-namespace {
-  class PSIsScavengable : public BoolObjectClosure {
-    bool do_object_b(oop obj) {
-      return ParallelScavengeHeap::heap()->is_in_young(obj);
-    }
-  };
-
-  PSIsScavengable _is_scavengable;
-}
+class PSIsScavengable : public BoolObjectClosure {
+  bool do_object_b(oop obj) {
+    return ParallelScavengeHeap::heap()->is_in_young(obj);
+  }
+};
 
+static PSIsScavengable _is_scavengable;
 
 void ParallelScavengeHeap::post_initialize() {
   CollectedHeap::post_initialize();
--- old/src/hotspot/share/gc/shared/genCollectedHeap.cpp	2019-03-13 09:15:54.668269841 +0100
+++ new/src/hotspot/share/gc/shared/genCollectedHeap.cpp	2019-03-13 09:15:54.076260037 +0100
@@ -176,16 +176,14 @@
   return heap_rs->base();
 }
 
-namespace {
-  class GenIsScavengable : public BoolObjectClosure {
-  public:
-    bool do_object_b(oop obj) {
-      return GenCollectedHeap::heap()->is_in_young(obj);
-    }
-  };
+class GenIsScavengable : public BoolObjectClosure {
+public:
+  bool do_object_b(oop obj) {
+    return GenCollectedHeap::heap()->is_in_young(obj);
+  }
+};
 
-  GenIsScavengable _is_scavengable;
-}
+static GenIsScavengable _is_scavengable;
 
 void GenCollectedHeap::post_initialize() {
   CollectedHeap::post_initialize();
--- old/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java	2019-03-13 09:15:55.412282162 +0100
+++ new/test/hotspot/jtreg/serviceability/sa/ClhsdbPrintStatics.java	2019-03-13 09:15:54.820272358 +0100
@@ -60,8 +60,7 @@
                     "ClassLoaderDataGraph::_head",
                     "JNIHandles::_weak_global_handles", "PerfMemory::_top",
                     "ObjectSynchronizer::gBlockList",
-                    "java_lang_Class::_oop_size_offset",
-                    "CodeCache::_scavenge_root_nmethods"));
+                    "java_lang_Class::_oop_size_offset"));
             expStrMap.put("printstatics SystemDictionary", List.of(
                     "Static fields of SystemDictionary",
                     "SystemDictionary::Class_klass_knum",