summaryrefslogtreecommitdiff
path: root/src/ToolBox
diff options
context:
space:
mode:
authorJan Vorlicek <janvorli@microsoft.com>2018-10-05 03:08:51 +0200
committerGitHub <noreply@github.com>2018-10-05 03:08:51 +0200
commitda6498e6c1013dd38d33e782bc777bd89aa0f0ee (patch)
tree66db7870d220d7cf717af5ef4aa8fdfc950590b5 /src/ToolBox
parent7f59d17e2741e69bf878b8b168828de3a0a3d12e (diff)
downloadcoreclr-da6498e6c1013dd38d33e782bc777bd89aa0f0ee.tar.gz
coreclr-da6498e6c1013dd38d33e782bc777bd89aa0f0ee.tar.bz2
coreclr-da6498e6c1013dd38d33e782bc777bd89aa0f0ee.zip
Remove context statics stuff (#20256)
* Remove context statics stuff part 1 This change removes all context statics stuff from the runtime since context statics are not supported and this code was obsolete. * Remove context statics stuff from the debugger code
Diffstat (limited to 'src/ToolBox')
-rw-r--r--src/ToolBox/SOS/Strike/strike.cpp8
-rw-r--r--src/ToolBox/SOS/Strike/util.cpp65
2 files changed, 2 insertions, 71 deletions
diff --git a/src/ToolBox/SOS/Strike/strike.cpp b/src/ToolBox/SOS/Strike/strike.cpp
index 70e60312f2..65e2aaf3ba 100644
--- a/src/ToolBox/SOS/Strike/strike.cpp
+++ b/src/ToolBox/SOS/Strike/strike.cpp
@@ -1258,14 +1258,6 @@ DECLARE_API(DumpClass)
ExtOut("NumThreadStaticFields: %x\n", vMethodTableFields.wNumThreadStaticFields);
}
-
- if (vMethodTableFields.wContextStaticsSize)
- {
- ExtOut("ContextStaticOffset: %x\n", vMethodTableFields.wContextStaticOffset);
- ExtOut("ContextStaticsSize: %x\n", vMethodTableFields.wContextStaticsSize);
- }
-
-
if (vMethodTableFields.wNumInstanceFields + vMethodTableFields.wNumStaticFields > 0)
{
DisplayFields(methodTable, &mtdata, &vMethodTableFields, NULL, TRUE, FALSE);
diff --git a/src/ToolBox/SOS/Strike/util.cpp b/src/ToolBox/SOS/Strike/util.cpp
index db461bae69..9e124c4849 100644
--- a/src/ToolBox/SOS/Strike/util.cpp
+++ b/src/ToolBox/SOS/Strike/util.cpp
@@ -1405,61 +1405,6 @@ void DisplayThreadStatic (DacpModuleData* pModule, DacpMethodTableData* pMT, Dac
ExtOut(" <<\n");
}
-void DisplayContextStatic (DacpFieldDescData *pFD, size_t offset, BOOL fIsShared)
-{
- ExtOut("\nDisplay of context static variables is not implemented yet\n");
- /*
- int numDomain;
- DWORD_PTR *domainList = NULL;
- GetDomainList (domainList, numDomain);
- ToDestroy des0 ((void**)&domainList);
- AppDomain vAppDomain;
- Context vContext;
-
- ExtOut(" >> Domain:Value");
- for (int i = 0; i < numDomain; i ++)
- {
- DWORD_PTR dwAddr = domainList[i];
- if (dwAddr == 0) {
- continue;
- }
- vAppDomain.Fill (dwAddr);
- if (vAppDomain.m_pDefaultContext == 0)
- continue;
- dwAddr = (DWORD_PTR)vAppDomain.m_pDefaultContext;
- vContext.Fill (dwAddr);
-
- if (fIsShared)
- dwAddr = (DWORD_PTR)vContext.m_pSharedStaticData;
- else
- dwAddr = (DWORD_PTR)vContext.m_pUnsharedStaticData;
- if (dwAddr == 0)
- continue;
- dwAddr += offsetof(STATIC_DATA, dataPtr);
- dwAddr += offset;
- if (safemove (dwAddr, dwAddr) == 0)
- continue;
- if (dwAddr == 0)
- // We have not initialized this yet.
- continue;
-
- dwAddr += pFD->dwOffset;
- if (pFD->Type == ELEMENT_TYPE_CLASS
- || pFD->Type == ELEMENT_TYPE_VALUETYPE)
- {
- if (safemove (dwAddr, dwAddr) == 0)
- continue;
- }
- if (dwAddr == 0)
- // We have not initialized this yet.
- continue;
- ExtOut(" %p:", (ULONG64)domainList[i]);
- DisplayDataMember (pFD, dwAddr, FALSE);
- }
- ExtOut(" <<\n");
- */
-}
-
const char * ElementTypeName(unsigned type)
{
switch (type) {
@@ -1610,7 +1555,7 @@ void DisplayFields(CLRDATA_ADDRESS cdaMT, DacpMethodTableData *pMTD, DacpMethodT
dwAddr = vFieldDesc.NextField;
DWORD offset = vFieldDesc.dwOffset;
- if(!((vFieldDesc.bIsThreadLocal || vFieldDesc.bIsContextLocal || fIsShared) && vFieldDesc.bIsStatic))
+ if(!((vFieldDesc.bIsThreadLocal || fIsShared) && vFieldDesc.bIsStatic))
{
if (!bValueClass)
{
@@ -1649,7 +1594,7 @@ void DisplayFields(CLRDATA_ADDRESS cdaMT, DacpMethodTableData *pMTD, DacpMethodT
ExtOut("%2s ", (IsElementValueType(vFieldDesc.Type)) ? "1" : "0");
- if (vFieldDesc.bIsStatic && (vFieldDesc.bIsThreadLocal || vFieldDesc.bIsContextLocal))
+ if (vFieldDesc.bIsStatic && vFieldDesc.bIsThreadLocal)
{
numStaticFields ++;
if (fIsShared)
@@ -1674,12 +1619,6 @@ void DisplayFields(CLRDATA_ADDRESS cdaMT, DacpMethodTableData *pMTD, DacpMethodT
DisplayThreadStatic(&vModule, pMTD, &vFieldDesc, fIsShared);
}
}
- else if (vFieldDesc.bIsContextLocal)
- {
- DisplayContextStatic(&vFieldDesc,
- pMTFD->wContextStaticOffset,
- fIsShared);
- }
}
}