diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-04-19 03:27:29 +0900 |
|---|---|---|
| committer | Jan Vorlicek <janvorli@microsoft.com> | 2017-04-18 11:27:29 -0700 |
| commit | 98a41f0a8711e0d0f3cb0d56adc6f8d0c36c11d2 (patch) | |
| tree | ae95a392843e75b5bc7888c0b93b3f875cd4acbb /src/vm/exceptionhandling.h | |
| parent | bbe202b1de189812866acfa288ab1ac21a5fecdb (diff) | |
| download | coreclr-98a41f0a8711e0d0f3cb0d56adc6f8d0c36c11d2.tar.gz coreclr-98a41f0a8711e0d0f3cb0d56adc6f8d0c36c11d2.tar.bz2 coreclr-98a41f0a8711e0d0f3cb0d56adc6f8d0c36c11d2.zip | |
[x86/Linux] EH Support for Per-Frame P/Invoke Init (#10966)
Diffstat (limited to 'src/vm/exceptionhandling.h')
| -rw-r--r-- | src/vm/exceptionhandling.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/vm/exceptionhandling.h b/src/vm/exceptionhandling.h index 97f1526621..6d1f2b42a8 100644 --- a/src/vm/exceptionhandling.h +++ b/src/vm/exceptionhandling.h @@ -10,6 +10,11 @@ #ifdef WIN64EXCEPTIONS +#if defined(_TARGET_ARM_) || defined(_TARGET_X86_) +#define USE_PER_FRAME_PINVOKE_INIT +#endif // _TARGET_ARM_ || _TARGET_X86_ + + // This address lies in the NULL pointer partition of the process memory. // Accessing it will result in AV. #define INVALID_RESUME_ADDRESS 0x000000000000bad0 @@ -203,7 +208,11 @@ public: DWORD dwExceptionFlags, StackFrame sf, Thread* pThread, - StackTraceState STState ARM_ARG(PVOID pICFSetAsLimitFrame)); + StackTraceState STState +#ifdef USE_PER_FRAME_PINVOKE_INIT + , PVOID pICFSetAsLimitFrame +#endif // USE_PER_FRAME_PINVOKE_INIT + ); CLRUnwindStatus ProcessExplicitFrame( CrawlFrame* pcfThisFrame, |