From 1c6673b6c5d064d5b872bd593af792292b19827b Mon Sep 17 00:00:00 2001 From: Jonghyun Park Date: Tue, 24 Jan 2017 15:52:45 +0900 Subject: [PATCH] [x86/Linux] Port two preconditions in ExceptionTracker::ResetThreadAbortStatus (dotnet/coreclr#9079) Commit migrated from https://github.com/dotnet/coreclr/commit/97e702041f003a856555b8b809771920a74f0776 --- src/coreclr/src/vm/exceptionhandling.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/coreclr/src/vm/exceptionhandling.cpp b/src/coreclr/src/vm/exceptionhandling.cpp index fa6c682..5fe8a26 100644 --- a/src/coreclr/src/vm/exceptionhandling.cpp +++ b/src/coreclr/src/vm/exceptionhandling.cpp @@ -7028,8 +7028,10 @@ void ExceptionTracker::ResetThreadAbortStatus(PTR_Thread pThread, CrawlFrame *pC GC_NOTRIGGER; MODE_ANY; PRECONDITION(pThread != NULL); - WIN64_ONLY(PRECONDITION(pCf != NULL);) - WIN64_ONLY(PRECONDITION(!sfCurrentStackFrame.IsNull());) +#ifdef WIN64EXCEPTIONS + PRECONDITION(pCf != NULL); + PRECONDITION(!sfCurrentStackFrame.IsNull()); +#endif // WIN64EXCEPTIONS } CONTRACTL_END; -- 2.7.4