diff options
author | danmosemsft <danmose@microsoft.com> | 2017-02-10 17:12:53 -0800 |
---|---|---|
committer | danmosemsft <danmose@microsoft.com> | 2017-02-10 21:36:06 -0800 |
commit | 54891e0650e69f08832f75a40dc102efc6115d38 (patch) | |
tree | 0e032a0b337767801f696cbaeacded267c694f32 /src/md | |
parent | 396f7d43b3c0f3ca7034a6d1d9cd7d6914778a1e (diff) | |
download | coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.gz coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.bz2 coreclr-54891e0650e69f08832f75a40dc102efc6115d38.zip |
Remove always defined FEATURE_CORECLR
Diffstat (limited to 'src/md')
-rw-r--r-- | src/md/compiler/classfactory.cpp | 8 | ||||
-rw-r--r-- | src/md/compiler/disp.cpp | 23 | ||||
-rw-r--r-- | src/md/compiler/regmeta.cpp | 6 | ||||
-rw-r--r-- | src/md/compiler/regmeta.h | 3 | ||||
-rw-r--r-- | src/md/compiler/regmeta_vm.cpp | 155 | ||||
-rw-r--r-- | src/md/enc/liteweightstgdbrw.cpp | 23 | ||||
-rw-r--r-- | src/md/enc/metamodelenc.cpp | 25 | ||||
-rw-r--r-- | src/md/enc/metamodelrw.cpp | 13 | ||||
-rw-r--r-- | src/md/inc/metamodelrw.h | 4 | ||||
-rw-r--r-- | src/md/inc/winmdinterfaces.h | 8 | ||||
-rw-r--r-- | src/md/winmd/adapter.cpp | 2 | ||||
-rw-r--r-- | src/md/winmd/inc/adapter.h | 6 |
12 files changed, 0 insertions, 276 deletions
diff --git a/src/md/compiler/classfactory.cpp b/src/md/compiler/classfactory.cpp index 603f7975aa..338095add3 100644 --- a/src/md/compiler/classfactory.cpp +++ b/src/md/compiler/classfactory.cpp @@ -42,14 +42,6 @@ const COCLASS_REGISTER g_CoClasses[] = { // pClsid szProgID pfnCreateObject { &CLSID_CorMetaDataDispenser, W("CorMetaDataDispenser"), Disp::CreateObject }, -#if !defined(FEATURE_CORECLR) && !defined(CROSSGEN_COMPILE) // coreclr doesn't export these - { &CLSID_CorMetaDataDispenserRuntime, W("CorMetaDataDispenserRuntime"), Disp::CreateObject }, - - { &CLSID_CorRuntimeHost, W("CorRuntimeHost"), CorHost::CreateObject }, - { &CLSID_CLRRuntimeHost, W("CLRRuntimeHost"), CorHost2::CreateObject }, - { &__uuidof(CLRPrivRuntime), W("CLRPrivRuntime"), CorHost2::CreateObject }, - { &CLSID_TypeNameFactory, NULL, (PFN_CREATE_OBJ)TypeNameFactoryCreateObject }, -#endif // FEATURE_CORECLR && !CROSSGEN_COMPILE { NULL, NULL, NULL } }; diff --git a/src/md/compiler/disp.cpp b/src/md/compiler/disp.cpp index b091729744..8012d1f97e 100644 --- a/src/md/compiler/disp.cpp +++ b/src/md/compiler/disp.cpp @@ -439,13 +439,6 @@ ErrExit: return hr; } // Disp::OpenScopeOnMemory -#if defined(FEATURE_METADATA_IN_VM) && !defined(FEATURE_CORECLR) && !defined(CROSSGEN_COMPILE) - -#include <metahost.h> -// Pointer to the activated CLR interface provided by the shim. -extern ICLRRuntimeInfo * g_pCLRRuntime; - -#endif //***************************************************************************** // Get the directory where the CLR system resides. @@ -458,27 +451,11 @@ Disp::GetCORSystemDirectory( DWORD cchBuffer, // [in] Size of the buffer DWORD *pcchBuffer) // [out] Number of characters returned { -#if defined(FEATURE_METADATA_IN_VM) && !defined(FEATURE_CORECLR) && !defined(CROSSGEN_COMPILE) - HRESULT hr = S_OK; - BEGIN_ENTRYPOINT_NOTHROW; - - // This implies a machine-wide CLR install root, which may not exist for some CLR - // skus using standalone metadata. - *pcchBuffer = cchBuffer; - hr = g_pCLRRuntime->GetRuntimeDirectory(szBuffer, pcchBuffer); - - END_ENTRYPOINT_NOTHROW; - - return hr; -#else //!FEATURE_METADATA_IN_VM || FEATURE_CORECLR -#ifdef FEATURE_CORECLR UNREACHABLE_MSG("Calling IMetaDataDispenser::GetCORSystemDirectory! This code should not be " "reachable or needs to be reimplemented for CoreCLR!"); -#endif //FEATURE_CORECLR return E_NOTIMPL; -#endif //!FEATURE_METADATA_IN_VM || FEATURE_CORECLR } // Disp::GetCORSystemDirectory HRESULT Disp::FindAssembly( // S_OK or error diff --git a/src/md/compiler/regmeta.cpp b/src/md/compiler/regmeta.cpp index feb1cdd31b..b849c6433a 100644 --- a/src/md/compiler/regmeta.cpp +++ b/src/md/compiler/regmeta.cpp @@ -581,12 +581,6 @@ RegMeta::QueryInterface( } #endif //FEATURE_METADATA_EMIT -#if defined(FEATURE_METADATA_IN_VM) && !defined(FEATURE_CORECLR) - else if (riid == IID_IMetaDataValidate) - { - *ppUnk = (IMetaDataValidate *)this; - } -#endif //defined(FEATURE_METADATA_IN_VM) && !defined(FEATURE_CORECLR) #ifdef FEATURE_METADATA_EMIT_ALL else if (riid == IID_IMetaDataFilter) diff --git a/src/md/compiler/regmeta.h b/src/md/compiler/regmeta.h index cb7bae17b5..f9967d79c0 100644 --- a/src/md/compiler/regmeta.h +++ b/src/md/compiler/regmeta.h @@ -2059,9 +2059,6 @@ private: CorValidatorModuleType m_ModuleType; IVEHandler *m_pVEHandler; -#ifndef FEATURE_CORECLR - ValidateRecordFunction m_ValidateRecordFunctionTable[TBL_COUNT]; -#endif CCustAttrHash m_caHash; // Hashed list of custom attribute types seen. bool m_bKeepKnownCa; // Should all known CA's be kept? diff --git a/src/md/compiler/regmeta_vm.cpp b/src/md/compiler/regmeta_vm.cpp index beebb08b5c..38ca308e01 100644 --- a/src/md/compiler/regmeta_vm.cpp +++ b/src/md/compiler/regmeta_vm.cpp @@ -29,23 +29,6 @@ #include <metamodelrw.h> -#ifndef FEATURE_CORECLR - -#include <metahost.h> - -// Pointer to the activated CLR interface provided by the shim. -extern ICLRRuntimeInfo *g_pCLRRuntime; - -#ifdef FEATURE_METADATA_EMIT_ALL - -#include "iappdomainsetup.h" - -// {27FFF232-A7A8-40dd-8D4A-734AD59FCD41} -EXTERN_GUID(IID_IAppDomainSetup, 0x27FFF232, 0xA7A8, 0x40dd, 0x8D, 0x4A, 0x73, 0x4A, 0xD5, 0x9F, 0xCD, 0x41); - -#endif //FEATURE_METADATA_EMIT_ALL - -#endif // !FEATURE_CORECLR #define DEFINE_CUSTOM_NODUPCHECK 1 @@ -117,90 +100,8 @@ HRESULT RegMeta::FindCachedReadOnlyEntry( //***************************************************************************** HRESULT RegMeta::StartupEE() { -#ifdef FEATURE_CORECLR UNREACHABLE_MSG_RET("About to CoCreateInstance! This code should not be " "reachable or needs to be reimplemented for CoreCLR!"); -#else // !FEATURE_CORECLR - - struct Param - { - RegMeta *pThis; - IUnknown *pSetup; - IAppDomainSetup *pDomainSetup; - bool fDoneStart; - HRESULT hr; - } param; - param.pThis = this; - param.pSetup = NULL; - param.pDomainSetup = NULL; - param.fDoneStart = false; - param.hr = S_OK; - - PAL_TRY(Param *, pParam, ¶m) - { - HRESULT hr = S_OK; - - DWORD dwBuffer[1 + (MAX_LONGPATH+1) * sizeof(WCHAR) / sizeof(DWORD) + 1]; - BSTR bstrDir = NULL; - - // Create a hosting environment. - IfFailGo(g_pCLRRuntime->GetInterface( - CLSID_CorRuntimeHost, - IID_ICorRuntimeHost, - (void **)&pParam->pThis->m_pCorHost)); - - // Startup the runtime. - IfFailGo(pParam->pThis->m_pCorHost->Start()); - pParam->fDoneStart = true; - - // Create an AppDomain Setup so we can set the AppBase. - IfFailGo(pParam->pThis->m_pCorHost->CreateDomainSetup(&pParam->pSetup)); - - // Get the current directory (place it in a BSTR). - bstrDir = (BSTR)(dwBuffer + 1); - if ((dwBuffer[0] = (WszGetCurrentDirectory(MAX_LONGPATH + 1, bstrDir) * sizeof(WCHAR)))) - { - // QI for the IAppDomainSetup interface. - IfFailGo(pParam->pSetup->QueryInterface(IID_IAppDomainSetup, - (void**)&pParam->pDomainSetup)); - - // Set the AppBase. - pParam->pDomainSetup->put_ApplicationBase(bstrDir); - } - - // Create a new AppDomain. - IfFailGo(pParam->pThis->m_pCorHost->CreateDomainEx(W("Compilation Domain"), - pParam->pSetup, - NULL, - &pParam->pThis->m_pAppDomain)); - - // That's it, we're all set up. - _ASSERTE(pParam->pThis->m_pAppDomain != NULL); - pParam->pThis->m_fStartedEE = true; - - ErrExit: - pParam->hr = hr; - } - PAL_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - _ASSERTE(!"Unexpected exception setting up hosting environment for security attributes"); - param.hr = E_FAIL; - } - PAL_ENDTRY - - // Cleanup temporary resources. - if (m_pAppDomain && FAILED(param.hr)) - m_pAppDomain->Release(); - if (param.pDomainSetup) - param.pDomainSetup->Release(); - if (param.pSetup) - param.pSetup->Release(); - if (param.fDoneStart && FAILED(param.hr)) - m_pCorHost->Stop(); - if (m_pCorHost && FAILED(param.hr)) - m_pCorHost->Release(); - return param.hr; -#endif // FEATURE_CORECLR } #endif //FEATURE_METADATA_EMIT_ALL @@ -471,63 +372,7 @@ RegMeta::ResolveTypeRef( goto ErrExit; } -#ifndef FEATURE_CORECLR - wcscpy_s(rcModule, _MAX_PATH, wzNameSpace); - - //****************** - // Try to find the module on CORPATH - //****************** - - if ((wcsncmp(rcModule, W("System."), 16) != 0) && - (wcsncmp(rcModule, W("System/"), 16) != 0)) - { - // only go through regular CORPATH lookup by fully qualified class name when - // it is not System.* - hr = CORPATHService::GetClassFromCORPath( - rcModule, - tr, - pMiniMd, - riid, - ppIScope, - ptd); - } - else - { - // force it to look for System.* in mscorlib.dll - hr = S_FALSE; - } - - if (hr == S_FALSE) - { - LPWSTR szTmp; - WszSearchPath( - NULL, - W("mscorlib.dll"), - NULL, - sizeof(rcModule) / sizeof(rcModule[0]), - rcModule, - &szTmp); - - //******************* - // Last desperate try!! - //******************* - - // Use the file name "mscorlib: - IfFailGo(CORPATHService::FindTypeDef( - rcModule, - tr, - pMiniMd, - riid, - ppIScope, - ptd)); - if (hr == S_FALSE) - { - IfFailGo(META_E_CANNOTRESOLVETYPEREF); - } - } -#else //FEATURE_CORECLR IfFailGo(META_E_CANNOTRESOLVETYPEREF); -#endif //FEATURE_CORECLR ErrExit: STOP_MD_PERF(ResolveTypeRef); diff --git a/src/md/enc/liteweightstgdbrw.cpp b/src/md/enc/liteweightstgdbrw.cpp index 12779f59c0..de81a017b4 100644 --- a/src/md/enc/liteweightstgdbrw.cpp +++ b/src/md/enc/liteweightstgdbrw.cpp @@ -1251,28 +1251,5 @@ BOOL CLiteWeightStgdbRW::IsValidFileNameLength( const WCHAR * wszFileName) { -#ifdef FEATURE_CORECLR return TRUE; -#else - static const WCHAR const_wszLongPathPrefix[] = W("\\\\?\\"); - - if (wszFileName == NULL) - { - return TRUE; - } - size_t cchFileName = wcslen(wszFileName); - if (cchFileName < _MAX_PATH) - { - return TRUE; - } - if (SString::_wcsnicmp(wszFileName, const_wszLongPathPrefix, _countof(const_wszLongPathPrefix) - 1) != 0) - { // Path does not have long path prefix \\?\ (as required by CreateFile API) - return FALSE; - } - if (cchFileName < 32767) - { // Limit for the long path length as defined in CreateFile API - return TRUE; - } - return FALSE; -#endif } // CLiteWeightStgdbRW::IsValidFileNameLength diff --git a/src/md/enc/metamodelenc.cpp b/src/md/enc/metamodelenc.cpp index 4d972827ca..7460d580dc 100644 --- a/src/md/enc/metamodelenc.cpp +++ b/src/md/enc/metamodelenc.cpp @@ -263,18 +263,6 @@ CMiniMdRW::ApplyDelta( return E_INVALIDARG; } -#ifndef FEATURE_CORECLR - // Verify that the delta is based on the base. - IfFailGo(mdDelta.getEncBaseIdOfModule(pModDelta, &GuidDelta)); - IfFailGo(getEncBaseIdOfModule(pModBase,&GuidBase)); - if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_MD_DeltaCheck) && - CLRConfig::GetConfigValue(CLRConfig::INTERNAL_MD_UseMinimalDeltas) && - (GuidDelta != GuidBase)) - { - _ASSERTE(!"The Delta MetaData is based on a different generation than the current MetaData."); - return E_INVALIDARG; - } -#endif //!FEATURE_CORECLR // Let the other md prepare for sparse records. IfFailGo(mdDelta.StartENCMap()); @@ -390,19 +378,6 @@ ErrExit: HRESULT hrReturn = hr; IfFailRet(mdDelta.EndENCMap()); -#ifndef FEATURE_CORECLR - if (SUCCEEDED(hrReturn) && - CLRConfig::GetConfigValue(CLRConfig::INTERNAL_MD_DeltaCheck) && - CLRConfig::GetConfigValue(CLRConfig::INTERNAL_MD_UseMinimalDeltas)) - { - GUID GuidNewBase; - - // We'll use the delta's 'delta guid' for our new base guid - IfFailRet(mdDelta.getEncIdOfModule(pModDelta, &GuidNewBase)); - - IfFailRet(PutGuid(TBL_Module, ModuleRec::COL_EncBaseId, pModBase, GuidNewBase)); - } -#endif //!FEATURE_CORECLR return hrReturn; } // CMiniMdRW::ApplyDelta diff --git a/src/md/enc/metamodelrw.cpp b/src/md/enc/metamodelrw.cpp index f9002b6fa9..e6877bc84b 100644 --- a/src/md/enc/metamodelrw.cpp +++ b/src/md/enc/metamodelrw.cpp @@ -8228,19 +8228,6 @@ CMiniMdRW::ResetENCLog() // Get the module record. IfFailGo(GetModuleRecord(1, &pMod)); -#ifndef FEATURE_CORECLR - if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_MD_UseMinimalDeltas)) - { // Update the ENC Guids - GUID encid; - // Copy EncId as BaseId. - ULONG uVal = GetCol(TBL_Module, ModuleRec::COL_EncId, pMod); - IfFailGo(PutCol(TBL_Module, ModuleRec::COL_EncBaseId, pMod, uVal)); - - // Allocate a new GUID for EncId. - IfFailGo(CoCreateGuid(&encid)); - IfFailGo(PutGuid(TBL_Module, ModuleRec::COL_EncId, pMod, encid)); - } -#endif //!FEATURE_CORECLR // Reset the pool deltas m_StringHeap.StartNewEnCSession(); diff --git a/src/md/inc/metamodelrw.h b/src/md/inc/metamodelrw.h index 6e00d3cf3e..c2d24db8a5 100644 --- a/src/md/inc/metamodelrw.h +++ b/src/md/inc/metamodelrw.h @@ -1420,10 +1420,6 @@ public: void EnableDeltaMetadataGeneration() { _ASSERTE(m_OptionValue.m_UpdateMode == MDUpdateENC); -#ifndef FEATURE_CORECLR - if (CLRConfig::GetConfigValue(CLRConfig::INTERNAL_MD_UseMinimalDeltas)) - m_OptionValue.m_UpdateMode = MDUpdateDelta; -#endif //!FEATURE_CORECLR } void DisableDeltaMetadataGeneration() {m_OptionValue.m_UpdateMode = MDUpdateENC;} diff --git a/src/md/inc/winmdinterfaces.h b/src/md/inc/winmdinterfaces.h index 4233e615d3..47f43df083 100644 --- a/src/md/inc/winmdinterfaces.h +++ b/src/md/inc/winmdinterfaces.h @@ -103,15 +103,7 @@ HRESULT VerifyNotWinMDHelper(IUnknown *pUnknown ,int line #endif //_DEBUG ); -#if defined(FEATURE_METADATA_IN_VM) && !defined(FEATURE_CORECLR) -#ifdef _DEBUG -#define VerifyNotWinMD(pUnknown, assertMsg) VerifyNotWinMDHelper(pUnknown, assertMsg, __FILE__, __LINE__) -#else -#define VerifyNotWinMD(pUnknown, assertMsg) VerifyNotWinMDHelper(pUnknown) -#endif -#else #define VerifyNotWinMD(pUnknown, assertMsg) S_OK -#endif // FEATURE_METADATA_IN_VM #endif //__WINMDINTERFACES_H__ diff --git a/src/md/winmd/adapter.cpp b/src/md/winmd/adapter.cpp index 2c9dd1b9fd..d4e95b7f8b 100644 --- a/src/md/winmd/adapter.cpp +++ b/src/md/winmd/adapter.cpp @@ -1185,14 +1185,12 @@ void WinMDAdapter::GetExtraAssemblyRefProps(FrameworkAssemblyIndex index, if (ppPublicKeytoken) { -#ifdef FEATURE_CORECLR if (index == FrameworkAssembly_Mscorlib) { *ppPublicKeytoken = g_rbTheSilverlightPlatformKeyToken; *pTokenLength = sizeof(g_rbTheSilverlightPlatformKeyToken); } else -#endif { if (index == FrameworkAssembly_SystemNumericsVectors || index == FrameworkAssembly_SystemRuntime || index == FrameworkAssembly_SystemObjectModel) { diff --git a/src/md/winmd/inc/adapter.h b/src/md/winmd/inc/adapter.h index e42992f81f..cc422017b6 100644 --- a/src/md/winmd/inc/adapter.h +++ b/src/md/winmd/inc/adapter.h @@ -236,14 +236,12 @@ public: if (pusRevisionNumber != nullptr) *pusRevisionNumber = VER_ASSEMBLYBUILD_QFE; -#ifdef FEATURE_CORECLR // Under CoreCLR, we replace the ECMA key in the mscorlib assembly ref with the CoreCLR platform public key token if (ppbPublicKeyOrToken != nullptr) { *ppbPublicKeyOrToken = g_rbTheSilverlightPlatformKeyToken; *pcbPublicKeyOrToken = _countof(g_rbTheSilverlightPlatformKeyToken); } -#endif } else if (RidFromToken(mdar) > m_rawAssemblyRefCount) { @@ -632,11 +630,7 @@ public: case FrameworkAssembly_SystemRuntimeWindowsRuntimeUIXaml: return "System.Runtime.WindowsRuntime.UI.Xaml"; case FrameworkAssembly_SystemNumericsVectors: -#ifdef FEATURE_CORECLR return "System.Numerics.Vectors"; -#else - return "System.Numerics"; -#endif default: _ASSERTE(!"Invalid AssemblyRef token!"); return NULL; |