Skip to content

Commit eb1fbe5

Browse files
author
Mike McLaughlin
authored
Fix a couple .NET 9 testing issues in the SOS tests in the diagnostics repo (#99255)
* Fix SOS DAC GetAssemblyData failure from ClassLoader not being in core dump * Bump the MacOS stack overflow stack size
1 parent b60a6e3 commit eb1fbe5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/coreclr/debug/daccess/request.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2577,7 +2577,7 @@ ClrDataAccess::GetAssemblyData(CLRDATA_ADDRESS cdBaseDomainPtr, CLRDATA_ADDRESS
25772577
}
25782578

25792579
assemblyData->AssemblyPtr = HOST_CDADDR(pAssembly);
2580-
assemblyData->ClassLoader = HOST_CDADDR(pAssembly->GetLoader());
2580+
assemblyData->ClassLoader = 0;
25812581
assemblyData->ParentDomain = HOST_CDADDR(AppDomain::GetCurrentDomain());
25822582
assemblyData->isDynamic = pAssembly->IsDynamic();
25832583
assemblyData->ModuleCount = 0;

src/coreclr/pal/src/exception/machexception.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@ HijackFaultingThread(
849849
if (fIsStackOverflow)
850850
{
851851
// Allocate the minimal stack necessary for handling stack overflow
852-
int stackOverflowStackSize = 7 * 4096;
852+
int stackOverflowStackSize = 15 * 4096;
853853
// Align the size to virtual page size and add one virtual page as a stack guard
854854
stackOverflowStackSize = ALIGN_UP(stackOverflowStackSize, GetVirtualPageSize()) + GetVirtualPageSize();
855855
void* stackOverflowHandlerStack = mmap(NULL, stackOverflowStackSize, PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);

0 commit comments

Comments
 (0)