--- a/hotspot/src/share/vm/gc/shared/gcId.hpp	Thu Oct 08 22:35:20 2015 +0200
+++ b/hotspot/src/share/vm/gc/shared/gcId.hpp	Thu Oct 08 12:44:12 2015 +0200
@@ -29,6 +29,7 @@
 
 class GCId : public AllStatic {
   friend class GCIdMark;
+  friend class GCIdMarkAndRestore;
   static uint _next_id;
   static const uint UNDEFINED = (uint)-1;
   static const uint create();
@@ -49,4 +50,12 @@
   ~GCIdMark();
 };
 
+class GCIdMarkAndRestore : public StackObj {
+  uint _gc_id;
+  uint _previous_gc_id;
+ public:
+  GCIdMarkAndRestore();
+  ~GCIdMarkAndRestore();
+};
+
 #endif // SHARE_VM_GC_SHARED_GCID_HPP