diff options
author | Aditya Mandaleeka <adityam@microsoft.com> | 2017-04-11 17:50:13 -0700 |
---|---|---|
committer | Aditya Mandaleeka <adityam@microsoft.com> | 2017-04-11 18:29:32 -0700 |
commit | 6f013232079c2a2dd9f0f58362443b5ec5b43c15 (patch) | |
tree | fabca6be1e28be9d830506c428f4c7d0cc58c341 | |
parent | dcc8141160f4145e3feb6b2dac3b6f67042ecf92 (diff) | |
download | coreclr-6f013232079c2a2dd9f0f58362443b5ec5b43c15.tar.gz coreclr-6f013232079c2a2dd9f0f58362443b5ec5b43c15.tar.bz2 coreclr-6f013232079c2a2dd9f0f58362443b5ec5b43c15.zip |
Replace GetHandleTableContext with GetHandleContext.
-rw-r--r-- | src/gc/gchandletable.cpp | 4 | ||||
-rw-r--r-- | src/gc/gchandletableimpl.h | 2 | ||||
-rw-r--r-- | src/gc/gcinterface.h | 2 | ||||
-rw-r--r-- | src/vm/gcheaputilities.cpp | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/gc/gchandletable.cpp b/src/gc/gchandletable.cpp index accc72d863..77c1ad19fe 100644 --- a/src/gc/gchandletable.cpp +++ b/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/gc/gchandletableimpl.h b/src/gc/gchandletableimpl.h index 350ae58197..df803a2c4f 100644 --- a/src/gc/gchandletableimpl.h +++ b/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/gc/gcinterface.h b/src/gc/gcinterface.h index b10e081fa4..7c62a82135 100644 --- a/src/gc/gcinterface.h +++ b/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/vm/gcheaputilities.cpp b/src/vm/gcheaputilities.cpp index e63655d363..e15558335e 100644 --- a/src/vm/gcheaputilities.cpp +++ b/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); |