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/zap/zapinfo.cpp | |
| parent | 396f7d43b3c0f3ca7034a6d1d9cd7d6914778a1e (diff) | |
| download | coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.gz coreclr-54891e0650e69f08832f75a40dc102efc6115d38.tar.bz2 coreclr-54891e0650e69f08832f75a40dc102efc6115d38.zip | |
Remove always defined FEATURE_CORECLR
Diffstat (limited to 'src/zap/zapinfo.cpp')
| -rw-r--r-- | src/zap/zapinfo.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/src/zap/zapinfo.cpp b/src/zap/zapinfo.cpp index d2362d4b90..4b2f39a264 100644 --- a/src/zap/zapinfo.cpp +++ b/src/zap/zapinfo.cpp @@ -466,10 +466,6 @@ void ZapInfo::CompileMethod() return; } -#if !defined(FEATURE_CORECLR) - // Ask the JIT to generate desktop-quirk-compatible code. - m_jitFlags.Set(CORJIT_FLAGS::CORJIT_FLAG_DESKTOP_QUIRKS); -#endif if (m_pImage->m_stats) { @@ -1239,9 +1235,6 @@ int ZapInfo::canHandleException(struct _EXCEPTION_POINTERS *pExceptionPointers) int ZapInfo::doAssert(const char* szFile, int iLine, const char* szExpr) { -#if defined(CROSSGEN_COMPILE) && !defined(FEATURE_CORECLR) - ThrowHR(COR_E_INVALIDPROGRAM); -#else #if defined(_DEBUG) return(_DbgBreakCheck(szFile, iLine, szExpr)); @@ -1249,7 +1242,6 @@ int ZapInfo::doAssert(const char* szFile, int iLine, const char* szExpr) return(true); // break into debugger #endif -#endif } void ZapInfo::reportFatalError(CorJitResult result) { @@ -2574,9 +2566,6 @@ void ZapInfo::recordRelocation(void *location, void *target, break; case IMAGE_REL_BASED_PTR: -#if defined(_TARGET_AMD64_) && !defined(FEATURE_CORECLR) - _ASSERTE(!"Why we are not using RIP relative address?"); -#endif *(UNALIGNED TADDR *)location = (TADDR)targetOffset; break; @@ -3277,15 +3266,6 @@ size_t ZapInfo::getClassModuleIdForStatics(CORINFO_CLASS_HANDLE cls, CORINFO_MOD // if the fixups were exclusively based on the moduleforstatics lookup cls = NULL; -#ifndef FEATURE_CORECLR - - // Is this mscorlib.dll (which has ModuleDomainId of 0 (tagged == 1), then you don't need a fixup - if (moduleId == (size_t) 1) - { - *ppIndirection = NULL; - return (size_t) 1; - } -#endif if (module == m_pImage->m_hModule) { @@ -3643,15 +3623,6 @@ void ZapInfo::reportInliningDecision (CORINFO_METHOD_HANDLE inlinerHnd, const char * reason) { -#ifndef FEATURE_CORECLR - if (!dontInline(inlineResult) && inlineeHnd != NULL) - { - // We deliberately report m_currentMethodHandle (not inlinerHnd) as inliner, because - // if m_currentMethodHandle != inlinerHnd, it simply means that inlinerHnd is intermediate link - // in inlining into m_currentMethodHandle, and we have no interest to track those intermediate links now. - m_pImage->m_pPreloader->ReportInlining(m_currentMethodHandle, inlineeHnd); - } -#endif //FEATURE_CORECLR return m_pEEJitInfo->reportInliningDecision(inlinerHnd, inlineeHnd, inlineResult, reason); } |