--- old/src/share/vm/gc/shared/workgroup.hpp	2015-09-09 16:12:53.191861780 +0200
+++ new/src/share/vm/gc/shared/workgroup.hpp	2015-09-09 16:12:53.079861784 +0200
@@ -28,7 +28,6 @@
 #include "memory/allocation.hpp"
 #include "runtime/globals.hpp"
 #include "runtime/thread.hpp"
-#include "gc/shared/gcId.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
@@ -55,13 +54,9 @@
 // You subclass this to supply your own work() method
 class AbstractGangTask VALUE_OBJ_CLASS_SPEC {
   const char* _name;
-  const uint _gc_id;
 
  public:
-  AbstractGangTask(const char* name) :
-    _name(name),
-    _gc_id(GCId::current_raw()) // Use current_raw() here since the G1ParVerifyTask can be called outside of a GC (at VM exit)
- {}
+  AbstractGangTask(const char* name) : _name(name) {}
 
   // The abstract work method.
   // The argument tells you which member of the gang you are.
@@ -69,7 +64,6 @@
 
   // Debugging accessor for the name.
   const char* name() const { return _name; }
-  const uint gc_id() const { return _gc_id; }
 };
 
 struct WorkData {