From a2d9aab59fa071d24550b3be5b361d8e75918487 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Tue, 11 Apr 2017 17:50:13 -0700 Subject: [PATCH] Replace GetHandleTableContext with GetHandleContext. Commit migrated from https://github.com/dotnet/coreclr/commit/6f013232079c2a2dd9f0f58362443b5ec5b43c15 --- src/coreclr/src/gc/gchandletable.cpp | 4 ++-- src/coreclr/src/gc/gchandletableimpl.h | 2 +- src/coreclr/src/gc/gcinterface.h | 2 +- src/coreclr/src/vm/gcheaputilities.cpp | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/coreclr/src/gc/gchandletable.cpp b/src/coreclr/src/gc/gchandletable.cpp index accc72d..77c1ad1 100644 --- a/src/coreclr/src/gc/gchandletable.cpp +++ b/src/coreclr/src/gc/gchandletable.cpp @@ -23,9 +23,9 @@ void GCHandleTable::Shutdown() Ref_Shutdown(); } -void* GCHandleTable::GetHandleTableContext(void* handleTable) +void* GCHandleTable::GetHandleContext(OBJECTHANDLE handle) { - return (void*)((uintptr_t)::HndGetHandleTableADIndex((HHANDLETABLE)handleTable).m_dwIndex); + return (void*)((uintptr_t)::HndGetHandleTableADIndex(::HndGetHandleTable(handle)).m_dwIndex); } void* GCHandleTable::GetHandleTableForHandle(OBJECTHANDLE handle) diff --git a/src/coreclr/src/gc/gchandletableimpl.h b/src/coreclr/src/gc/gchandletableimpl.h index 350ae58..df803a2 100644 --- a/src/coreclr/src/gc/gchandletableimpl.h +++ b/src/coreclr/src/gc/gchandletableimpl.h @@ -14,7 +14,7 @@ public: virtual void Shutdown(); - virtual void* GetHandleTableContext(void* handleTable); + virtual void* GetHandleContext(OBJECTHANDLE handle); virtual void* GetHandleTableForHandle(OBJECTHANDLE handle); diff --git a/src/coreclr/src/gc/gcinterface.h b/src/coreclr/src/gc/gcinterface.h index b10e081..7c62a821 100644 --- a/src/coreclr/src/gc/gcinterface.h +++ b/src/coreclr/src/gc/gcinterface.h @@ -409,7 +409,7 @@ public: virtual void Shutdown() = 0; - virtual void* GetHandleTableContext(void* handleTable) = 0; + virtual void* GetHandleContext(OBJECTHANDLE handle) = 0; virtual void* GetHandleTableForHandle(OBJECTHANDLE handle) = 0; diff --git a/src/coreclr/src/vm/gcheaputilities.cpp b/src/coreclr/src/vm/gcheaputilities.cpp index e63655d..e1555833 100644 --- a/src/coreclr/src/vm/gcheaputilities.cpp +++ b/src/coreclr/src/vm/gcheaputilities.cpp @@ -48,8 +48,7 @@ void ValidateHandleAndAppDomain(OBJECTHANDLE handle) IGCHandleTable *pHandleTable = GCHandleTableUtilities::GetGCHandleTable(); - void* handleTable = pHandleTable->GetHandleTableForHandle(handle); - DWORD context = (DWORD)pHandleTable->GetHandleTableContext(handleTable); + DWORD context = (DWORD)pHandleTable->GetHandleContext(handle); ADIndex appDomainIndex = ADIndex(context); AppDomain *domain = SystemDomain::GetAppDomainAtIndex(appDomainIndex); -- 2.7.4