Skip to content

GC coverage can now occur in scenarios where a thread doesn't exist. #33615

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
AaronRobinsonMSFT merged 5 commits into from
Mar 17, 2020
Merged

GC coverage can now occur in scenarios where a thread doesn't exist. #33615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8570bc9
GC coverage can now occur in scenarios where a thread doesn't exist.
AaronRobinsonMSFT Mar 16, 2020
3564b03
Update gccover.cpp
AaronRobinsonMSFT Mar 16, 2020
33378a7
Remove MethodDesc from GC coverage.
AaronRobinsonMSFT Mar 16, 2020
d6989bd
Code review and fix some asserts when running the Debug version of te…
AaronRobinsonMSFT Mar 16, 2020
ee53fec
Limit JIT flag manipulation to FEATURE_TIERED_COMPILATION
AaronRobinsonMSFT Mar 17, 2020
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
6 changes: 6 additions & 0 deletions src/coreclr/src/vm/excep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7979,6 +7979,7 @@ LONG WINAPI CLRVectoredExceptionHandlerShim(PEXCEPTION_POINTERS pExceptionInfo)
//
// 1) We have a valid Thread object (implies exception on managed thread)
// 2) Not a valid Thread object but the IP is in the execution engine (implies native thread within EE faulted)
// 3) The exception occurred in a GC marked location when no thread exists (i.e. reverse P/Invoke with NativeCallableAttribute).
if (pThread || fExceptionInEE)
{
if (!bIsGCMarker)
Expand Down Expand Up @@ -8066,6 +8067,11 @@ LONG WINAPI CLRVectoredExceptionHandlerShim(PEXCEPTION_POINTERS pExceptionInfo)
#endif // FEATURE_EH_FUNCLETS

}
else if (bIsGCMarker)
{
_ASSERTE(pThread == NULL);
result = EXCEPTION_CONTINUE_EXECUTION;
}

SetLastError(dwLastError);

Expand Down
12 changes: 11 additions & 1 deletion src/coreclr/src/vm/gccover.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,16 @@ BOOL OnGcCoverageInterrupt(PCONTEXT regs)
}

Thread* pThread = GetThread();
_ASSERTE(pThread);
if (!pThread)
{
// No thread at the moment so we aren't doing coverage for this function.
// This should only occur for methods with the NativeCallableAttribute,
// where the call could be coming from a thread unknown to the CLR and
// we haven't created a thread yet - see PreStubWorker_Preemptive().
_ASSERTE(pMD->HasNativeCallableAttribute());
RemoveGcCoverageInterrupt(instrPtr, savedInstrPtr);
return TRUE;
}

#if defined(USE_REDIRECT_FOR_GCSTRESS) && !defined(TARGET_UNIX)
// If we're unable to redirect, then we simply won't test GC at this
Expand Down Expand Up @@ -1452,6 +1461,7 @@ void DoGcStress (PCONTEXT regs, NativeCodeVersion nativeCodeVersion)
DWORD offset = codeInfo.GetRelOffset();

Thread *pThread = GetThread();
_ASSERTE(pThread);

if (!IsGcCoverageInterruptInstruction(instrPtr))
{
Expand Down
11 changes: 6 additions & 5 deletions src/coreclr/src/vm/jitinterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12678,20 +12678,21 @@ PCODE UnsafeJitFunction(PrepareCodeConfig* config,

flags = GetCompileFlags(ftn, flags, &methodInfo);

// If the reverse P/Invoke flag is used, we aren't going to support
// any tiered compilation.
if (flags.IsSet(CORJIT_FLAGS::CORJIT_FLAG_REVERSE_PINVOKE))
#ifdef FEATURE_TIERED_COMPILATION
// Clearing all tier flags and mark as optimized if the reverse P/Invoke
// flag is used and the function is eligible.
if (flags.IsSet(CORJIT_FLAGS::CORJIT_FLAG_REVERSE_PINVOKE)
&& ftn->IsEligibleForTieredCompilation())
{
_ASSERTE(config->GetCallerGCMode() != CallerGCMode::Coop);

// Clear all possible states.
flags.Clear(CORJIT_FLAGS::CORJIT_FLAG_TIER0);
flags.Clear(CORJIT_FLAGS::CORJIT_FLAG_TIER1);

#ifdef FEATURE_TIERED_COMPILATION
config->SetJitSwitchedToOptimized();
#endif // FEATURE_TIERED_COMPILATION
}
#endif // FEATURE_TIERED_COMPILATION

#ifdef _DEBUG
if (!flags.IsSet(CORJIT_FLAGS::CORJIT_FLAG_SKIP_VERIFICATION))
Expand Down