Skip to content

Fix inverted gc contract condition for functions that may create a thread #119931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 23, 2025
+41 −91
Merged

Fix inverted gc contract condition for functions that may create a thread #119931

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
74d3b7f
Fix inverted gc contract condition for functions that may create a th…
kg Sep 20, 2025
adc9221
Update corhost contractl's
kg Sep 22, 2025
d3a5366
Update some contractl's
kg Sep 22, 2025
60c9461
Update contractl's
kg Sep 22, 2025
096c21c
Remove dead code
kg Sep 22, 2025
e72440b
Cleanup SetExposedObject
kg Sep 22, 2025
3a516be
Cleanups based on PR feedback
kg Sep 22, 2025
e797a0e
Fix typo
kg Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/coreclr/vm/appdomain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2778,7 +2778,7 @@ void AppDomain::SetFriendlyName(LPCWSTR pwzFriendlyName)
CONTRACTL
{
THROWS;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS; // for NameChangeEvent
MODE_ANY;
INJECT_FAULT(COMPlusThrowOM(););
}
Expand Down Expand Up @@ -2835,7 +2835,7 @@ LPCWSTR AppDomain::GetFriendlyNameForDebugger()
CONTRACT (LPCWSTR)
{
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
MODE_ANY;
POSTCONDITION(CheckPointer(RETVAL));
}
Expand Down
14 changes: 7 additions & 7 deletions src/coreclr/vm/corhost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ HRESULT CorHost2::Stop()
{
NOTHROW;
ENTRY_POINT; // We're bringing the EE down, so no point in probing
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
}
CONTRACTL_END;
if (!g_fEEStarted)
Expand Down Expand Up @@ -491,7 +491,7 @@ HRESULT CorHost2::ExecuteInAppDomain(DWORD dwAppDomainId,
CONTRACTL
{
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
ENTRY_POINT; // This is called by a host.
}
CONTRACTL_END;
Expand Down Expand Up @@ -527,7 +527,7 @@ HRESULT CorHost2::CreateAppDomainWithManager(
CONTRACTL
{
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
ENTRY_POINT; // This is called by a host.
}
CONTRACTL_END;
Expand Down Expand Up @@ -686,7 +686,7 @@ HRESULT CorHost2::CreateDelegate(
CONTRACTL
{
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
ENTRY_POINT; // This is called by a host.
}
CONTRACTL_END;
Expand Down Expand Up @@ -770,7 +770,7 @@ HRESULT CorHost2::Authenticate(ULONGLONG authKey)
CONTRACTL
{
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
ENTRY_POINT; // This is called by a host.
}
CONTRACTL_END;
Expand All @@ -784,7 +784,7 @@ HRESULT CorHost2::RegisterMacEHPort()
CONTRACTL
{
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
ENTRY_POINT; // This is called by a host.
}
CONTRACTL_END;
Expand All @@ -797,7 +797,7 @@ HRESULT CorHost2::SetStartupFlags(STARTUP_FLAGS flag)
CONTRACTL
{
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
ENTRY_POINT; // This is called by a host.
}
CONTRACTL_END;
Expand Down
28 changes: 14 additions & 14 deletions src/coreclr/vm/threads.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ DWORD Thread::JoinEx(DWORD timeout, WaitMode mode)
{
CONTRACTL {
THROWS;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS; // For DoAppropriateWait
}
CONTRACTL_END;

Expand Down Expand Up @@ -583,7 +583,7 @@ static void DeleteThread(Thread* pThread)
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
}
CONTRACTL_END;

Expand Down Expand Up @@ -628,7 +628,7 @@ Thread* SetupThread()
{
CONTRACTL {
THROWS;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down Expand Up @@ -773,7 +773,7 @@ Thread* SetupThreadNoThrow(HRESULT *pHR)
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
if (GetThreadNULLOk()) {DISABLED(GC_NOTRIGGER);} else {GC_TRIGGERS;}
}
CONTRACTL_END;

Expand Down Expand Up @@ -824,7 +824,7 @@ Thread* SetupUnstartedThread(SetupUnstartedThreadFlags flags)
{
CONTRACTL {
THROWS;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down Expand Up @@ -1305,7 +1305,7 @@ Thread::Thread()
{
CONTRACTL {
THROWS;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down Expand Up @@ -1543,7 +1543,7 @@ void Thread::InitThread()
{
CONTRACTL {
THROWS;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down Expand Up @@ -2198,7 +2198,7 @@ int Thread::IncExternalCount()
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
}
CONTRACTL_END;

Expand Down Expand Up @@ -2229,7 +2229,7 @@ int Thread::DecExternalCount(BOOL holdingLock)
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down Expand Up @@ -2394,7 +2394,7 @@ Thread::~Thread()
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down Expand Up @@ -2670,7 +2670,7 @@ void Thread::CleanupCOMState()
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down Expand Up @@ -2768,7 +2768,7 @@ void Thread::OnThreadTerminate(BOOL holdingLock)
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS; // For DecExternalCount & other calls
}
CONTRACTL_END;

Expand Down Expand Up @@ -4053,7 +4053,7 @@ void Thread::SetExposedObject(OBJECTREF exposed)
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_NOTRIGGER;
}
CONTRACTL_END;

Expand Down Expand Up @@ -4931,7 +4931,7 @@ void ThreadStore::AddThread(Thread *newThread)
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/vm/threadsuspend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1190,7 +1190,7 @@ Thread::UserAbort(EEPolicy::ThreadAbortTypes abortType, DWORD timeout)
CONTRACTL
{
THROWS;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS; // For GetXxxException
}
CONTRACTL_END;

Expand Down Expand Up @@ -3590,7 +3590,7 @@ void ThreadSuspend::ResumeAllThreads(BOOL SuspendSucceeded)
{
CONTRACTL {
NOTHROW;
if (GetThreadNULLOk()) {GC_TRIGGERS;} else {DISABLED(GC_NOTRIGGER);}
GC_TRIGGERS;
}
CONTRACTL_END;

Expand Down