From 725896faeecb0c860bbc7186156f0e42c7601903 Mon Sep 17 00:00:00 2001 From: Salman Rana Date: Thu, 15 Jun 2023 14:51:12 -0400 Subject: [PATCH] initializeGCParameters For CRIU Restore Required for downstream OpenJ9 Changes. See https://github.com/eclipse-openj9/openj9/pull/17459#discussion_r1231139601 Signed-off-by: Salman Rana --- gc/base/Configuration.hpp | 4 ++-- gc/base/standard/ConfigurationStandard.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gc/base/Configuration.hpp b/gc/base/Configuration.hpp index 2bfc55e86cc..21bacbc7f99 100644 --- a/gc/base/Configuration.hpp +++ b/gc/base/Configuration.hpp @@ -180,8 +180,8 @@ class MM_Configuration : public MM_BaseVirtual */ virtual bool reinitializeForRestore(MM_EnvironmentBase* env) { - Assert_MM_unreachable(); - return false; + initializeGCParameters(env); + return true; } #endif /* defined(J9VM_OPT_CRIU_SUPPORT) */ diff --git a/gc/base/standard/ConfigurationStandard.cpp b/gc/base/standard/ConfigurationStandard.cpp index 255e92fcdad..92e6265e917 100644 --- a/gc/base/standard/ConfigurationStandard.cpp +++ b/gc/base/standard/ConfigurationStandard.cpp @@ -340,6 +340,8 @@ MM_ConfigurationStandard::reinitializeForRestore(MM_EnvironmentBase* env) { MM_GCExtensionsBase* extensions = env->getExtensions(); + MM_Configuration::reinitializeForRestore(env); + MM_MemoryPool *memoryPool; MM_HeapMemoryPoolIterator poolIterator(env, extensions->heap);