diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-01-11 09:48:43 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-01-11 01:48:43 +0100 |
| commit | 2fc44782c783f363c1a98e0767f6fa65b5548c95 (patch) | |
| tree | e188a27a929664f93481f395ca7c4b18c794167d /src/vm/eetwain.cpp | |
| parent | 09c95bfa26420b7f29d04b5d47a06cf52f430ffe (diff) | |
| download | coreclr-2fc44782c783f363c1a98e0767f6fa65b5548c95.tar.gz coreclr-2fc44782c783f363c1a98e0767f6fa65b5548c95.tar.bz2 coreclr-2fc44782c783f363c1a98e0767f6fa65b5548c95.zip | |
[x86/Linux] Fix WIN64EXCEPTIONS build error (#8629)
* Move GetUnwindInfo and GetNumberOfUnwindInfos into the real code header
This commit fixes #8342.
* Use WIN64EXCEPTIONS instead of _TARGET_X86_
* Revise FaultingExceptionFrame
This commit revises FaultingExceptionFrame to support WIN64EXCEPTIONS in
x86/Linux port.
* Add RUNTIME_FUNCTION__EndAddress as NYI
* Revise regdisp.h
* Revise eetwain.h
* Comment out exinfo.cpp if WIN64EXCEPTIONS is defined
* Revises excep.cpp
* Fix mistmatch in ThrowControlForThread defintion
* Revises cgenx86.cpp
* Disable SEH-based exception handlers when WIN64EXCEPTIONS is defined
* Revise stackwalk.cpp
* Revise jitinterface.cpp
* Revise readytorun.h
* Revise dbgipcevents.h
* Revise zapcode.cpp
* Revise clrnt.h
* Fix Windows build error
* Mark FaultingExceptionFrame::UpdateRegDisplay as NYI
* Revise per feedback
* Revert #if defined(..) as #ifdef
* Fix style changes
* Fix style changes
* Remove #undef _TARGET_X86_
* 2nd attempt to fix Windows build error
* Revise per feedback
* Revert the chagnes in clrdefinitions.cmake and add BIT32 in CMakeLists.txt
* Use !BIT64 instead of BIT32
* Include exceptionhandling.cpp and gcinfodecoder.cpp in build
This commit includes exceptionhandling.cpp and gcinfodecoder.cpp in
build, and fixes related compile errors.
* Fix COMPlus_EndCatch undefined reference
* Fix build error
* Fix GcInfoDecoder-related undefined references
* Fix AdjustContextForVirtualStub undefined reference
* Fix GetCallerSP undefined reference
* Fix ResetThreadAbortState undefined reference
* Attempt to fix Windows build error
* Fix CLRNoCatchHandler undefined reference
* Another attemp to fix Windows build error
* Fix GetXXXFromRedirectedStubStackFrame undefined references
* Fix Windows Build Error
* Add RtlpGetFunctionEndAddress and RtlVirtualUnwind as NYI
* Fix undefined references on JIT helpers
* Enable Dummy Application Run with WIN64EXCEPTIONS
* Revert "Move GetUnwindInfo and GetNumberOfUnwindInfos into the real code header"
This reverts commit c2bad85ac1136be3c6fb6ad7eedc5b3814b2ab29.
* Use indirect code header when WIN64EXCEPTIONS is enabled
* Port 'SyncRegDisplayToCurrentContext' and 'FillRegDisplay'
* Revise style 'RUNTIME_FUNCTION__SetUnwindInfoAddress'
* Extract out HandlerData from #ifdef region
* Add UNIXTODO
* Add UNIXTODO
* Port 'GetRegdisplayReturnValue'
* Fix incorrect comment
* Remove messages that mentions WIN32EXCEPTIONS
* Revise AdjustContextForWriteBarrier
* Port 'FaultingExceptionFrame::UpdateRegDisplay'
* Extract out 'AdjustContextForVirtualStub' and 'CLRNoCatchHandler' from #ifdef region
* Merge two #ifdef regions
* Set WIN64EXCEPTIONS as a default for x86/Linux
* Remove unnecessary #ifdef from ThrowControlForThread
* Remove unnecessary stubs
* Add Dependency Check between Compile Flags
* Revise per feedback
Diffstat (limited to 'src/vm/eetwain.cpp')
| -rw-r--r-- | src/vm/eetwain.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/vm/eetwain.cpp b/src/vm/eetwain.cpp index 2ce7b59578..16b9de457f 100644 --- a/src/vm/eetwain.cpp +++ b/src/vm/eetwain.cpp @@ -3048,7 +3048,7 @@ unsigned SKIP_ALLOC_FRAME(int size, PTR_CBYTE base, unsigned offset) #endif // !USE_GC_INFO_DECODER -#if !defined(_TARGET_X86_) && !defined(CROSSGEN_COMPILE) +#if defined(WIN64EXCEPTIONS) && !defined(CROSSGEN_COMPILE) void EECodeManager::EnsureCallerContextIsValid( PREGDISPLAY pRD, StackwalkCacheEntry* pCacheEntry, EECodeInfo * pCodeInfo /*= NULL*/ ) { @@ -3105,7 +3105,7 @@ size_t EECodeManager::GetCallerSp( PREGDISPLAY pRD ) return (size_t) (GetSP(pRD->pCallerContext)); } -#endif // !defined(_TARGET_X86_) && !defined(CROSSGEN_COMPILE) +#endif // WIN64EXCEPTIONS && !CROSSGEN_COMPILE /* * Light unwind the current stack frame, using provided cache entry. @@ -5360,6 +5360,7 @@ PTR_VOID EECodeManager::GetExactGenericsToken(SIZE_T baseStackSlot, { LIMITED_METHOD_DAC_CONTRACT; +#ifdef USE_GC_INFO_DECODER GCInfoToken gcInfoToken = pCodeInfo->GetGCInfoToken(); GcInfoDecoder gcInfoDecoder( @@ -5409,6 +5410,10 @@ PTR_VOID EECodeManager::GetExactGenericsToken(SIZE_T baseStackSlot, return PTR_VOID(taExactGenericsToken); } return NULL; +#else // USE_GC_INFO_DECODER + PORTABILITY_ASSERT("EECodeManager::GetExactGenericsToken"); + return NULL; +#endif // USE_GC_INFO_DECODER } |