summaryrefslogtreecommitdiff
path: root/src/debug
diff options
context:
space:
mode:
authorDavid Wrighton <davidwr@microsoft.com>2019-05-15 18:28:42 -0700
committerGitHub <noreply@github.com>2019-05-15 18:28:42 -0700
commitbdb995987178231ba541f22143cb3cab56309daa (patch)
tree655d0d0bfaee70a56c5a2b33e52fc27965314049 /src/debug
parentc2533b6c3f715b6964de5ffe0b2a2feaac42b079 (diff)
downloadcoreclr-bdb995987178231ba541f22143cb3cab56309daa.tar.gz
coreclr-bdb995987178231ba541f22143cb3cab56309daa.tar.bz2
coreclr-bdb995987178231ba541f22143cb3cab56309daa.zip
Remove concept of AppDomains from the GC (#24536)
* Remove concept of AppDomains from the GC - Leave constructs allowing for multiple handle tables, as scenarios for that have been proposed - Remove FEATURE_APPDOMAIN_RESOURCE_MONITORING
Diffstat (limited to 'src/debug')
-rw-r--r--src/debug/daccess/daccess.cpp1
-rw-r--r--src/debug/daccess/dacdbiimpl.cpp7
-rw-r--r--src/debug/daccess/gcinterface.dac.h3
3 files changed, 3 insertions, 8 deletions
diff --git a/src/debug/daccess/daccess.cpp b/src/debug/daccess/daccess.cpp
index 0d1dc56e03..08c44e2b8c 100644
--- a/src/debug/daccess/daccess.cpp
+++ b/src/debug/daccess/daccess.cpp
@@ -8472,7 +8472,6 @@ StackWalkAction DacStackReferenceWalker::Callback(CrawlFrame *pCF, VOID *pData)
MethodDesc *pMD = pCF->GetFunction();
gcctx->sc->pMD = pMD;
- gcctx->sc->pCurrentDomain = pCF->GetAppDomain();
PREGDISPLAY pRD = pCF->GetRegisterSet();
dsc->sp = (TADDR)GetRegdisplaySP(pRD);;
diff --git a/src/debug/daccess/dacdbiimpl.cpp b/src/debug/daccess/dacdbiimpl.cpp
index 4d97298838..8d02590727 100644
--- a/src/debug/daccess/dacdbiimpl.cpp
+++ b/src/debug/daccess/dacdbiimpl.cpp
@@ -5716,8 +5716,7 @@ ULONG DacDbiInterfaceImpl::GetAppDomainIdFromVmObjectHandle(VMPTR_OBJECTHANDLE v
{
DD_ENTER_MAY_THROW;
- OBJECTHANDLE handle = (OBJECTHANDLE) vmHandle.GetDacPtr();
- return HndGetHandleADIndex(handle).m_dwIndex;
+ return DefaultADID;
}
// Get the target address from a VMPTR_OBJECTHANDLE, i.e., the handle address
@@ -7553,7 +7552,7 @@ void DacStackReferenceWalker::GCEnumCallbackDac(LPVOID hCallback, OBJECTREF *pOb
DacGcReference *data = dsc->pWalker->GetNextObject<DacGcReference>(dsc);
if (data != NULL)
{
- data->vmDomain.SetDacTargetPtr(dac_cast<PTR_AppDomain>(dsc->pCurrentDomain).GetAddr());
+ data->vmDomain.SetDacTargetPtr(AppDomain::GetCurrentDomain().GetAddr());
if (obj)
data->pObject = obj | 1;
else if (loc.targetPtr)
@@ -7589,7 +7588,7 @@ void DacStackReferenceWalker::GCReportCallbackDac(PTR_PTR_Object ppObj, ScanCont
DacGcReference *data = dsc->pWalker->GetNextObject<DacGcReference>(dsc);
if (data != NULL)
{
- data->vmDomain.SetDacTargetPtr(dac_cast<PTR_AppDomain>(dsc->pCurrentDomain).GetAddr());
+ data->vmDomain.SetDacTargetPtr(AppDomain::GetCurrentDomain().GetAddr());
data->objHnd.SetDacTargetPtr(obj);
data->dwType = CorReferenceStack;
data->i64ExtraData = 0;
diff --git a/src/debug/daccess/gcinterface.dac.h b/src/debug/daccess/gcinterface.dac.h
index c7765ef364..87207f41a3 100644
--- a/src/debug/daccess/gcinterface.dac.h
+++ b/src/debug/daccess/gcinterface.dac.h
@@ -44,9 +44,6 @@ GC_DAC_VISIBLE
OBJECTREF HndFetchHandle(OBJECTHANDLE handle);
GC_DAC_VISIBLE
-struct ADIndex HndGetHandleADIndex(OBJECTHANDLE handle);
-
-GC_DAC_VISIBLE
uintptr_t HndGetHandleExtraInfo(OBJECTHANDLE handle);
#endif // DACCESS_COMPILE