diff options
| author | Jonghyun Park <parjong@gmail.com> | 2017-07-06 15:05:34 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2017-07-06 08:05:34 +0200 |
| commit | e5557aea38564be9c2e1630ae7b075c3b76837b3 (patch) | |
| tree | 1f6e296a809b7a9fc8a3a8d500b4b523a1cc780c /src/vm/exceptionhandling.cpp | |
| parent | 7e15d8f121df2f51e1eff74e765e64109a9574c0 (diff) | |
| download | coreclr-e5557aea38564be9c2e1630ae7b075c3b76837b3.tar.gz coreclr-e5557aea38564be9c2e1630ae7b075c3b76837b3.tar.bz2 coreclr-e5557aea38564be9c2e1630ae7b075c3b76837b3.zip | |
[x86/Linux] Enable thread-abort reraise loop prevention (#12646)
Diffstat (limited to 'src/vm/exceptionhandling.cpp')
| -rw-r--r-- | src/vm/exceptionhandling.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index dd95badf02..c6d42eddd7 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -1490,7 +1490,7 @@ void ExceptionTracker::InitializeCrawlFrame(CrawlFrame* pcfThisFrame, Thread* pT #endif // ESTABLISHER_FRAME_ADDRESS_IS_CALLER_SP } -#if defined(_TARGET_ARM_) || defined(_TARGET_ARM64_) +#ifdef ADJUST_PC_UNWOUND_TO_CALL // Further below, we will adjust the ControlPC based upon whether we are at a callsite or not. // We need to do this for "RegDisplay.ControlPC" field as well so that when data structures like // EECodeInfo initialize themselves using this field, they will have the correct absolute value @@ -1509,12 +1509,12 @@ void ExceptionTracker::InitializeCrawlFrame(CrawlFrame* pcfThisFrame, Thread* pT fAdjustRegdisplayControlPC = true; } +#endif // ADJUST_PC_UNWOUND_TO_CALL #if defined(_TARGET_ARM_) // Remove the Thumb bit ControlPCForEHSearch = ThumbCodeToDataPointer<DWORD_PTR, DWORD_PTR>(ControlPCForEHSearch); #endif -#endif // _TARGET_ARM_ || _TARGET_ARM64_ #ifdef ADJUST_PC_UNWOUND_TO_CALL // If the OS indicated that the IP is a callsite, then adjust the ControlPC by decrementing it |