--- a/hotspot/src/share/vm/gc/g1/g1MarkSweep.hpp	Thu Feb 23 15:59:14 2017 -0500
+++ b/hotspot/src/share/vm/gc/g1/g1MarkSweep.hpp	Wed Dec 07 13:51:20 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,23 +55,7 @@
   static STWGCTimer* gc_timer() { return GenMarkSweep::_gc_timer; }
   static SerialOldTracer* gc_tracer() { return GenMarkSweep::_gc_tracer; }
 
-  // Create the _archive_region_map which is used to identify archive objects.
-  static void enable_archive_object_check();
-
-  // Set the regions containing the specified address range as archive/non-archive.
-  static void set_range_archive(MemRegion range, bool is_archive);
-
-  // Check if an object is in an archive region using the _archive_region_map.
-  static bool in_archive_range(oop object);
-
-  // Check if archive object checking is enabled, to avoid calling in_archive_range
-  // unnecessarily.
-  static bool archive_check_enabled() { return G1MarkSweep::_archive_check_enabled; }
-
- private:
-  static bool _archive_check_enabled;
-  static G1ArchiveRegionMap  _archive_region_map;
-
+private:
   // Mark live objects
   static void mark_sweep_phase1(bool& marked_for_deopt,
                                 bool clear_all_softrefs);
@@ -109,12 +93,4 @@
   bool doHeapRegion(HeapRegion* hr);
 };
 
-// G1ArchiveRegionMap is a boolean array used to mark G1 regions as
-// archive regions.  This allows a quick check for whether an object
-// should not be marked because it is in an archive region.
-class G1ArchiveRegionMap : public G1BiasedMappedArray<bool> {
-protected:
-  bool default_value() const { return false; }
-};
-
 #endif // SHARE_VM_GC_G1_G1MARKSWEEP_HPP