Mirror StackFrameHelperChanges in mscorlib.h and change allocation type to more gener...

Commit migrated from https://github.com/dotnet/coreclr/commit/10764205f7523cbd97fefb32c9e3afb8274a562e

diff --git a/src/coreclr/src/vm/debugdebugger.cpp b/src/coreclr/src/vm/debugdebugger.cpp
index a5cc9bc..ca6cfb0 100644 (file)
--- a/src/coreclr/src/vm/debugdebugger.cpp
+++ b/src/coreclr/src/vm/debugdebugger.cpp
@@ -403,8 +403,7 @@ FCIMPL4(void, DebugStackTrace::GetStackFramesInternal,
                             pStackFrameHelper->GetAppDomain());
 
         // Allocate memory for the array of assemblies
-        MethodTable * pAssemblyMT = MscorlibBinder::GetClass(CLASS__ASSEMBLY);
-        PTRARRAYREF assemblyArray = (PTRARRAYREF) AllocateObjectArray(data.cElements, pAssemblyMT);
+        PTRARRAYREF assemblyArray = (PTRARRAYREF) AllocateObjectArray(data.cElements, g_pObjectClass);
         SetObjectReference( (OBJECTREF *)&(pStackFrameHelper->rgAssembly), (OBJECTREF)assemblyArray,
                             pStackFrameHelper->GetAppDomain());
 

diff --git a/src/coreclr/src/vm/mscorlib.h b/src/coreclr/src/vm/mscorlib.h
index 3298de3..ab7e42f 100644 (file)
--- a/src/coreclr/src/vm/mscorlib.h
+++ b/src/coreclr/src/vm/mscorlib.h
@@ -760,6 +760,7 @@ DEFINE_FIELD_U(rgiILOffset,                StackFrameHelper,   rgiILOffset)
 DEFINE_FIELD_U(dynamicMethods,             StackFrameHelper,   dynamicMethods)
 DEFINE_FIELD_U(rgMethodHandle,             StackFrameHelper,   rgMethodHandle)
 DEFINE_FIELD_U(rgAssemblyPath,             StackFrameHelper,   rgAssemblyPath)
+DEFINE_FIELD_U(rgAssembly,                 StackFrameHelper,   rgAssembly)
 DEFINE_FIELD_U(rgLoadedPeAddress,          StackFrameHelper,   rgLoadedPeAddress)
 DEFINE_FIELD_U(rgiLoadedPeSize,            StackFrameHelper,   rgiLoadedPeSize)
 DEFINE_FIELD_U(rgInMemoryPdbAddress,       StackFrameHelper,   rgInMemoryPdbAddress)