Delete unused Thread::YieldTask (#15091)

jkotas · web-flow · commit 01ffc0328ae6 · 2017-11-18T12:02:58.000-08:00
diff --git a/src/debug/ee/debugger.cpp b/src/debug/ee/debugger.cpp
@@ -1027,9 +1027,7 @@ MemoryRange Debugger::s_hijackFunction[kMaxHijackFunctions] =
      GetMemoryRangeForFunction(RedirectedHandledJITCaseForDbgThreadControl_Stub,
                                RedirectedHandledJITCaseForDbgThreadControl_StubEnd),
      GetMemoryRangeForFunction(RedirectedHandledJITCaseForUserSuspend_Stub,
-                               RedirectedHandledJITCaseForUserSuspend_StubEnd),
-     GetMemoryRangeForFunction(RedirectedHandledJITCaseForYieldTask_Stub,
-                               RedirectedHandledJITCaseForYieldTask_StubEnd)
+                               RedirectedHandledJITCaseForUserSuspend_StubEnd)
 #if defined(HAVE_GCCOVER) && defined(_TARGET_AMD64_)
      ,
      GetMemoryRangeForFunction(RedirectedHandledJITCaseForGCStress_Stub,
diff --git a/src/debug/ee/debugger.h b/src/debug/ee/debugger.h
@@ -2973,8 +2973,6 @@ void RedirectedHandledJITCaseForDbgThreadControl_StubEnd();
 void RedirectedHandledJITCaseForUserSuspend_Stub();
 void RedirectedHandledJITCaseForUserSuspend_StubEnd();
 
-void RedirectedHandledJITCaseForYieldTask_Stub();
-void RedirectedHandledJITCaseForYieldTask_StubEnd();
 #if defined(HAVE_GCCOVER) && defined(_TARGET_AMD64_)
 void RedirectedHandledJITCaseForGCStress_Stub();
 void RedirectedHandledJITCaseForGCStress_StubEnd();
diff --git a/src/vm/amd64/RedirectedHandledJITCase.asm b/src/vm/amd64/RedirectedHandledJITCase.asm
@@ -98,7 +98,6 @@ NESTED_END RedirectedHandledJITCaseFor&reason&_Stub, _TEXT
 GenerateRedirectedHandledJITCaseStub GCThreadControl
 GenerateRedirectedHandledJITCaseStub DbgThreadControl
 GenerateRedirectedHandledJITCaseStub UserSuspend
-GenerateRedirectedHandledJITCaseStub YieldTask
 
 ifdef _DEBUG
 ifdef HAVE_GCCOVER
diff --git a/src/vm/amd64/asmconstants.h b/src/vm/amd64/asmconstants.h
@@ -175,8 +175,6 @@ ASMCONSTANT_OFFSETOF_ASSERT(gc_alloc_context, alloc_limit);
 ASMCONSTANTS_C_ASSERT(OFFSETOF__ThreadExceptionState__m_pCurrentTracker
                     == offsetof(ThreadExceptionState, m_pCurrentTracker));
 
-#define               THREAD_CATCHATSAFEPOINT_BITS 0x5F
-ASMCONSTANTS_C_ASSERT(THREAD_CATCHATSAFEPOINT_BITS == Thread::TS_CatchAtSafePoint);
 #endif // CROSSGEN_COMPILE
 
 
diff --git a/src/vm/arm/asmhelpers.S b/src/vm/arm/asmhelpers.S
@@ -880,8 +880,6 @@ RedirectedHandledJITCaseFor\reason\()_StubEnd:
         GenerateRedirectedHandledJITCaseStub DbgThreadControl
 // ------------------------------------------------------------------
         GenerateRedirectedHandledJITCaseStub UserSuspend
-// ------------------------------------------------------------------
-        GenerateRedirectedHandledJITCaseStub YieldTask
 
 #ifdef _DEBUG
 // ------------------------------------------------------------------
diff --git a/src/vm/arm/asmhelpers.asm b/src/vm/arm/asmhelpers.asm
@@ -1291,8 +1291,6 @@ $__RedirectionStubEndFuncName
         GenerateRedirectedHandledJITCaseStub DbgThreadControl
 ; ------------------------------------------------------------------
         GenerateRedirectedHandledJITCaseStub UserSuspend
-; ------------------------------------------------------------------
-        GenerateRedirectedHandledJITCaseStub YieldTask
 
 #ifdef _DEBUG
 ; ------------------------------------------------------------------
diff --git a/src/vm/arm64/asmhelpers.S b/src/vm/arm64/asmhelpers.S
@@ -999,8 +999,6 @@ NESTED_END OnHijackTripThread, _TEXT
 //GenerateRedirectedHandledJITCaseStub DbgThreadControl
 // ------------------------------------------------------------------
 //GenerateRedirectedHandledJITCaseStub UserSuspend
-// ------------------------------------------------------------------
-//GenerateRedirectedHandledJITCaseStub YieldTask
 
 #ifdef _DEBUG
 // ------------------------------------------------------------------
diff --git a/src/vm/arm64/asmhelpers.asm b/src/vm/arm64/asmhelpers.asm
@@ -985,8 +985,6 @@ UM2MThunk_WrapperHelper_RegArgumentsSetup
         GenerateRedirectedHandledJITCaseStub DbgThreadControl
 ;; ------------------------------------------------------------------
         GenerateRedirectedHandledJITCaseStub UserSuspend
-;; ------------------------------------------------------------------
-        GenerateRedirectedHandledJITCaseStub YieldTask
 
 #ifdef _DEBUG
 ; ------------------------------------------------------------------
diff --git a/src/vm/frames.cpp b/src/vm/frames.cpp
@@ -1626,7 +1626,7 @@ void HelperMethodFrame::Push()
     // Push the frame
     Frame::Push(pThread);
 
-    if (!pThread->HasThreadStateOpportunistic((Thread::ThreadState)(Thread::TS_YieldRequested | Thread::TS_AbortRequested)))
+    if (!pThread->HasThreadStateOpportunistic(Thread::TS_AbortRequested))
         return;
 
     // Outline the slow path for better perf
@@ -1675,11 +1675,6 @@ NOINLINE void HelperMethodFrame::PushSlowHelper()
         }
 
     }
-
-    if (m_pThread->IsYieldRequested())
-    {
-        __SwitchToThread(0, CALLER_LIMITS_SPINNING);
-    }
 }
 
 NOINLINE void HelperMethodFrame::PopSlowHelper()
diff --git a/src/vm/i386/RedirectedHandledJITCase.asm b/src/vm/i386/RedirectedHandledJITCase.asm
@@ -91,7 +91,6 @@ _HijackFunctionStart@0 endp
 GenerateRedirectedHandledJITCaseStub <GCThreadControl>
 GenerateRedirectedHandledJITCaseStub <DbgThreadControl>
 GenerateRedirectedHandledJITCaseStub <UserSuspend>
-GenerateRedirectedHandledJITCaseStub <YieldTask>
 
 ; Hijack for exceptions.
 ; This can be used to hijack at a 2nd-chance exception and execute the UEF
diff --git a/src/vm/i386/asmconstants.h b/src/vm/i386/asmconstants.h
@@ -213,9 +213,6 @@ ASMCONSTANTS_C_ASSERT(Thread_m_dwLockCount == offsetof(Thread, m_dwLockCount))
 #define Thread_m_ThreadId 0x1C
 ASMCONSTANTS_C_ASSERT(Thread_m_ThreadId == offsetof(Thread, m_ThreadId))
 
-#define TS_CatchAtSafePoint_ASM 0x5F
-ASMCONSTANTS_C_ASSERT(Thread::TS_CatchAtSafePoint == TS_CatchAtSafePoint_ASM)
-
 #ifdef FEATURE_HIJACK
 #define TS_Hijacked_ASM 0x80
 ASMCONSTANTS_C_ASSERT(Thread::TS_Hijacked == TS_Hijacked_ASM)
diff --git a/src/vm/threads.cpp b/src/vm/threads.cpp
@@ -7549,11 +7549,6 @@ void CommonTripThread()
 
     thread->HandleThreadAbort ();
 
-    if (thread->IsYieldRequested())
-    {
-        __SwitchToThread(0, CALLER_LIMITS_SPINNING);
-    }
-
     if (thread->CatchAtSafePoint())
     {
         _ASSERTE(!ThreadStore::HoldingThreadStore(thread));
@@ -10212,10 +10207,6 @@ void Thread::InternalSwitchOut()
         m_ThreadHandleForClose = hThread;
     }
 
-    // The host is getting control of this thread, so if we were trying
-    // to yield this thread, we can stop those attempts now.
-    ResetThreadState(TS_YieldRequested);
-
     _ASSERTE (!fNoTLS ||
               (CExecutionEngine::CheckThreadStateNoCreate(0) == NULL));
     }
@@ -10438,11 +10429,6 @@ HRESULT Thread::Reset(BOOL fFull)
         IfFailGo(E_UNEXPECTED);
     }
 
-    if (HasThreadState(Thread::TS_YieldRequested))
-    {
-        ResetThreadState(Thread::TS_YieldRequested);
-    }
-
     _ASSERTE (!PreemptiveGCDisabled());
     _ASSERTE (m_pFrame == FRAME_TOP);
     // A host should not recycle a CLRTask if the task is created by us through CreateNewThread.
@@ -10535,11 +10521,6 @@ HRESULT Thread::ExitTask ()
     if (this != GetThread())
         IfFailGo(HOST_E_INVALIDOPERATION);
 
-    if (HasThreadState(Thread::TS_YieldRequested))
-    {
-        ResetThreadState(Thread::TS_YieldRequested);
-    }
-
 #ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
     if (IsCoInitialized())
     {
diff --git a/src/vm/threads.h b/src/vm/threads.h
@@ -305,7 +305,6 @@ class Thread
 
     enum ThreadState
     {
-        TS_YieldRequested         = 0x00000040,    // The task should yield
     };
 
     BOOL HasThreadState(ThreadState ts)
@@ -1100,7 +1099,7 @@ class Thread: public IUnknown
 
         TS_LegalToJoin            = 0x00000020,    // Is it now legal to attempt a Join()
 
-        TS_YieldRequested         = 0x00000040,    // The task should yield
+        // unused                 = 0x00000040,
 
 #ifdef FEATURE_HIJACK
         TS_Hijacked               = 0x00000080,    // Return address has been hijacked
@@ -1157,7 +1156,7 @@ class Thread: public IUnknown
 
         // We require (and assert) that the following bits are less than 0x100.
         TS_CatchAtSafePoint = (TS_UserSuspendPending | TS_AbortRequested |
-                               TS_GCSuspendPending | TS_DebugSuspendPending | TS_GCOnTransitions | TS_YieldRequested),
+                               TS_GCSuspendPending | TS_DebugSuspendPending | TS_GCOnTransitions),
     };
 
     // Thread flags that aren't really states in themselves but rather things the thread
@@ -2966,12 +2965,6 @@ class Thread: public IUnknown
     BOOL           ReadyForAsyncException();
 
 public:
-    inline BOOL IsYieldRequested()
-    {
-        LIMITED_METHOD_CONTRACT;
-        return (m_State & TS_YieldRequested);
-    }
-
     void           UserInterrupt(ThreadInterruptMode mode);
 
     void           SetAbortRequest(EEPolicy::ThreadAbortTypes abortType);  // Should only be called by ADUnload
@@ -3520,7 +3513,6 @@ class Thread: public IUnknown
     BOOL CheckForAndDoRedirectForDbg();
     BOOL CheckForAndDoRedirectForGC();
     BOOL CheckForAndDoRedirectForUserSuspend();
-    BOOL CheckForAndDoRedirectForYieldTask();
 
     // Exception handling must be very aware of redirection, so we provide a helper
     // to identifying redirection targets
@@ -3689,7 +3681,6 @@ class Thread: public IUnknown
         RedirectReason_GCSuspension,
         RedirectReason_DebugSuspension,
         RedirectReason_UserSuspension,
-        RedirectReason_YieldTask,
 #if defined(HAVE_GCCOVER) && defined(USE_REDIRECT_FOR_GCSTRESS) // GCCOVER
         RedirectReason_GCStress,
 #endif // HAVE_GCCOVER && USE_REDIRECT_FOR_GCSTRESS
@@ -3698,7 +3689,6 @@ class Thread: public IUnknown
     static void __stdcall RedirectedHandledJITCaseForDbgThreadControl();
     static void __stdcall RedirectedHandledJITCaseForGCThreadControl();
     static void __stdcall RedirectedHandledJITCaseForUserSuspend();
-    static void __stdcall RedirectedHandledJITCaseForYieldTask();
 #if defined(HAVE_GCCOVER) && defined(USE_REDIRECT_FOR_GCSTRESS) // GCCOVER
     static void __stdcall Thread::RedirectedHandledJITCaseForGCStress();
 #endif // defined(HAVE_GCCOVER) && USE_REDIRECT_FOR_GCSTRESS
diff --git a/src/vm/threadsuspend.cpp b/src/vm/threadsuspend.cpp
@@ -39,16 +39,13 @@ CLREventBase * ThreadSuspend::s_hAbortEvtCache = NULL;
 extern "C" void             RedirectedHandledJITCaseForGCThreadControl_Stub(void);
 extern "C" void             RedirectedHandledJITCaseForDbgThreadControl_Stub(void);
 extern "C" void             RedirectedHandledJITCaseForUserSuspend_Stub(void);
-extern "C" void             RedirectedHandledJITCaseForYieldTask_Stub(void);
 
 #define GetRedirectHandlerForGCThreadControl()      \
                 ((PFN_REDIRECTTARGET) GetEEFuncEntryPoint(RedirectedHandledJITCaseForGCThreadControl_Stub))
 #define GetRedirectHandlerForDbgThreadControl()     \
                 ((PFN_REDIRECTTARGET) GetEEFuncEntryPoint(RedirectedHandledJITCaseForDbgThreadControl_Stub))
 #define GetRedirectHandlerForUserSuspend()          \
                 ((PFN_REDIRECTTARGET) GetEEFuncEntryPoint(RedirectedHandledJITCaseForUserSuspend_Stub))
-#define GetRedirectHandlerForYieldTask()            \
-                ((PFN_REDIRECTTARGET) GetEEFuncEntryPoint(RedirectedHandledJITCaseForYieldTask_Stub))
 
 #if defined(_TARGET_AMD64_) || defined(_TARGET_ARM_) || defined(_TARGET_ARM64_)
 #if defined(HAVE_GCCOVER) && defined(USE_REDIRECT_FOR_GCSTRESS) // GCCOVER
@@ -3090,12 +3087,6 @@ void Thread::RareDisablePreemptiveGC()
     // waiting for GC
     _ASSERTE ((m_StateNC & Thread::TSNC_OwnsSpinLock) == 0);
 
-    // If this thread is asked to yield
-    if (m_State & TS_YieldRequested)
-    {
-        __SwitchToThread(0, CALLER_LIMITS_SPINNING);
-    }
-
     if (!GCHeapUtilities::IsGCHeapInitialized())
     {
         goto Exit;
@@ -3931,12 +3922,6 @@ void __stdcall Thread::RedirectedHandledJITCase(RedirectReason reason)
             case RedirectReason_UserSuspension:
                 // Do nothing;
                 break;
-            case RedirectReason_YieldTask:
-                if (pThread->IsYieldRequested())
-                {
-                    __SwitchToThread(0, CALLER_LIMITS_SPINNING);
-                }
-                break;
             default:
                 _ASSERTE(!"Invalid redirect reason");
                 break;
@@ -4098,15 +4083,6 @@ void __stdcall Thread::RedirectedHandledJITCaseForUserSuspend()
     RedirectedHandledJITCase(RedirectReason_UserSuspension);
 }
 
-//***********************
-// Like the above, but called for YieldTask.
-//
-void __stdcall Thread::RedirectedHandledJITCaseForYieldTask()
-{
-    WRAPPER_NO_CONTRACT;
-    RedirectedHandledJITCase(RedirectReason_YieldTask);
-}
-
 #if defined(HAVE_GCCOVER) && defined(USE_REDIRECT_FOR_GCSTRESS) // GCCOVER
 
 //***********************
@@ -4348,8 +4324,7 @@ BOOL Thread::IsAddrOfRedirectFunc(void * pFuncAddr)
     return
         (pFuncAddr == GetRedirectHandlerForGCThreadControl()) ||
         (pFuncAddr == GetRedirectHandlerForDbgThreadControl()) ||
-        (pFuncAddr == GetRedirectHandlerForUserSuspend()) ||
-        (pFuncAddr == GetRedirectHandlerForYieldTask());
+        (pFuncAddr == GetRedirectHandlerForUserSuspend());
 }
 
 //************************************************************************
@@ -4400,22 +4375,6 @@ BOOL Thread::CheckForAndDoRedirectForUserSuspend()
     return CheckForAndDoRedirect(GetRedirectHandlerForUserSuspend());
 }
 
-//*************************************************************************
-// Redirect thread to make task yield.
-BOOL Thread::CheckForAndDoRedirectForYieldTask()
-{
-    CONTRACTL
-    {
-        NOTHROW;
-        GC_NOTRIGGER;
-        MODE_ANY;
-    }
-    CONTRACTL_END;
-
-    LOG((LF_SYNC, LL_INFO1000, "Redirecting thread %08x for YieldTask", GetThreadId()));
-    return CheckForAndDoRedirect(GetRedirectHandlerForYieldTask());
-}
-
 #if defined(HAVE_GCCOVER) && defined(USE_REDIRECT_FOR_GCSTRESS) // GCCOVER
 //*************************************************************************
 // Redirect thread at a GC stress point.

Original file line number	Diff line number	Diff line change
`@@ -1626,7 +1626,7 @@ void HelperMethodFrame::Push()`
`1626`	`1626`	`// Push the frame`
`1627`	`1627`	`Frame::Push(pThread);`
`1628`	`1628`
`1629`		`- if (!pThread->HasThreadStateOpportunistic((Thread::ThreadState)(Thread::TS_YieldRequested \| Thread::TS_AbortRequested)))`
	`1629`	`+ if (!pThread->HasThreadStateOpportunistic(Thread::TS_AbortRequested))`
`1630`	`1630`	`return;`
`1631`	`1631`
`1632`	`1632`	`// Outline the slow path for better perf`
`@@ -1675,11 +1675,6 @@ NOINLINE void HelperMethodFrame::PushSlowHelper()`
`1675`	`1675`	`}`
`1676`	`1676`
`1677`	`1677`	`}`
`1678`		`-`
`1679`		`- if (m_pThread->IsYieldRequested())`
`1680`		`- {`
`1681`		`- __SwitchToThread(0, CALLER_LIMITS_SPINNING);`
`1682`		`- }`
`1683`	`1678`	`}`
`1684`	`1679`
`1685`	`1680`	`NOINLINE void HelperMethodFrame::PopSlowHelper()`