From c9e778eb8b0de5e8ed1496ee0592d1b6035508d2 Mon Sep 17 00:00:00 2001 From: Jb Evain Date: Tue, 12 May 2026 21:58:27 -0700 Subject: [PATCH] Fix NativeAOT dependent handle secondary access with standalone GC --- src/coreclr/nativeaot/Runtime/HandleTableHelpers.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/coreclr/nativeaot/Runtime/HandleTableHelpers.cpp b/src/coreclr/nativeaot/Runtime/HandleTableHelpers.cpp index 7cf154d29c0cb3..285b5555274fd8 100644 --- a/src/coreclr/nativeaot/Runtime/HandleTableHelpers.cpp +++ b/src/coreclr/nativeaot/Runtime/HandleTableHelpers.cpp @@ -36,14 +36,14 @@ FCIMPLEND FCIMPL2(Object *, RhHandleGetDependent, OBJECTHANDLE handle, Object **ppSecondary) { Object *pPrimary = ObjectFromHandle(handle); - *ppSecondary = (pPrimary != NULL) ? GetDependentHandleSecondary(handle) : NULL; + *ppSecondary = (pPrimary != NULL) ? GCHandleUtilities::GetGCHandleManager()->GetDependentHandleSecondary(handle) : NULL; return pPrimary; } FCIMPLEND FCIMPL2(void, RhHandleSetDependentSecondary, OBJECTHANDLE handle, Object *pSecondary) { - SetDependentHandleSecondary(handle, pSecondary); + GCHandleUtilities::GetGCHandleManager()->SetDependentHandleSecondary(handle, pSecondary); } FCIMPLEND