--- old/src/hotspot/share/gc/z/zRootsIterator.hpp 2020-06-23 10:06:47.452663372 +0200
+++ new/src/hotspot/share/gc/z/zRootsIterator.hpp 2020-06-23 10:06:47.296657930 +0200
@@ -25,6 +25,7 @@
#define SHARE_GC_Z_ZROOTSITERATOR_HPP
#include "gc/shared/oopStorageParState.hpp"
+#include "gc/shared/oopStorageSetParState.hpp"
#include "gc/shared/suspendibleThreadSet.hpp"
#include "memory/allocation.hpp"
#include "memory/iterator.hpp"
@@ -35,6 +36,7 @@
class ZRootsIteratorClosure;
typedef OopStorage::ParState ZOopStorageIterator;
+typedef OopStorageSetStrongParState ZOopStorageSetIterator;
template
class ZSerialOopsDo {
@@ -134,16 +136,13 @@
class ZConcurrentRootsIterator {
private:
- ZOopStorageIterator _jni_handles_iter;
- ZOopStorageIterator _vm_handles_iter;
- const int _cld_claim;
+ ZOopStorageSetIterator _oop_storage_set_iter;
+ const int _cld_claim;
- void do_jni_handles(ZRootsIteratorClosure* cl);
- void do_vm_handles(ZRootsIteratorClosure* cl);
+ void do_oop_storage_set(ZRootsIteratorClosure* cl);
void do_class_loader_data_graph(ZRootsIteratorClosure* cl);
- ZParallelOopsDo _jni_handles;
- ZParallelOopsDo _vm_handles;
+ ZParallelOopsDo _oop_storage_set;
ZParallelOopsDo _class_loader_data_graph;
public: