Add support for getting the System.Array type from the runtime

- Make it work for all TypeManagerHandle based environments
- Including non INPLACE_RUNTIME based cases
- Uses classlib functions architecture

[tfs-changeset: 1657913]

2 files changed, 11 insertions, 2 deletions

diff --git a/src/Runtime.Base/src/System/Runtime/EEType.Runtime.cs b/src/Runtime.Base/src/System/Runtime/EEType.Runtime.cs
index b517cb77f..475b77568 100644
--- a/src/Runtime.Base/src/System/Runtime/EEType.Runtime.cs
+++ b/src/Runtime.Base/src/System/Runtime/EEType.Runtime.cs
@@ -23,8 +23,15 @@ namespace Internal.Runtime
 
         internal EEType* GetArrayEEType()
         {
-#if INPLACE_RUNTIME
-            return EETypePtr.EETypePtrOf<Array>().ToPointer();
+            fixed (EEType* pThis = &this)
+            {
+                IntPtr pGetArrayEEType = (IntPtr)InternalCalls.RhpGetClasslibFunctionFromEEtype(new IntPtr(pThis), EH.ClassLibFunctionId.GetSystemArrayEEType);
+                if (pGetArrayEEType != IntPtr.Zero)
+                    return (EEType*)CalliIntrinsics.Call<IntPtr>(pGetArrayEEType);
+            }
+#if CORERT
+            EH.FallbackFailFast(RhFailFastReason.InternalError, null);
+            return null;
 #else
             fixed (EEType* pThis = &this)
                 return InternalCalls.RhpGetArrayBaseType(pThis);
diff --git a/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs b/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
index c4f7b07c3..ea552bb34 100644
--- a/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
+++ b/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs
@@ -152,6 +152,8 @@ namespace System.Runtime
             FailFast = 1,
             // UnhandledExceptionHandler = 2, // unused
             AppendExceptionStackFrame = 3,
+            CheckStaticClassConstruction = 4,
+            GetSystemArrayEEType = 5,
         }
 
         // Given an address pointing somewhere into a managed module, get the classlib-defined fail-fast