summaryrefslogtreecommitdiff
path: root/src/vm/proftoeeinterfaceimpl.cpp
diff options
context:
space:
mode:
authorDavid Wrighton <davidwr@microsoft.com>2019-04-24 17:01:31 -0700
committerGitHub <noreply@github.com>2019-04-24 17:01:31 -0700
commit4a2654124ecf38300a717db79926334703abeb70 (patch)
tree3a1ef48777671541574388420eb3411c38795205 /src/vm/proftoeeinterfaceimpl.cpp
parente9691546d308fde4e56cc821f8c9bfda7e9a8b91 (diff)
downloadcoreclr-4a2654124ecf38300a717db79926334703abeb70.tar.gz
coreclr-4a2654124ecf38300a717db79926334703abeb70.tar.bz2
coreclr-4a2654124ecf38300a717db79926334703abeb70.zip
More multi-appdomain support removal (#23921)
More multi-appdomain support removal - Remove DomainLocalBlock - Remove DomainModule - Remove FindDomain(File/Module/Assembly) - Remove GetDomainModule - Remove variants of GetDomain(File/Assembly) that take AppDomain parameter - Adjust contracts to be less strict - GetDomainFile/Assembly no longer need a complex contract as multi-domain support does not exist - Eliminiate uses of encoded ModuleID
Diffstat (limited to 'src/vm/proftoeeinterfaceimpl.cpp')
-rw-r--r--src/vm/proftoeeinterfaceimpl.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/vm/proftoeeinterfaceimpl.cpp b/src/vm/proftoeeinterfaceimpl.cpp
index 663b82f403..e66329832b 100644
--- a/src/vm/proftoeeinterfaceimpl.cpp
+++ b/src/vm/proftoeeinterfaceimpl.cpp
@@ -3113,7 +3113,7 @@ HRESULT ProfToEEInterfaceImpl::GetRVAStaticAddress(ClassID classId,
//
// Check that the data is available
//
- if (!IsClassOfMethodTableInited(pMethodTable, GetAppDomain()))
+ if (!IsClassOfMethodTableInited(pMethodTable))
{
return CORPROF_E_DATAINCOMPLETE;
}
@@ -3170,7 +3170,7 @@ HRESULT ProfToEEInterfaceImpl::GetAppDomainStaticAddress(ClassID classId,
// Yay!
EE_THREAD_NOT_REQUIRED;
- // FieldDesc::GetStaticAddress & FieldDesc::GetBaseInDomain take locks
+ // FieldDesc::GetStaticAddress & FieldDesc::GetBase take locks
CAN_TAKE_LOCK;
}
@@ -3251,7 +3251,7 @@ HRESULT ProfToEEInterfaceImpl::GetAppDomainStaticAddress(ClassID classId,
//
// Check that the data is available
//
- if (!IsClassOfMethodTableInited(pMethodTable, pAppDomain))
+ if (!IsClassOfMethodTableInited(pMethodTable))
{
return CORPROF_E_DATAINCOMPLETE;
}
@@ -3259,7 +3259,7 @@ HRESULT ProfToEEInterfaceImpl::GetAppDomainStaticAddress(ClassID classId,
//
// Get the address
//
- void *base = (void*)pFieldDesc->GetBaseInDomain(pAppDomain);
+ void *base = (void*)pFieldDesc->GetBase();
if (base == NULL)
{
@@ -3466,12 +3466,11 @@ HRESULT ProfToEEInterfaceImpl::GetThreadStaticAddress2(ClassID classId,
// It may seem redundant to try to retrieve the same method table from GetEnclosingMethodTable, but classId
// leads to the instantiated method table while GetEnclosingMethodTable returns the uninstantiated one.
MethodTable *pMethodTable = pFieldDesc->GetEnclosingMethodTable();
- AppDomain * pAppDomain = (AppDomain *)appDomainId;
//
// Check that the data is available
//
- if (!IsClassOfMethodTableInited(pMethodTable, pAppDomain))
+ if (!IsClassOfMethodTableInited(pMethodTable))
{
return CORPROF_E_DATAINCOMPLETE;
}