Skip to content

Commit 14bcfda

Browse files
author
danmosemsft
committed
Remove never defined FEATURE_REMOTING
Commit migrated from dotnet/coreclr@fbbc3f8
1 parent ba5a64b commit 14bcfda

122 files changed

Lines changed: 12 additions & 10649 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/coreclr/clr.defines.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<CDefines Condition="'$(FeaturePrejit)' == 'true'">$(CDefines);FEATURE_PREJIT</CDefines>
5959
<CDefines Condition="'$(FeatureRandomizedStringHashing)' == 'true'">$(CDefines);FEATURE_RANDOMIZED_STRING_HASHING</CDefines>
6060
<CDefines Condition="'$(FeatureReJIT)' == 'true'">$(CDefines);FEATURE_REJIT</CDefines>
61-
<CDefines Condition="'$(FeatureRemoting)' == 'true'">$(CDefines);FEATURE_REMOTING</CDefines>
6261
<CDefines Condition="'$(FeatureSortTables)' == 'true'">$(CDefines);FEATURE_SORT_TABLES</CDefines>
6362
<CDefines Condition="'$(FeatureStackProbe)' == 'true'">$(CDefines);FEATURE_STACK_PROBE</CDefines>
6463
<CDefines Condition="'$(FeatureStandaloneSn)' == 'true'">$(CDefines);FEATURE_STANDALONE_SN</CDefines>
@@ -115,7 +114,6 @@
115114
<DefineConstants Condition="'$(FeatureXplatEventSource)' == 'true'">$(DefineConstants);FEATURE_EVENTSOURCE_XPLAT</DefineConstants>
116115
<DefineConstants Condition="'$(FeaturePerfmon)' == 'true'">$(DefineConstants);FEATURE_PERFMON</DefineConstants>
117116
<DefineConstants Condition="'$(FeatureRandomizedStringHashing)' == 'true'">$(DefineConstants);FEATURE_RANDOMIZED_STRING_HASHING</DefineConstants>
118-
<DefineConstants Condition="'$(FeatureRemoting)' == 'true'">$(DefineConstants);FEATURE_REMOTING</DefineConstants>
119117
<DefineConstants Condition="'$(FeatureSortTables)' == 'true'">$(DefineConstants);FEATURE_SORT_TABLES</DefineConstants>
120118
<DefineConstants Condition="'$(FeatureTypeEquivalence)' == 'true'">$(DefineConstants);FEATURE_TYPEEQUIVALENCE</DefineConstants>
121119
<DefineConstants Condition="'$(FeatureUseLcid)' == 'true'">$(DefineConstants);FEATURE_USE_LCID</DefineConstants>

‎src/coreclr/clr.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@
240240
<ResgenDefines Condition="'$(FeatureImpersonation)' == '1'">$(ResgenDefines) /define:FEATURE_IMPERSONATION</ResgenDefines>
241241
<ResgenDefines Condition="'$(FeatureIsostore)' == '1'">$(ResgenDefines) /define:FEATURE_ISOSTORE</ResgenDefines>
242242
<ResgenDefines Condition="'$(FeatureMacl)' == '1'">$(ResgenDefines) /define:FEATURE_MACL</ResgenDefines>
243-
<ResgenDefines Condition="'$(FeatureRemoting)' == '1'">$(ResgenDefines) /define:FEATURE_REMOTING</ResgenDefines>
244243
<ResgenDefines Condition="'$(FeatureIdentityReference)' == '1'">$(ResgenDefines) /define:FEATURE_IDENTITY_REFERENCE</ResgenDefines>
245244
<ResgenDefines Condition="'$(FeatureDisplayCultureInfo)' == '1'">$(ResgenDefines) /define:FEATURE_DISPLAY_CULTURE_INFO</ResgenDefines>
246245
<ResgenDefines Condition="'$(FeatureDisplayRegionInfo)' == '1'">$(ResgenDefines) /define:FEATURE_DISPLAY_REGION_INFO</ResgenDefines>

‎src/coreclr/src/classlibnative/bcltype/objectnative.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,7 @@
1818
#include "field.h"
1919
#include "object.h"
2020
#include "comsynchronizable.h"
21-
#ifdef FEATURE_REMOTING
22-
#include "remoting.h"
23-
#endif
2421
#include "eeconfig.h"
25-
#ifdef FEATURE_REMOTING
26-
#include "objectclone.h"
27-
#endif
2822
#include "mdaassistants.h"
2923

3024

@@ -212,11 +206,6 @@ NOINLINE static Object* GetClassHelper(OBJECTREF objRef)
212206

213207
HELPER_METHOD_FRAME_BEGIN_RET_ATTRIB_1(Frame::FRAME_ATTR_EXACT_DEPTH|Frame::FRAME_ATTR_CAPTURE_DEPTH_2, refType);
214208

215-
#ifdef FEATURE_REMOTING
216-
if (objRef->IsTransparentProxy())
217-
refType = CRemotingServices::GetClass(objRef);
218-
else
219-
#endif
220209
refType = typeHandle.GetManagedClassObject();
221210

222211
HELPER_METHOD_FRAME_END();

‎src/coreclr/src/debug/daccess/dacdbiimpl.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3246,12 +3246,6 @@ CORDB_ADDRESS DacDbiInterfaceImpl::GetThreadOrContextStaticAddress(VMPTR_FieldDe
32463246
{
32473247
fieldAddress = pRuntimeThread->GetStaticFieldAddrNoCreate(pFieldDesc, NULL);
32483248
}
3249-
#ifdef FEATURE_REMOTING
3250-
else if (pFieldDesc->IsContextStatic())
3251-
{
3252-
fieldAddress = PTR_TO_TADDR(pRuntimeThread->GetContext()->GetStaticFieldAddrNoCreate(pFieldDesc));
3253-
}
3254-
#endif
32553249
else
32563250
{
32573251
// In case we have more special cases added later, this will allow us to notice the need to

‎src/coreclr/src/debug/daccess/dacfn.cpp‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
#ifdef FEATURE_PREJIT
1717
#include "compile.h"
1818
#endif // FEATURE_PREJIT
19-
#ifdef FEATURE_REMOTING
20-
#include <remoting.h>
21-
#include "objectclone.h"
22-
#endif
2319
#include <virtualcallstub.h>
2420
#include "peimagelayout.inl"
2521

‎src/coreclr/src/debug/daccess/inspect.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ GetTypeFieldValueFlags(TypeHandle typeHandle,
166166
otherFlags |= CLRDATA_VALUE_FROM_TASK_LOCAL;
167167
}
168168
else
169-
#ifdef FEATURE_REMOTING
170-
if (!fieldDesc->IsContextStatic())
171-
#endif
172169
{
173170
otherFlags |= CLRDATA_VALUE_FROM_INSTANCE;
174171
}
@@ -1436,13 +1433,6 @@ ClrDataValue::NewFromFieldDesc(ClrDataAccess* dac,
14361433
baseAddr =
14371434
TO_CDADDR(tlsThread->GetStaticFieldAddrNoCreate(fieldDesc, NULL));
14381435
}
1439-
#ifdef FEATURE_REMOTING
1440-
else if (fieldDesc->IsContextStatic())
1441-
{
1442-
// XXX Microsoft - Microsoft says Context is going away.
1443-
return E_NOTIMPL;
1444-
}
1445-
#endif
14461436
else if (fieldDesc->IsStatic())
14471437
{
14481438
baseAddr = TO_CDADDR

‎src/coreclr/src/debug/daccess/nidump.cpp‎

Lines changed: 0 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424

2525
#include <pedecoder.h>
2626

27-
#ifdef FEATURE_REMOTING
28-
#include <crossdomaincalls.h>
29-
#endif
3027

3128
#include <mdfileformat.h>
3229

@@ -5545,9 +5542,6 @@ NativeImageDumper::EnumMnemonics s_MTFlagsLow[] =
55455542
MTFLAG_ENTRY(GenericsMask_GenericInst),
55465543
MTFLAG_ENTRY(GenericsMask_SharedInst),
55475544
MTFLAG_ENTRY(GenericsMask_TypicalInst),
5548-
#if defined(FEATURE_REMOTING)
5549-
MTFLAG_ENTRY(ContextStatic),
5550-
#endif
55515545
MTFLAG_ENTRY(HasRemotingVtsInfo),
55525546
MTFLAG_ENTRY(HasVariance),
55535547
MTFLAG_ENTRY(HasDefaultCtor),
@@ -5788,9 +5782,6 @@ static NativeImageDumper::EnumMnemonics s_VMFlags[] =
57885782
VMF_ENTRY(FIXED_ADDRESS_VT_STATICS),
57895783
VMF_ENTRY(HASLAYOUT),
57905784
VMF_ENTRY(ISNESTED),
5791-
#ifdef FEATURE_REMOTING
5792-
VMF_ENTRY(CANNOT_BE_BLITTED_BY_OBJECT_CLONER),
5793-
#endif
57945785
VMF_ENTRY(IS_EQUIVALENT_TYPE),
57955786

57965787
VMF_ENTRY(HASOVERLAYEDFIELDS),
@@ -6897,12 +6888,6 @@ void NativeImageDumper::DumpFieldDesc( PTR_FieldDesc fd, const char * name )
68976888
offsetof(FieldDesc, m_dword1),
68986889
fieldsize(FieldDesc, m_dword1),
68996890
fd->m_isThreadLocal );
6900-
#if defined(FEATURE_REMOTING)
6901-
m_display->WriteFieldFlag( "m_isContextLocal",
6902-
offsetof(FieldDesc, m_dword1),
6903-
fieldsize(FieldDesc, m_dword1),
6904-
fd->m_isContextLocal );
6905-
#endif
69066891
m_display->WriteFieldFlag( "m_isRVA", offsetof(FieldDesc, m_dword1),
69076892
fieldsize(FieldDesc, m_dword1),
69086893
fd->m_isRVA );
@@ -6934,30 +6919,6 @@ void NativeImageDumper::DumpFieldDesc( PTR_FieldDesc fd, const char * name )
69346919
#endif
69356920
DisplayEndStructure( ALWAYS ); //name
69366921
}
6937-
#if defined(FEATURE_REMOTING)
6938-
NativeImageDumper::EnumMnemonics s_XADOptFlags[] =
6939-
{
6940-
#define XAD_ENTRY(x) NativeImageDumper::EnumMnemonics( RemotableMethodInfo:: x, W(#x) )
6941-
XAD_ENTRY(XAD_FLAGS_INITIALIZED),
6942-
XAD_ENTRY(XAD_NOT_OPTIMIZABLE),
6943-
XAD_ENTRY(XAD_BLITTABLE_ARGS),
6944-
XAD_ENTRY(XAD_BLITTABLE_RET),
6945-
6946-
//this is actually the OR of the three below this. It is a "flag" so
6947-
//it gets cleared out.
6948-
XAD_ENTRY(XAD_RET_GC_REF),
6949-
XAD_ENTRY(XAD_RET_FLOAT),
6950-
XAD_ENTRY(XAD_RET_DOUBLE),
6951-
#ifdef FEATURE_HFA
6952-
XAD_ENTRY(XAD_RET_HFA_TYPE),
6953-
#endif
6954-
6955-
XAD_ENTRY(XAD_METHOD_IS_VIRTUAL),
6956-
XAD_ENTRY(XAD_ARGS_HAVE_A_FLOAT),
6957-
6958-
#undef XAD_ENTRY
6959-
};
6960-
#endif
69616922

69626923
#ifdef _PREFAST_
69636924
#pragma warning(push)
@@ -7440,133 +7401,6 @@ NativeImageDumper::DumpMethodTable( PTR_MethodTable mt, const char * name,
74407401
}
74417402
#endif // FEATURE_COMINTEROP
74427403

7443-
#if defined(FEATURE_REMOTING)
7444-
//RemotingVtsInfo comes after the generic dictionaries. So if I
7445-
//don't have extents, I can't print them.
7446-
if(haveCompleteExtents &&
7447-
mt->HasRemotingVtsInfo()
7448-
&& CHECK_OPT(METHODTABLES)
7449-
)
7450-
{
7451-
_ASSERTE(clazz == GetClassFromMT(mt));
7452-
/* REVISIT_TODO Tue 12/13/2005
7453-
* Is this right? is m_wNumStaticFields actually the number of static
7454-
* fields?
7455-
*/
7456-
unsigned numFields = (unsigned)(CountFields(mt)
7457-
- clazz->GetNumStaticFields());
7458-
PTR_RemotingVtsInfo vts = *mt->GetRemotingVtsInfoPtr();
7459-
m_display->StartStructureWithOffset( "OptionalMember_RemotingVtsInfo",
7460-
mt->GetOffsetOfOptionalMember(MethodTable::OptionalMember_RemotingVtsInfo),
7461-
sizeof(void*),
7462-
DPtrToPreferredAddr(vts),
7463-
RemotingVtsInfo::GetSize(numFields)
7464-
);
7465-
7466-
DisplayStartArrayWithOffset( m_pCallbacks, W("%-30s: %s"),
7467-
RemotingVtsInfo, ALWAYS );
7468-
for( int i = 0; i < _countof(vts->m_pCallbacks); ++i )
7469-
{
7470-
PTR_MethodDesc md( vts->m_pCallbacks[i].GetValue() );
7471-
DisplayStartElement( "Callback", ALWAYS );
7472-
DisplayWriteElementString( "CallbackType", s_VTSCallbackNames[i],
7473-
ALWAYS );
7474-
if (CORCOMPILE_IS_POINTER_TAGGED(PTR_TO_TADDR(md)))
7475-
{
7476-
DoWriteFieldMethodDesc( "MethodDesc", UINT_MAX, UINT_MAX, md );
7477-
}
7478-
else
7479-
{
7480-
WriteElementMethodDesc( "MethodDesc", md );
7481-
}
7482-
DisplayEndElement( ALWAYS ); //Callback
7483-
}
7484-
DisplayEndArray( NULL, ALWAYS ); //m_pCallbacks
7485-
#ifdef _DEBUG
7486-
DisplayWriteFieldInt( m_dwNumFields, vts->m_dwNumFields,
7487-
RemotingVtsInfo, ALWAYS );
7488-
#endif
7489-
/* REVISIT_TODO Tue 12/13/2005
7490-
* Is there any reason to dump this map?
7491-
*/
7492-
m_display->WriteFieldEmpty("m_rFieldTypes",
7493-
offsetof(RemotingVtsInfo, m_rFieldTypes),
7494-
RemotingVtsInfo::GetSize(numFields)
7495-
- offsetof(RemotingVtsInfo, m_rFieldTypes) );
7496-
DisplayEndStructure( ALWAYS ); //OptionalMember_RemotingVtsInfo
7497-
}
7498-
7499-
//RemotableMethodInfo comes after the generic dictionaries. So if I
7500-
//don't have extents, I can't print them.
7501-
if(haveCompleteExtents &&
7502-
mt->HasRemotableMethodInfo() &&
7503-
CHECK_OPT(METHODTABLES)
7504-
)
7505-
{
7506-
PTR_CrossDomainOptimizationInfo cdOpt = *mt->GetRemotableMethodInfoPtr();
7507-
if( cdOpt == NULL )
7508-
{
7509-
_ASSERTE(mt->GetNumVtableSlots() == 0 );
7510-
m_display->WriteElementPointer("OptionalMember_RemotableMethodInfo",
7511-
NULL);
7512-
}
7513-
else
7514-
{
7515-
_ASSERTE(mt->GetNumVtableSlots() > 0 );
7516-
7517-
unsigned size = sizeof(RemotableMethodInfo) * mt->GetNumVtableSlots();
7518-
//one remotable method info for each method.
7519-
m_display->StartStructureWithOffset( "OptionalMember_RemotableMethodInfo",
7520-
mt->GetOffsetOfOptionalMember(MethodTable::OptionalMember_RemotableMethodInfo),
7521-
sizeof(void*),
7522-
DPtrToPreferredAddr(cdOpt),
7523-
size );
7524-
m_display->StartArrayWithOffset( "m_rmi",
7525-
offsetof(CrossDomainOptimizationInfo,
7526-
m_rmi),
7527-
mt->GetNumVtableSlots()
7528-
* sizeof(RemotableMethodInfo), NULL );
7529-
PTR_RemotableMethodInfo rmi( PTR_HOST_MEMBER_TADDR(CrossDomainOptimizationInfo, cdOpt, m_rmi) );
7530-
for( unsigned i = 0; i < mt->GetNumVtableSlots(); ++i )
7531-
{
7532-
PTR_RemotableMethodInfo current = rmi + i;
7533-
DisplayStartStructure( "RemotableMethodInfo",
7534-
DPtrToPreferredAddr(current),
7535-
sizeof(*current), ALWAYS );
7536-
DisplayWriteFieldEnumerated( m_OptFlags, current->m_OptFlags,
7537-
RemotableMethodInfo, s_XADOptFlags,
7538-
W(", "), ALWAYS );
7539-
DisplayEndStructure( ALWAYS ); //RemotableMethodInfo
7540-
}
7541-
DisplayEndArray( "Total RemotableMethodInfos", ALWAYS ); //m_rmi
7542-
DisplayEndStructure( ALWAYS ); // OptionalMember_RemotableMethodInfo
7543-
}
7544-
}
7545-
7546-
//ContextStatics comes after the generic dictionaries. So if I
7547-
//don't have extents, I can't print them.
7548-
if(haveCompleteExtents &&
7549-
mt->HasContextStatics() &&
7550-
CHECK_OPT(METHODTABLES)
7551-
)
7552-
{
7553-
PTR_ContextStaticsBucket statics =
7554-
*(mt->GetContextStaticsBucketPtr());
7555-
m_display->StartStructureWithOffset( "OptionalMember_ContextStatics",
7556-
mt->GetOffsetOfOptionalMember(MethodTable::OptionalMember_ContextStatics),
7557-
sizeof(void*),
7558-
DPtrToPreferredAddr(statics),
7559-
sizeof(*statics) );
7560-
7561-
#define HANDLE_FIELD(field) \
7562-
DisplayWriteFieldInt( field, statics->field, \
7563-
ContextStaticsBucket, ALWAYS )
7564-
HANDLE_FIELD(m_dwContextStaticsOffset);
7565-
HANDLE_FIELD(m_wContextStaticsSize);
7566-
#undef HANDLE_FIELD
7567-
DisplayEndStructure( ALWAYS ); //OptionalMember_ContextStatics
7568-
}
7569-
#endif
75707404
DisplayEndStructure( METHODTABLES ); //MethodTable
75717405
} // NativeImageDumper::DumpMethodTable
75727406
#ifdef _PREFAST_

‎src/coreclr/src/debug/daccess/request.cpp‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,11 +1801,7 @@ ClrDataAccess::GetFieldDescData(CLRDATA_ADDRESS addr, struct DacpFieldDescData *
18011801
FieldDescData->MTOfEnclosingClass = HOST_CDADDR(pFieldDesc->GetApproxEnclosingMethodTable());
18021802
FieldDescData->dwOffset = pFieldDesc->GetOffset();
18031803
FieldDescData->bIsThreadLocal = pFieldDesc->IsThreadStatic();
1804-
#ifdef FEATURE_REMOTING
1805-
FieldDescData->bIsContextLocal = pFieldDesc->IsContextStatic();;
1806-
#else
18071804
FieldDescData->bIsContextLocal = FALSE;
1808-
#endif
18091805
FieldDescData->bIsStatic = pFieldDesc->IsStatic();
18101806
FieldDescData->NextField = HOST_CDADDR(PTR_FieldDesc(PTR_HOST_TO_TADDR(pFieldDesc) + sizeof(FieldDesc)));
18111807

@@ -1835,16 +1831,8 @@ ClrDataAccess::GetMethodTableFieldData(CLRDATA_ADDRESS mt, struct DacpMethodTabl
18351831

18361832
data->FirstField = PTR_TO_TADDR(pMT->GetClass()->GetFieldDescList());
18371833

1838-
#ifdef FEATURE_REMOTING
1839-
BOOL hasContextStatics = pMT->HasContextStatics();
1840-
1841-
data->wContextStaticsSize = (hasContextStatics) ? pMT->GetContextStaticsSize() : 0;
1842-
_ASSERTE(!hasContextStatics || FitsIn<WORD>(pMT->GetContextStaticsOffset()));
1843-
data->wContextStaticOffset = (hasContextStatics) ? static_cast<WORD>(pMT->GetContextStaticsOffset()) : 0;
1844-
#else
18451834
data->wContextStaticsSize = 0;
18461835
data->wContextStaticOffset = 0;
1847-
#endif
18481836
}
18491837

18501838
SOSDacLeave();

‎src/coreclr/src/debug/ee/debugger.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
#include "eeconfig.h" // This is here even for retail & free builds...
1919
#include "../../dlls/mscorrc/resource.h"
2020

21-
#ifdef FEATURE_REMOTING
22-
#include "remoting.h"
23-
#endif
2421

2522
#include "context.h"
2623
#include "vars.hpp"

‎src/coreclr/src/debug/ee/frameinfo.cpp‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,29 +1778,6 @@ StackWalkAction DebuggerWalkStackProc(CrawlFrame *pCF, void *data)
17781778
}
17791779
break;
17801780

1781-
#ifdef FEATURE_REMOTING
1782-
case Frame::TYPE_TP_METHOD_FRAME:
1783-
LOG((LF_CORDB, LL_INFO100000, "DWSP: Frame type is TYPE_TP_METHOD_FRAME.\n"));
1784-
if (d->ShouldIgnoreNonmethodFrames())
1785-
{
1786-
// Transparant Proxies push a frame onto the stack that they
1787-
// use to figure out where they're really going; this frame
1788-
// doesn't actually contain any code, although it does have
1789-
// enough info into fooling our routines into thinking it does:
1790-
// Just ignore these.
1791-
LOG((LF_CORDB, LL_INFO100000, "DWSP: Skipping frame 0x%x b/c it's "
1792-
"a transparant proxy frame!\n", frame));
1793-
use = false;
1794-
}
1795-
else
1796-
{
1797-
// Otherwise do the same thing as for internal frames
1798-
LOG((LF_CORDB, LL_INFO100000, "DWSP: NOT Skipping frame 0x%x even though it's "
1799-
"a transparant proxy frame!\n", frame));
1800-
INTERNAL_FRAME_ACTION(d, use);
1801-
}
1802-
break;
1803-
#endif
18041781
default:
18051782
_ASSERTE(!"Invalid frame type!");
18061783
break;

0 commit comments

Comments
 (0)