8265012: Shenandoah: Backout JDK-8264718
Reviewed-by: shade
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
index a9b1918..38c4adf 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentMark.cpp
@@ -191,13 +191,8 @@
void ShenandoahMarkConcurrentRootsTask::work(uint worker_id) {
ShenandoahConcurrentWorkerSession worker_session(worker_id);
ShenandoahObjToScanQueue* q = _queue_set->queue(worker_id);
- if (ShenandoahStringDedup::is_enabled()) {
- ShenandoahMarkRefsDedupClosure cl(q, _rp);
- _root_scanner.roots_do(&cl, worker_id);
- } else {
- ShenandoahMarkRefsClosure cl(q, _rp);
- _root_scanner.roots_do(&cl, worker_id);
- }
+ ShenandoahMarkRefsClosure cl(q, _rp);
+ _root_scanner.roots_do(&cl, worker_id);
}
void ShenandoahConcurrentMark::mark_concurrent_roots() {
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp
index bdf1bc2..85499b1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.cpp
@@ -41,6 +41,11 @@
_weak(false)
{ }
+ShenandoahInitMarkRootsClosure::ShenandoahInitMarkRootsClosure(ShenandoahObjToScanQueue* q) :
+ _queue(q),
+ _mark_context(ShenandoahHeap::heap()->marking_context()) {
+}
+
ShenandoahMark::ShenandoahMark() :
_task_queues(ShenandoahHeap::heap()->marking_context()->task_queues()) {
}
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp
index 4ee242f..9fea8f8 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.hpp
@@ -31,6 +31,21 @@
class ShenandoahCMDrainMarkingStackClosure;
+class ShenandoahInitMarkRootsClosure : public OopClosure {
+private:
+ ShenandoahObjToScanQueue* const _queue;
+ ShenandoahMarkingContext* const _mark_context;
+
+ template <class T>
+ inline void do_oop_work(T* p);
+
+public:
+ ShenandoahInitMarkRootsClosure(ShenandoahObjToScanQueue* q);
+
+ void do_oop(narrowOop* p) { do_oop_work(p); }
+ void do_oop(oop* p) { do_oop_work(p); }
+};
+
// Base class for mark
// Mark class does not maintain states. Instead, mark states are
// maintained by task queues, mark bitmap and SATB buffers (concurrent mark)
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp
index 40d740a..4d10a42 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahMark.inline.hpp
@@ -40,6 +40,11 @@
#include "utilities/powerOfTwo.hpp"
template <class T>
+void ShenandoahInitMarkRootsClosure::do_oop_work(T* p) {
+ ShenandoahMark::mark_through_ref<T, NO_DEDUP>(p, _queue, _mark_context, false);
+}
+
+template <class T>
void ShenandoahMark::do_task(ShenandoahObjToScanQueue* q, T* cl, ShenandoahLiveData* live_data, ShenandoahMarkTask* task) {
oop obj = task->obj();
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
index 62c5e8a..dbdffd1 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahSTWMark.cpp
@@ -33,38 +33,9 @@
#include "gc/shenandoah/shenandoahOopClosures.inline.hpp"
#include "gc/shenandoah/shenandoahReferenceProcessor.hpp"
#include "gc/shenandoah/shenandoahRootProcessor.inline.hpp"
-#include "gc/shenandoah/shenandoahStringDedup.hpp"
#include "gc/shenandoah/shenandoahSTWMark.hpp"
#include "gc/shenandoah/shenandoahVerifier.hpp"
-template <StringDedupMode STRING_DEDUP>
-class ShenandoahInitMarkRootsClosure : public OopClosure {
-private:
- ShenandoahObjToScanQueue* const _queue;
- ShenandoahMarkingContext* const _mark_context;
-
- template <class T>
- inline void do_oop_work(T* p);
-
-public:
- ShenandoahInitMarkRootsClosure(ShenandoahObjToScanQueue* q);
-
- void do_oop(narrowOop* p) { do_oop_work(p); }
- void do_oop(oop* p) { do_oop_work(p); }
-};
-
-template <StringDedupMode STRING_DEDUP>
-ShenandoahInitMarkRootsClosure<STRING_DEDUP>::ShenandoahInitMarkRootsClosure(ShenandoahObjToScanQueue* q) :
- _queue(q),
- _mark_context(ShenandoahHeap::heap()->marking_context()) {
-}
-
-template <StringDedupMode STRING_DEDUP>
-template <class T>
-void ShenandoahInitMarkRootsClosure<STRING_DEDUP>::do_oop_work(T* p) {
- ShenandoahMark::mark_through_ref<T, STRING_DEDUP>(p, _queue, _mark_context, false);
-}
-
class ShenandoahSTWMarkTask : public AbstractGangTask {
private:
ShenandoahSTWMark* const _mark;
@@ -128,13 +99,8 @@
}
void ShenandoahSTWMark::mark_roots(uint worker_id) {
- if (ShenandoahStringDedup::is_enabled()) {
- ShenandoahInitMarkRootsClosure<ENQUEUE_DEDUP> init_mark(task_queues()->queue(worker_id));
- _root_scanner.roots_do(&init_mark, worker_id);
- } else {
- ShenandoahInitMarkRootsClosure<NO_DEDUP> init_mark(task_queues()->queue(worker_id));
- _root_scanner.roots_do(&init_mark, worker_id);
- }
+ ShenandoahInitMarkRootsClosure init_mark(task_queues()->queue(worker_id));
+ _root_scanner.roots_do(&init_mark, worker_id);
}
void ShenandoahSTWMark::finish_mark(uint worker_id) {
@@ -146,3 +112,4 @@
false, // not cancellable
ShenandoahStringDedup::is_enabled());
}
+
