Merge pull request #20866 from dmitripivkine/master

GlobalCollectorDelegate::tearDown() shouldn't use local _extensions
eclipse-openj9 · Dec 22, 2024 · ac8d68f · ac8d68f
2 parents 63a354b + 6c27991
commit ac8d68f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/runtime/gc_glue_java/GlobalCollectorDelegate.cpp b/runtime/gc_glue_java/GlobalCollectorDelegate.cpp
@@ -121,9 +121,10 @@ MM_GlobalCollectorDelegate::initialize(MM_EnvironmentBase *env, MM_GlobalCollect
 void
 MM_GlobalCollectorDelegate::tearDown(MM_EnvironmentBase *env)
 {
-	if (_extensions->isStandardGC() && (NULL != _extensions->accessBarrier)) {
-		_extensions->accessBarrier->kill(env);
-		_extensions->accessBarrier = NULL;
+	MM_GCExtensions *extensions = MM_GCExtensions::getExtensions(env);
+	if (extensions->isStandardGC() && (NULL != extensions->accessBarrier)) {
+		extensions->accessBarrier->kill(env);
+		extensions->accessBarrier = NULL;
 	}
 }