From 427e0c7f31c719b77f8e62adb60df8e669151c01 Mon Sep 17 00:00:00 2001
From: Andrew Au <cshung@gmail.com>
Date: Fri, 30 Nov 2018 13:40:44 -0800
Subject: [PATCH] Eliminate the requirement that abort requires no lock held on
 the current thread (dotnet/coreclr#21206)

Commit migrated from https://github.com/dotnet/coreclr/commit/08d9c11bdf09837ee39aad4766091ce44e6ee837
---
 src/coreclr/src/vm/threadsuspend.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/coreclr/src/vm/threadsuspend.cpp b/src/coreclr/src/vm/threadsuspend.cpp
index 67acec2..f33d38e 100644
--- a/src/coreclr/src/vm/threadsuspend.cpp
+++ b/src/coreclr/src/vm/threadsuspend.cpp
@@ -1121,12 +1121,6 @@ BOOL Thread::ReadyForAsyncException()
         return FALSE;
     }
 
-    // If we are doing safe abort, we can not abort a thread if it has locks.
-    if (m_AbortType == EEPolicy::TA_Safe && HasLockInCurrentDomain()) {
-        STRESS_LOG0(LF_APPDOMAIN, LL_INFO10, "in Thread::ReadyForAbort  HasLock\n");
-        return FALSE;
-    }
-
     REGDISPLAY rd;
 
     Frame *pStartFrame = NULL;
-- 
2.7.4