Skip to content

Commit b5020f0

Browse files
jkotasjkotas
committed
Delete dead code
- Delete BINDER, STANDALONE_BINDER and MDIL ifdefs Commit migrated from dotnet/coreclr@618e798
1 parent 6279645 commit b5020f0

117 files changed

Lines changed: 449 additions & 7357 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/src/binder/assemblybinder.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ BOOL IsCompilationProcess();
5151
extern BOOL RuntimeIsLegacyNetCF(DWORD adid);
5252
#endif
5353

54-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
54+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
5555
#include "clrprivbindercoreclr.h"
5656
#include "clrprivbinderassemblyloadcontext.h"
5757
// Helper function in the VM, invoked by the Binder, to invoke the host assembly resolver
@@ -60,7 +60,7 @@ extern HRESULT RuntimeInvokeHostAssemblyResolver(INT_PTR pManagedAssemblyLoadCon
6060
// Helper to check if we have a host assembly resolver set
6161
extern BOOL RuntimeCanUseAppPathAssemblyResolver(DWORD adid);
6262

63-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
63+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
6464

6565
namespace BINDER_SPACE
6666
{
@@ -1115,12 +1115,12 @@ namespace BINDER_SPACE
11151115
// Dynamic binds need to be always considered a failure for binding closures
11161116
IF_FAIL_GO(FUSION_E_APP_DOMAIN_LOCKED);
11171117
}
1118-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
1118+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
11191119
else if (IgnoreRefDefMatch(dwBindFlags))
11201120
{
11211121
// Skip RefDef matching if we have been asked to.
11221122
}
1123-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
1123+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
11241124
else
11251125
{
11261126
// Can't give higher serciving than already bound
@@ -1444,13 +1444,13 @@ namespace BINDER_SPACE
14441444

14451445
bool fUseAppPathsBasedResolver = !excludeAppPaths;
14461446

1447-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
1447+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
14481448
// If Host Assembly Resolver is specified, then we will use that as the override for the default resolution mechanism (that uses AppPath probing).
14491449
if (fUseAppPathsBasedResolver && !RuntimeCanUseAppPathAssemblyResolver(pApplicationContext->GetAppDomainId()))
14501450
{
14511451
fUseAppPathsBasedResolver = false;
14521452
}
1453-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
1453+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
14541454

14551455
// This loop executes twice max. First time through we probe AppNiPaths, the second time we probe AppPaths
14561456
bool parseNiPaths = true;
@@ -1863,7 +1863,7 @@ namespace BINDER_SPACE
18631863

18641864
#endif //CROSSGEN_COMPILE
18651865

1866-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
1866+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
18671867
HRESULT AssemblyBinder::BindUsingHostAssemblyResolver (/* in */ INT_PTR pManagedAssemblyLoadContextToBindWithin,
18681868
/* in */ AssemblyName *pAssemblyName,
18691869
/* in */ IAssemblyName *pIAssemblyName,
@@ -1996,7 +1996,7 @@ HRESULT AssemblyBinder::BindUsingPEImage(/* in */ ApplicationContext *pApplicat
19961996
BINDER_LOG_LEAVE_HR(W("AssemblyBinder::BindUsingPEImage"), hr);
19971997
return hr;
19981998
}
1999-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
1999+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
20002000
};
20012001

20022002

‎src/coreclr/src/binder/clrprivbinderassemblyloadcontext.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "clrprivbinderassemblyloadcontext.h"
99
#include "clrprivbinderutil.h"
1010

11-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
11+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
1212

1313
using namespace BINDER_SPACE;
1414

@@ -272,4 +272,4 @@ CLRPrivBinderAssemblyLoadContext::CLRPrivBinderAssemblyLoadContext()
272272
m_pTPABinder = NULL;
273273
}
274274

275-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
275+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)

‎src/coreclr/src/binder/clrprivbindercoreclr.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ HRESULT CLRPrivBinderCoreCLR::BindAssemblyByName(IAssemblyName *pIAssemblyNa
6262

6363
hr = BindAssemblyByNameWorker(pAssemblyName, &pCoreCLRFoundAssembly, false /* excludeAppPaths */);
6464

65-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
65+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
6666
if ((hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)) ||
6767
(hr == FUSION_E_APP_DOMAIN_LOCKED) || (hr == FUSION_E_REF_DEF_MISMATCH))
6868
{
@@ -93,7 +93,7 @@ HRESULT CLRPrivBinderCoreCLR::BindAssemblyByName(IAssemblyName *pIAssemblyNa
9393
}
9494
}
9595
}
96-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
96+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
9797

9898
IF_FAIL_GO(hr);
9999

@@ -106,7 +106,7 @@ Exit:;
106106
return hr;
107107
}
108108

109-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
109+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
110110
HRESULT CLRPrivBinderCoreCLR::BindUsingPEImage( /* in */ PEImage *pPEImage,
111111
/* in */ BOOL fIsNativeImage,
112112
/* [retval][out] */ ICLRPrivAssembly **ppAssembly)
@@ -178,7 +178,7 @@ Exit:;
178178

179179
return hr;
180180
}
181-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
181+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
182182

183183
HRESULT CLRPrivBinderCoreCLR::VerifyBind(IAssemblyName *AssemblyName,
184184
ICLRPrivAssembly *pAssembly,

‎src/coreclr/src/binder/inc/assembly.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include "clrprivbindercoreclr.h"
2626
#endif // !defined(FEATURE_FUSION)
2727

28-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
28+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
2929
#include "clrprivbinderassemblyloadcontext.h"
30-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
30+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
3131

3232
STDAPI BinderAcquirePEImage(LPCTSTR szAssemblyPath,
3333
PEImage **ppPEImage,
@@ -207,9 +207,9 @@ namespace BINDER_SPACE
207207
friend class ::CLRPrivBinderCoreCLR;
208208
#endif // !defined(FEATURE_FUSION)
209209

210-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
210+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
211211
friend class ::CLRPrivBinderAssemblyLoadContext;
212-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
212+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
213213
};
214214

215215
// This is a fast version which goes around the COM interfaces and directly

‎src/coreclr/src/binder/inc/assemblybinder.hpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ namespace BINDER_SPACE
7474
/* out */ Assembly **ppAssembly,
7575
/* in */ LPCTSTR szMDAssemblyPath = NULL);
7676

77-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
77+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
7878
static HRESULT BindUsingHostAssemblyResolver (/* in */ INT_PTR pManagedAssemblyLoadContextToBindWithin,
7979
/* in */ AssemblyName *pAssemblyName,
8080
/* in */ IAssemblyName *pIAssemblyName,
@@ -86,9 +86,9 @@ namespace BINDER_SPACE
8686
/* in */ PEKIND peKind,
8787
/* in */ IMDInternalImport *pIMetaDataAssemblyImport,
8888
/* [retval] [out] */ Assembly **ppAssembly);
89-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
89+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
9090

91-
static HRESULT TranslatePEToArchitectureType(DWORD *pdwPAFlags, PEKIND *PeKind);
91+
static HRESULT TranslatePEToArchitectureType(DWORD *pdwPAFlags, PEKIND *PeKind);
9292

9393
protected:
9494
enum
@@ -97,10 +97,10 @@ namespace BINDER_SPACE
9797
BIND_CACHE_FAILURES = 0x01,
9898
BIND_CACHE_RERUN_BIND = 0x02,
9999
BIND_IGNORE_DYNAMIC_BINDS = 0x04
100-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
100+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
101101
,
102102
BIND_IGNORE_REFDEF_MATCH = 0x8
103-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
103+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
104104
};
105105

106106
static BOOL IgnoreDynamicBinds(DWORD dwBindFlags)
@@ -118,12 +118,12 @@ namespace BINDER_SPACE
118118
return ((dwBindFlags & BIND_CACHE_RERUN_BIND) != 0);
119119
}
120120

121-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
121+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
122122
static BOOL IgnoreRefDefMatch(DWORD dwBindFlags)
123123
{
124124
return ((dwBindFlags & BIND_IGNORE_REFDEF_MATCH) != 0);
125125
}
126-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
126+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
127127

128128
static HRESULT BindByName(/* in */ ApplicationContext *pApplicationContext,
129129
/* in */ AssemblyName *pAssemblyName,

‎src/coreclr/src/binder/inc/clrprivbinderassemblyloadcontext.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "applicationcontext.hpp"
1111
#include "clrprivbindercoreclr.h"
1212

13-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
13+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
1414

1515
namespace BINDER_SPACE
1616
{
@@ -82,5 +82,5 @@ class CLRPrivBinderAssemblyLoadContext : public IUnknownCommon<ICLRPrivBinder>
8282
INT_PTR m_ptrManagedAssemblyLoadContext;
8383
};
8484

85-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
85+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
8686
#endif // __CLRPRIVBINDERASSEMBLYLOADCONTEXT_H__

‎src/coreclr/src/binder/inc/clrprivbindercoreclr.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ class CLRPrivBinderCoreCLR : public IUnknownCommon<ICLRPrivBinder>
6767
HRESULT PreBindByteArray(PEImage *pPEImage, BOOL fInspectionOnly);
6868
#endif // CROSSGEN_COMPILE
6969

70-
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
70+
#if defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
7171
HRESULT BindUsingPEImage( /* in */ PEImage *pPEImage,
7272
/* in */ BOOL fIsNativeImage,
7373
/* [retval][out] */ ICLRPrivAssembly **ppAssembly);
74-
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE) && !defined(MDILNIGEN)
74+
#endif // defined(FEATURE_HOST_ASSEMBLY_RESOLVER) && !defined(DACCESS_COMPILE) && !defined(CROSSGEN_COMPILE)
7575

7676
HRESULT BindAssemblyByNameWorker(
7777
BINDER_SPACE::AssemblyName *pAssemblyName,

‎src/coreclr/src/gc/gc.h‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,10 @@ Module Name:
1414
#ifndef __GC_H
1515
#define __GC_H
1616

17-
#ifndef BINDER
18-
1917
#ifdef PROFILING_SUPPORTED
2018
#define GC_PROFILING //Turn on profiling
2119
#endif // PROFILING_SUPPORTED
2220

23-
#endif
24-
2521
/*
2622
* Promotion Function Prototypes
2723
*/
@@ -380,17 +376,11 @@ class GCHeap {
380376

381377
static GCHeap *GetGCHeap()
382378
{
383-
#ifdef CLR_STANDALONE_BINDER
384-
return NULL;
385-
#else
386379
LIMITED_METHOD_CONTRACT;
387380

388381
_ASSERTE(g_pGCHeap != NULL);
389382
return g_pGCHeap;
390-
#endif
391383
}
392-
393-
#ifndef CLR_STANDALONE_BINDER
394384

395385
#ifndef DACCESS_COMPILE
396386
static BOOL IsGCInProgress(BOOL bConsiderGCStart = FALSE)
@@ -505,8 +495,6 @@ class GCHeap {
505495
}
506496
#endif // DACCESS_COMPILE
507497

508-
#endif // !CLR_STANDALONE_BINDER
509-
510498
private:
511499
typedef enum
512500
{

‎src/coreclr/src/gc/gcdesc.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@ class CGCDesc
168168
{
169169
// If it doesn't contain pointers, there isn't a GCDesc
170170
PTR_MethodTable mt(pMT);
171-
#ifndef BINDER
171+
172172
_ASSERTE(mt->ContainsPointersOrCollectible());
173-
#endif
173+
174174
return PTR_CGCDesc(mt);
175175
}
176176

‎src/coreclr/src/gcinfo/gcinfoencoder.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,6 @@ class BitArrayIterator
280280
unsigned m_curBase;
281281
};
282282

283-
284-
#ifdef MDIL
285-
#define MUST_CALL_JITALLOCATOR_FREE 1
286-
#endif
287-
288283
class LiveStateFuncs
289284
{
290285
public:

0 commit comments

Comments
 (0)