Skip to content
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

Jump to bottom

Store unhandled exception info on stack in Native AOT #84871

Merged
merged 4 commits into from
Apr 27, 2023
Merged

Store unhandled exception info on stack in Native AOT #84871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dda1f63
Attempt to fix #84636
agocke Apr 15, 2023
fc78b8b
Respond to PR comments
agocke Apr 18, 2023
2772bb1
Respond to PR comments
agocke Apr 18, 2023
0855ee4
PR comments
agocke Apr 26, 2023
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
58 changes: 1 addition & 57 deletions src/coreclr/nativeaot/Runtime/threadstore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,60 +505,4 @@ void ThreadStore::SaveCurrentThreadOffsetForDAC()
{
}

#endif // _WIN32


#ifndef DACCESS_COMPILE

// internal static extern unsafe bool RhGetExceptionsForCurrentThread(Exception[] outputArray, out int writtenCountOut);
COOP_PINVOKE_HELPER(FC_BOOL_RET, RhGetExceptionsForCurrentThread, (Array* pOutputArray, int32_t* pWrittenCountOut))
{
FC_RETURN_BOOL(GetThreadStore()->GetExceptionsForCurrentThread(pOutputArray, pWrittenCountOut));
}

bool ThreadStore::GetExceptionsForCurrentThread(Array* pOutputArray, int32_t* pWrittenCountOut)
{
int32_t countWritten = 0;
Object** pArrayElements;
Thread * pThread = GetCurrentThread();

for (PTR_ExInfo pInfo = pThread->m_pExInfoStackHead; pInfo != NULL; pInfo = pInfo->m_pPrevExInfo)
{
if (pInfo->m_exception == NULL)
continue;

countWritten++;
}

// No input array provided, or it was of the wrong kind. We'll fill out the count and return false.
if ((pOutputArray == NULL) || (pOutputArray->get_EEType()->RawGetComponentSize() != POINTER_SIZE))
goto Error;

// Input array was not big enough. We don't even partially fill it.
if (pOutputArray->GetArrayLength() < (uint32_t)countWritten)
goto Error;

*pWrittenCountOut = countWritten;

// Success, but nothing to report.
if (countWritten == 0)
return true;

pArrayElements = (Object**)pOutputArray->GetArrayData();
for (PTR_ExInfo pInfo = pThread->m_pExInfoStackHead; pInfo != NULL; pInfo = pInfo->m_pPrevExInfo)
{
if (pInfo->m_exception == NULL)
continue;

*pArrayElements = pInfo->m_exception;
pArrayElements++;
}

RhpBulkWriteBarrier(pArrayElements, countWritten * POINTER_SIZE);
return true;

Error:
*pWrittenCountOut = countWritten;
return false;
}
#endif // DACCESS_COMPILE
#endif // _WIN32
1 change: 0 additions & 1 deletion src/coreclr/nativeaot/Runtime/threadstore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ class ThreadStore
#else
static PTR_Thread GetThreadFromTEB(TADDR pvTEB);
#endif
bool GetExceptionsForCurrentThread(Array* pOutputArray, int32_t* pWrittenCountOut);

void Destroy();
void SuspendAllThreads(bool waitForGCEvent);
Expand Down
4 changes: 0 additions & 4 deletions src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/RuntimeImports.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,10 +599,6 @@ internal static IntPtr RhGetModuleSection(TypeManagerHandle module, ReadyToRunSe
internal static extern unsafe int RhGetModuleFileName(IntPtr moduleHandle, out char* moduleName);
#endif

[MethodImplAttribute(MethodImplOptions.InternalCall)]
[RuntimeImport(RuntimeLibrary, "RhGetExceptionsForCurrentThread")]
internal static extern unsafe bool RhGetExceptionsForCurrentThread(Exception[] outputArray, out int writtenCountOut);

// returns the previous value.
[MethodImplAttribute(MethodImplOptions.InternalCall)]
[RuntimeImport(RuntimeLibrary, "RhSetErrorInfoBuffer")]
Expand Down
Loading