|
28 | 28 | #include "classfile/symbolTable.hpp" |
29 | 29 | #include "classfile/systemDictionary.hpp" |
30 | 30 | #include "code/codeCache.hpp" |
| 31 | +#include "code/nmethod.hpp" |
31 | 32 | #include "compiler/oopMap.hpp" |
32 | 33 | #include "gc/parallel/objectStartArray.inline.hpp" |
33 | 34 | #include "gc/parallel/parallelArguments.hpp" |
|
61 | 62 | #include "gc/shared/referenceProcessor.hpp" |
62 | 63 | #include "gc/shared/referenceProcessorPhaseTimes.hpp" |
63 | 64 | #include "gc/shared/spaceDecorator.hpp" |
64 | | -#include "gc/shared/strongRootsScope.hpp" |
65 | 65 | #include "gc/shared/taskTerminator.hpp" |
66 | 66 | #include "gc/shared/weakProcessor.inline.hpp" |
67 | 67 | #include "gc/shared/workerPolicy.hpp" |
@@ -1085,15 +1085,17 @@ void steal_marking_work(TaskTerminator& terminator, uint worker_id) { |
1085 | 1085 | } |
1086 | 1086 |
|
1087 | 1087 | class MarkFromRootsTask : public WorkerTask { |
1088 | | - StrongRootsScope _strong_roots_scope; // needed for Threads::possibly_parallel_threads_do |
| 1088 | + NMethodMarkingScope _nmethod_marking_scope; |
| 1089 | + ThreadsClaimTokenScope _threads_claim_token_scope; |
1089 | 1090 | OopStorageSetStrongParState<false /* concurrent */, false /* is_const */> _oop_storage_set_par_state; |
1090 | 1091 | TaskTerminator _terminator; |
1091 | 1092 | uint _active_workers; |
1092 | 1093 |
|
1093 | 1094 | public: |
1094 | 1095 | MarkFromRootsTask(uint active_workers) : |
1095 | 1096 | WorkerTask("MarkFromRootsTask"), |
1096 | | - _strong_roots_scope(active_workers), |
| 1097 | + _nmethod_marking_scope(), |
| 1098 | + _threads_claim_token_scope(), |
1097 | 1099 | _terminator(active_workers, ParCompactionManager::marking_stacks()), |
1098 | 1100 | _active_workers(active_workers) {} |
1099 | 1101 |
|
|
0 commit comments