OpenJDK / jdk / jdk
changeset 56054:2227a0cfd6b3
8229998: Build failure after JDK-8227054
Reviewed-by: rkennke, zgu
| author | shade |
|---|---|
| date | Thu, 22 Aug 2019 13:47:14 +0200 |
| parents | e70dec4229e9 |
| children | 78844dceede6 |
| files | src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp |
| diffstat | 1 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp Thu Aug 22 13:47:13 2019 +0200 +++ b/src/hotspot/share/gc/shenandoah/shenandoahRootProcessor.inline.hpp Thu Aug 22 13:47:14 2019 +0200 @@ -71,10 +71,10 @@ template <bool CONCURRENT> ShenandoahWeakRoots<CONCURRENT>::ShenandoahWeakRoots() : - _jni_roots(JNIHandles::weak_global_handles(), ShenandoahPhaseTimings::JNIWeakRoots), - _string_table_roots(StringTable::weak_storage(), ShenandoahPhaseTimings::StringTableRoots), - _resolved_method_table_roots(ResolvedMethodTable::weak_storage(), ShenandoahPhaseTimings::ResolvedMethodTableRoots), - _vm_roots(SystemDictionary::vm_weak_oop_storage(), ShenandoahPhaseTimings::VMWeakRoots) { + _jni_roots(OopStorageSet::jni_weak(), ShenandoahPhaseTimings::JNIWeakRoots), + _string_table_roots(OopStorageSet::string_table_weak(), ShenandoahPhaseTimings::StringTableRoots), + _resolved_method_table_roots(OopStorageSet::resolved_method_table_weak(), ShenandoahPhaseTimings::ResolvedMethodTableRoots), + _vm_roots(OopStorageSet::vm_weak(), ShenandoahPhaseTimings::VMWeakRoots) { } template <bool CONCURRENT> @@ -87,10 +87,10 @@ } inline ShenandoahWeakRoots<false /* concurrent */>::ShenandoahWeakRoots() : - _jni_roots(JNIHandles::weak_global_handles(), ShenandoahPhaseTimings::JNIWeakRoots), - _string_table_roots(StringTable::weak_storage(), ShenandoahPhaseTimings::StringTableRoots), - _resolved_method_table_roots(ResolvedMethodTable::weak_storage(), ShenandoahPhaseTimings::ResolvedMethodTableRoots), - _vm_roots(SystemDictionary::vm_weak_oop_storage(), ShenandoahPhaseTimings::VMWeakRoots) { + _jni_roots(OopStorageSet::jni_weak(), ShenandoahPhaseTimings::JNIWeakRoots), + _string_table_roots(OopStorageSet::string_table_weak(), ShenandoahPhaseTimings::StringTableRoots), + _resolved_method_table_roots(OopStorageSet::resolved_method_table_weak(), ShenandoahPhaseTimings::ResolvedMethodTableRoots), + _vm_roots(OopStorageSet::vm_weak(), ShenandoahPhaseTimings::VMWeakRoots) { } template <typename IsAliveClosure, typename KeepAliveClosure> @@ -109,8 +109,8 @@ template <bool CONCURRENT> ShenandoahVMRoots<CONCURRENT>::ShenandoahVMRoots() : - _jni_handle_roots(JNIHandles::global_handles(), ShenandoahPhaseTimings::JNIRoots), - _vm_global_roots(SystemDictionary::vm_global_oop_storage(), ShenandoahPhaseTimings::VMGlobalRoots) { + _jni_handle_roots(OopStorageSet::jni_global(), ShenandoahPhaseTimings::JNIRoots), + _vm_global_roots(OopStorageSet::vm_global(), ShenandoahPhaseTimings::VMGlobalRoots) { } template <bool CONCURRENT>