diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2018-12-10 02:57:57 -0800 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2018-12-10 11:57:57 +0100 |
| commit | 49ca3db92a48da71d25c607af9716a30bafb3ff8 (patch) | |
| tree | edef4dd6526f291d37ad7dc783b52c124e834634 /src/debug | |
| parent | bc03ef9aeb467950f181a2e2d53fe4b92a98d0c9 (diff) | |
| download | coreclr-49ca3db92a48da71d25c607af9716a30bafb3ff8.tar.gz coreclr-49ca3db92a48da71d25c607af9716a30bafb3ff8.tar.bz2 coreclr-49ca3db92a48da71d25c607af9716a30bafb3ff8.zip | |
Delete vm/context.* (#21459)
* Delete vm/context.*
Leftover from remoting
Diffstat (limited to 'src/debug')
| -rw-r--r-- | src/debug/daccess/dacdbiimplstackwalk.cpp | 9 | ||||
| -rw-r--r-- | src/debug/daccess/enummem.cpp | 3 | ||||
| -rw-r--r-- | src/debug/daccess/request.cpp | 5 | ||||
| -rw-r--r-- | src/debug/ee/debugger.cpp | 2 | ||||
| -rw-r--r-- | src/debug/ee/funceval.cpp | 2 |
5 files changed, 5 insertions, 16 deletions
diff --git a/src/debug/daccess/dacdbiimplstackwalk.cpp b/src/debug/daccess/dacdbiimplstackwalk.cpp index 8cdda342f9..83e3e382d0 100644 --- a/src/debug/daccess/dacdbiimplstackwalk.cpp +++ b/src/debug/daccess/dacdbiimplstackwalk.cpp @@ -505,12 +505,9 @@ void DacDbiInterfaceImpl::EnumerateInternalFrames(VMPTR_Thread PTR_IUnknown pUnk = dac_cast<PTR_IUnknown>(*dac_cast<PTR_TADDR>(pUnkStackSlot)); ComCallWrapper * pCCW = ComCallWrapper::GetWrapperFromIP(pUnk); - if (!pCCW->NeedToSwitchDomains(pAppDomain->GetId())) - { - ComCallMethodDesc * pCMD = NULL; - pCMD = dac_cast<PTR_ComCallMethodDesc>(pCOMFrame->ComMethodFrame::GetDatum()); - pMD = pCMD->GetInterfaceMethodDesc(); - } + ComCallMethodDesc * pCMD = NULL; + pCMD = dac_cast<PTR_ComCallMethodDesc>(pCOMFrame->ComMethodFrame::GetDatum()); + pMD = pCMD->GetInterfaceMethodDesc(); } } EX_END_CATCH_ALLOW_DATATARGET_MISSING_MEMORY diff --git a/src/debug/daccess/enummem.cpp b/src/debug/daccess/enummem.cpp index 7dce6e96f9..3952f51681 100644 --- a/src/debug/daccess/enummem.cpp +++ b/src/debug/daccess/enummem.cpp @@ -1187,9 +1187,6 @@ HRESULT ClrDataAccess::EnumMemDumpAllThreadsStack(CLRDataEnumMemoryFlags flags) // Write out the Thread instance DacEnumHostDPtrMem(pThread); - // Write out the context pointed by the thread - DacEnumHostDPtrMem(pThread->GetContext()); - // @TODO // write TEB pointed by the thread // DacEnumHostDPtrMem(pThread->GetTEB()); diff --git a/src/debug/daccess/request.cpp b/src/debug/daccess/request.cpp index fbc1d432b3..24a4c8c350 100644 --- a/src/debug/daccess/request.cpp +++ b/src/debug/daccess/request.cpp @@ -768,7 +768,7 @@ ClrDataAccess::GetThreadData(CLRDATA_ADDRESS threadAddr, struct DacpThreadData * threadData->fiberData = NULL; threadData->pFrame = PTR_CDADDR(thread->m_pFrame); - threadData->context = PTR_CDADDR(thread->m_Context); + threadData->context = PTR_CDADDR(thread->m_pDomain); threadData->domain = PTR_CDADDR(thread->m_pDomain); threadData->lockCount = thread->m_dwLockCount; #ifndef FEATURE_PAL @@ -1417,8 +1417,7 @@ ClrDataAccess::GetDomainFromContext(CLRDATA_ADDRESS contextAddr, CLRDATA_ADDRESS SOSDacEnter(); - Context* context = PTR_Context(TO_TADDR(contextAddr)); - *domain = HOST_CDADDR(context->GetDomain()); + *domain = contextAddr; // Context is same as the AppDomain in CoreCLR SOSDacLeave(); return hr; diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp index ce6004312f..5796a36cbc 100644 --- a/src/debug/ee/debugger.cpp +++ b/src/debug/ee/debugger.cpp @@ -17,8 +17,6 @@ #include "eeconfig.h" // This is here even for retail & free builds... #include "../../dlls/mscorrc/resource.h" - -#include "context.h" #include "vars.hpp" #include <limits.h> #include "ilformatter.h" diff --git a/src/debug/ee/funceval.cpp b/src/debug/ee/funceval.cpp index 8a72ef58bc..1edd0b0c57 100644 --- a/src/debug/ee/funceval.cpp +++ b/src/debug/ee/funceval.cpp @@ -20,8 +20,6 @@ #include "eeconfig.h" // This is here even for retail & free builds... #include "../../dlls/mscorrc/resource.h" - -#include "context.h" #include "vars.hpp" #include "threads.h" #include "appdomain.inl" |